improved knav layout, esp. welcome screen

author: christophd@sugarlabs.org <christophd@sugarlabs.org> 2009-09-07 09:26:24 (GMT)
committer: christophd@sugarlabs.org <christophd@sugarlabs.org> 2009-09-07 09:26:24 (GMT)
commit: 6668d979d480222945a16a1661895c6c5f0aa4f7 (patch)
tree: 891eedfb93836435c84deecd9c0a20ba9c1a1aaa
parent: 9712c099ff2a5feafbf99f7c915f09dadfce0346 (diff)
6 files changed, 78 insertions, 71 deletions
diff --git a/examples/adding_up_to_10/css/knavbar.css b/examples/adding_up_to_10/css/knavbar.css
index ba09413..0730078 100644
--- a/examples/adding_up_to_10/css/knavbar.css
+++ b/examples/adding_up_to_10/css/knavbar.css
@@ -5,10 +5,45 @@ margin:0;
 padding:0;
 }
 
-iframe
+nav
 {
-width: 800px;
-height: 440px;
+list-style: none;
+padding: 0;
+margin: 0;
+float:left;
+width:100%;
+background: #FFFFFF;
+}
+
+nav li
+{
+float: left;
+}
+
+nav li a
+{
+height: 63px;
+text-align: center;
+font-weight: bold;
+font-size: 110%;
+float: left;
+color:#000000;
+padding-left: 0.2em;
+padding-right: 0.2em;
+text-decoration: none;
+}
+
+nav img
+{
+border: none;
+width: 58px;
+}
+
+#welcome
+{
+padding-left: 1em;
+padding-right: 1em;
+line-height: 3em;
 }
 
 #subject
@@ -64,38 +99,6 @@ width:800px;
 background: #BDBDBD;
 }
 
-nav
-{
-list-style: none;
-padding: 0;
-margin: 0;
-float:left;
-width:100%;
-background: #FFFFFF;
-}
-
-nav li
-{
-float: left;
-}
-
-nav li a
-{
-height: 63px;
-text-align: center;
-font-weight: bold;
-float: left;
-color:#000000;
-padding-left: 0.2em;
-padding-right: 0.2em;
-}
-
-nav img
-{
-border: none;
-width: 58px;
-}
-
 #welcome_logo img
 {
 padding: 2em;
@@ -124,3 +127,8 @@ margin-top:0px;
 margin-bottom:0px;
 padding:0px;
 }
+
+.icon_right
+{
+float: right;
+}
+\ No newline at end of file
diff --git a/examples/adding_up_to_10/exercise.html b/examples/adding_up_to_10/exercise.html
index acf8557..1e74722 100644
--- a/examples/adding_up_to_10/exercise.html
+++ b/examples/adding_up_to_10/exercise.html
@@ -16,16 +16,17 @@
 
 <body>
 
+<div id="lesson">
 <nav>
-<li id="back"><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
-<li id="chakra"><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
-<li id="welcome"><a href="index_knavbar.html">Adding up to 10</a></li>
-<li id="tutorial"><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
-<li id="exercise"><a href="exercise.html" class="selected"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li id="game"><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
-<li id="resources"><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
-<li id="help"><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
-<li id="logo"><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
+<li><a id="welcome" href="index_knavbar.html">Adding up to 10</a></li>
+<li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
+<li><a href="exercise.html" class="selected"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
+<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
+<li><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
+<li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
+<li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
 </nav>
 
 
@@ -85,7 +86,7 @@
 
 
   </div>
-
+</div>
 
 </body>
 
diff --git a/examples/adding_up_to_10/index_knavbar.html b/examples/adding_up_to_10/index_knavbar.html
index fa8be67..ab19fe3 100644
--- a/examples/adding_up_to_10/index_knavbar.html
+++ b/examples/adding_up_to_10/index_knavbar.html
@@ -11,7 +11,6 @@
 
 <script type="text/javascript" src="js/jquery-1.3.2.min.js"></script>
 <script type="text/javascript" src="js/jquery.ui.all.js"></script>
-<script type="text/javascript" src="js/jquery.idTabs.min.js"></script>
 
 </head>
 
@@ -20,15 +19,15 @@
 <div id="lesson">
 
 <nav>
-<li id="back"><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
-<li id="chakra"><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
-<li id="welcome"><a href="index_knavbar.html" class="selected">Adding up to 10</a></li>
-<li id="tutorial"><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
-<li id="exercise"><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li id="game"><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
-<li id="resources"><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
-<li id="help"><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
-<li id="logo"><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
+<li><a id="welcome" href="index_knavbar.html" class="selected">Adding up to 10</a></li>
+<li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
+<li><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
+<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
+<li><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
+<li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
+<li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
 </nav>
 
 <div id="subject">Mathematics</div>
diff --git a/examples/adding_up_to_10/resources.html b/examples/adding_up_to_10/resources.html
index adb6baf..a6a67f0 100644
--- a/examples/adding_up_to_10/resources.html
+++ b/examples/adding_up_to_10/resources.html
@@ -15,24 +15,23 @@
 
 <body>
 
+<div id="lesson">
 <nav>
-<li id="back"><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
-<li id="chakra"><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
-<li id="welcome"><a href="index_knavbar.html">Adding up to 10</a></li>
-<li id="tutorial"><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
-<li id="exercise"><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li id="game"><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
-<li id="resources"><a href="resources.html" class="selected"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
-<li id="help"><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
-<li id="logo"><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
+<li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
+<li><a id="welcome" href="index_knavbar.html">Adding up to 10</a></li>
+<li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
+<li><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
+<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
+<li><a href="resources.html" class="selected"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
+<li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
+<li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
 </nav>
 
-
-<ul>
 <li><a href="assets/en/docs/teachernotes.swf" target="_blank">Teacher's notes</a></li>
 <li><a href="assets/en/docs/lessonplan.swf" target="_blank">Lesson plan</a></li>
 <li><a href="quadrilaterals.zip">Download</a></li>
-</ul>
+</div>
 
 </body>
 
diff --git a/index.html b/index.html
index c75d44d..179f096 100755
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<img src="assets/default/images/chakra_logo.png" alt="Home" title="Home" class="icon_left">
+<img src="assets/default/images/chakra_logo.png" alt="Home" title="Home" class="chakra_logo">
 <img src="assets/default/images/help.png" alt="Help" title="Help" class="icon_right">
 <img src="assets/default/images/karma_logo.png" alt="Karma icon" title="About Karma" class="icon_right">
 </div>
diff --git a/index_nepal.html b/index_nepal.html
index 0644a79..9b7e28f 100644
--- a/index_nepal.html
+++ b/index_nepal.html
@@ -20,9 +20,9 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<img src="assets/default/images/chakra_logo.png" alt="Home" title="Home">
-<img class="nav_right" src="assets/default/images/help.png" alt="Help" title="Help">
-<img class="nav_right" src="assets/default/images/karma_logo.png" alt="Karma icon" title="About Karma">
+<img src="assets/default/images/chakra_logo.png" alt="Home" title="Home" class="chakra_logo">
+<img src="assets/default/images/help.png" alt="Help" title="Help" class="icon_right">
+<img src="assets/default/images/karma_logo.png" alt="Karma icon" title="About Karma" class="icon_right">
 </div>
 <div id="grades">
 <ul>
author	christophd@sugarlabs.org <christophd@sugarlabs.org>	2009-09-07 09:26:24 (GMT)
committer	christophd@sugarlabs.org <christophd@sugarlabs.org>	2009-09-07 09:26:24 (GMT)
commit	6668d979d480222945a16a1661895c6c5f0aa4f7 (patch)
tree	891eedfb93836435c84deecd9c0a20ba9c1a1aaa
parent	9712c099ff2a5feafbf99f7c915f09dadfce0346 (diff)