diff options
| author | Cristhofer Travieso <cristhofert97@gmail.com> | 2013-11-07 22:40:45 (GMT) |
|---|---|---|
| committer | Cristhofer Travieso <cristhofert97@gmail.com> | 2013-11-07 22:40:45 (GMT) |
| commit | 158aa83a2f9e2b14dcc07009ef5bcccd783768e9 (patch) | |
| tree | cf3d05cf0211a6e8879ad081b27658223c8aa53e | |
| parent | 6e02ead16dc9b1aa453474e25ae14f1ca7405b97 (diff) | |
Rename index2.html to index.html
Signed-off-by: Cristhofer Travieso <cristhofert97@gmail.com>
| -rw-r--r-- | index.html | 28 | ||||
| -rw-r--r-- | index2.html | 33 |
2 files changed, 26 insertions, 35 deletions
@@ -1,9 +1,33 @@ +<!DOCTYPE html> <html> <head> +<meta charset="utf-8" /> <title>Install Activities</title> -<META HTTP-EQUIV="Refresh" CONTENT="1; URL=http://activities.sugarlabs.org"> +<link rel="stylesheet" href="lib/sugar-web/graphics/css/sugar.css"> +<link rel="stylesheet" href="css/activity.css"> +<script data-main="js/loader" src="lib/require.js"></script> </head> + + <body> -<a href='http://activities.sugarlabs.org'> Loading... </a> + <div id="main-toolbar" class="toolbar"> + <button class="toolbutton" id="activity-button" title="My Activity"></button> + <hr/> + <button class="toolbutton" id="recommended-button" title="Recommended" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=recommended#featured');"> <img src='icons/recommended.svg' alt='recommended'> </button> + <button class="toolbutton" id="popular-button" title="Popular" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=popular#featured');"> <img src='icons/popular.svg' alt='popular'> </button> + <button class="toolbutton" id="added-button" title="Added" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=added#featured');"> <img src='icons/added.svg' alt='added'> </button> + <button class="toolbutton" id="updated-button" title="Updated" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=updated#featured');"> <img src='icons/update.svg' alt='update'> </button> + + <button class="toolbutton pull-right" id="stop-button" title="Stop"></button> + </div> + <div id="canvas"> + <IFRAME + src="http://activities.sugarlabs.org" + marginWidth=0 marginHeight=0 frameBorder=0 + id=IframeASLO + style="width:100%; height:100%;" frameSpacing=0> + </IFRAME> + </div> + </div> </body> </html> diff --git a/index2.html b/index2.html deleted file mode 100644 index 1778dcd..0000000 --- a/index2.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta charset="utf-8" /> -<title>Install Activities</title> -<link rel="stylesheet" href="lib/sugar-web/graphics/css/sugar.css"> -<link rel="stylesheet" href="css/activity.css"> -<script data-main="js/loader" src="lib/require.js"></script> -</head> - - -<body> - <div id="main-toolbar" class="toolbar"> - <button class="toolbutton" id="activity-button" title="My Activity"></button> - <hr/> - <button class="toolbutton" id="recommended-button" title="Recommended" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=recommended#featured');"> <img src='icons/recommended.svg' alt='recommended'> </button> - <button class="toolbutton" id="popular-button" title="Popular" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=popular#featured');"> <img src='icons/popular.svg' alt='popular'> </button> - <button class="toolbutton" id="added-button" title="Added" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=added#featured');"> <img src='icons/added.svg' alt='added'> </button> - <button class="toolbutton" id="updated-button" title="Updated" onclick="document.getElementById('IframeASLO').setAttribute('src', 'http://activities.sugarlabs.org/sugar/?featured=updated#featured');"> <img src='icons/update.svg' alt='update'> </button> - - <button class="toolbutton pull-right" id="stop-button" title="Stop"></button> - </div> - <div id="canvas"> - <IFRAME - src="http://activities.sugarlabs.org" - marginWidth=0 marginHeight=0 frameBorder=0 - id=IframeASLO - style="width:100%; height:100%;" frameSpacing=0> - </IFRAME> - </div> - </div> -</body> -</html> |