modified Chakra according to feedback from 2009-09-02 OLE Nepal meeting (e.g. remove profile/stuff from navihation), drop down less stage 3 design work has started on grade1mathematics.html

5 files changed, 310 insertions, 12 deletions

diff --git a/chakra/grade1.html b/chakra/grade1.html
index 6ebccc3..b6c8aff 100755
--- a/chakra/grade1.html
+++ b/chakra/grade1.html
@@ -25,8 +25,6 @@
 
 <img id="nav_right" src="../assets/default/images/help.png" alt="Help" title="Help">
 <img id="nav_right" src="../assets/default/images/about.png" alt="Karma icon" title="About Karma">
-<img id="nav_right" src="../assets/default/images/mystuff.png" alt="Stuff icon" title="My stuff">
-<img id="nav_right" src="../assets/default/images/profile.png" alt="Profile icon" title="My profile">
 </div>
 <div id="subjects">
 <ul>
diff --git a/chakra/grade1english.html b/chakra/grade1english.html
index 47f2493..4cb652e 100755
--- a/chakra/grade1english.html
+++ b/chakra/grade1english.html
@@ -23,8 +23,6 @@
 <a href="../index.html"><img src="../assets/default/images/chakra_logo.png" alt="Home" title="Home"></a> <a href="grade1.html"><img src="../assets/default/images/grade1.png" alt="Grade 1" title="Grade 1"></a> <img src="../assets/default/images/01_10.png" alt="English" title="Grade 1 - English">
 <img id="nav_right" src="../assets/default/images/help.png" alt="Help" title="Help">
 <img id="nav_right" src="../assets/default/images/about.png" alt="Karma icon" title="About Karma">
-<img id="nav_right" src="../assets/default/images/mystuff.png" alt="Stuff icon" title="My stuff">
-<img id="nav_right" src="../assets/default/images/profile.png" alt="Profile icon" title="My profile">
 
 <select id="week_select">
   <option value="1to4" selected>1 - 4</option>
diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html
index 3ddc268..b0723b1 100644
--- a/chakra/grade1mathematics.html
+++ b/chakra/grade1mathematics.html
@@ -20,12 +20,26 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<a href="../index.html"><img src="../assets/default/images/chakra_logo.png" alt="Home" title="Home"></a> <a href="grade1.html"><img src="../assets/default/images/grade1.png" alt="Grade 1" title="Grade 1"></a> <img src="../assets/default/images/01_05.png" alt="English" title="Grade 1 - English">
+<a href="../index.html"><img src="../assets/default/images/chakra_logo.png" alt="Home" title="Home"></a>
+<a href="grade1.html"><img src="../assets/default/images/grade1.png" alt="Grade 1" title="Grade 1"></a>
+<img src="../assets/default/images/01_05.png" alt="English" title="Grade 1 - English">
+
+Months:
+<ul id="week_select">
+<li><a href="#weeksA" class="selected">A</a></li>
+<li><a href="#weeksB">B</a></li>
+<li><a href="#weeksC">C</a></li>
+<li><a href="#weeksD">D</a></li>
+<li><a href="#weeksE">E</a></li>
+<li><a href="#weeksF">F</a></li>
+<li><a href="#weeksG">G</a></li>
+<li><a href="#weeksH">H</a></li>
+<li><a href="#weeksI">I</a></li>
+<li><a href="#weeksJ">J</a></li>
+</ul>
+
 <img id="nav_right" src="../assets/default/images/help.png" alt="Help" title="Help">
 <img id="nav_right" src="../assets/default/images/about.png" alt="Karma icon" title="About Karma">
-<img id="nav_right" src="../assets/default/images/mystuff.png" alt="Stuff icon" title="My stuff">
-<img id="nav_right" src="../assets/default/images/profile.png" alt="Profile icon" title="My profile">
-
 </div>
 
 <div id="curriculum">
@@ -33,7 +47,246 @@ Link to subject curriculum
 </div>
 
 <div id="weeks">
-
+<div id="weeksA">
+Weeks:
+<li><a href="#week1">1</a></li>
+<li><a href="#week2">2</a></li>
+<li><a href="#week3">3</a></li>
+<li><a href="#week4">4</a></li>
+<br /><br />
+<div id="week1">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview1.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week2">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview2.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week3">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview3.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week4">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview4.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+</div>
+<div id="weeksB">
+Weeks:
+<li><a href="#week5">1</a></li>
+<li><a href="#week6">2</a></li>
+<li><a href="#week7">3</a></li>
+<li><a href="#week8">4</a></li>
+<br /><br />
+<div id="week5">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview1.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week6">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview2.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week7">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview3.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview4.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+<div id="week8">
+<div id="lesson">
+<div id="preview">
+<img src="../assets/default/images/preview4.jpg"/>
+</div>
+<div id="lessonname">
+Quadrilaterals
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview1.jpg"/>
+<div id="lessonname">
+Adding up to 10
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview2.jpg"/>
+<div id="lessonname">
+Everyday expressions
+</div>
+</div>
+<div id="lesson">
+<img src="../assets/default/images/preview3.jpg"/>
+<div id="lessonname">
+Can and can't
+</div>
+</div>
+</div>
+</div>
 </div>
 
 </div>
@@ -70,7 +323,11 @@ $('#weeks div').hide();
 </script>
 
 <script type="text/javascript"> 
-  $("#1to4").idTabs(); 
+  $("#week_select").idTabs(); 
+</script>
+
+<script type="text/javascript"> 
+  $("#weeks div").idTabs(); 
 </script>
 
 </body>
diff --git a/css/chakra.css b/css/chakra.css
index 205f5d7..d0a4f6f 100644
--- a/css/chakra.css
+++ b/css/chakra.css
@@ -7,7 +7,7 @@ padding:0;
 
 #navigation
 {
-background: #BDBDBD;
+background: #6E6E6E;
 font-weight: bold;
 padding-bottom: 0.2em;
 padding-top: 0.2em;
@@ -19,6 +19,11 @@ border: none;
 height: 30px;
 }
 
+#nav_left
+{
+float: left;
+}
+
 #nav_right
 {
 float: right;
@@ -114,6 +119,8 @@ font-weight: bold;
 float: left;
 color:#000000;
 height: 9.5em;
+margin-bottom: 0.2em;
+margin-top: 0.2em;
 }
 
 #subjects ul li img
@@ -124,8 +131,45 @@ width: 120px;
 
 #subjects a:hover {
 text-decoration: underline;
-outline-width:1px;
+outline-width:3px;
 outline-style:solid;
+outline-color: #424242;
+}
+
+#week_select
+{
+list-style: none;
+padding: 0;
+margin: 0;
+background:#BDBDBD;
+float:left;
+}
+
+#week_select li
+{
+float: left;
+}
+
+#week_select li a
+{
+line-height: 1.5em;
+text-decoration: none;
+text-align: center;
+font-weight: bold;
+float: left;
+color:#000000;
+margin-bottom: 0.2em;
+margin-top: 0.2em;
+margin-left: 0.2em;
+margin-right: 0.2em;
+}
+
+#week_select a:hover {
+text-decoration: underline;
+}
+
+#week_select a.selected {
+text-decoration: underline;
 }
 
 #lessonname
diff --git a/index.html b/index.html
index b2cde6c..e477d39 100755
--- a/index.html
+++ b/index.html
@@ -21,6 +21,7 @@
 <div id="mainmenu">
 <div id="navigation">
 <img src="assets/default/images/chakra_logo.png" alt="Home" title="Home"> <img id="nav_right" src="assets/default/images/help.png" alt="Help" title="Help">
+<img id="nav_right" src="assets/default/images/about.png" alt="Karma icon" title="About Karma">
 </div>
 <div id="grades">
 <ul>