first version with weekly lesson previews working, though auto-loading of week tabs is still missing

7 files changed, 123 insertions, 20 deletions

diff --git a/assets/default/images/preview.jpg b/assets/default/images/preview1.jpg
index 9801ffb..9801ffb 100644
--- a/assets/default/images/preview.jpg
+++ b/assets/default/images/preview1.jpg
diff --git a/assets/default/images/preview2.jpg b/assets/default/images/preview2.jpg
new file mode 100644
index 0000000..41762a2
--- /dev/null
+++ b/assets/default/images/preview2.jpg
diff --git a/assets/default/images/preview3.jpg b/assets/default/images/preview3.jpg
new file mode 100644
index 0000000..385bef2
--- /dev/null
+++ b/assets/default/images/preview3.jpg
diff --git a/assets/default/images/preview4.jpg b/assets/default/images/preview4.jpg
new file mode 100644
index 0000000..e75def8
--- /dev/null
+++ b/assets/default/images/preview4.jpg
diff --git a/chakra/css/chakra.css b/chakra/css/chakra.css
index 85ca61a..d3763e4 100755
--- a/chakra/css/chakra.css
+++ b/chakra/css/chakra.css
@@ -203,6 +203,11 @@ color:#000000;
 width: 60px;
 }
 
+#curriculum
+{
+float:right;
+}
+
 #week
 {
 list-style: none;
diff --git a/chakra/grade1e.html b/chakra/grade1e.html
index 9e13a65..15727a3 100755
--- a/chakra/grade1e.html
+++ b/chakra/grade1e.html
@@ -43,52 +43,131 @@
   <option value="45to48">45 - 48</option>
   <option value="49to52">49 - 52</option>
 </select>
-show sth. on default
 
 </div>
 
+<div id="curriculum">
+Link to subject curriculum
+</div>
+
 <div id="weeks">
 <div id="1to4">
 <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/preview.jpg"/>
+<img src="../assets/default/images/preview1.jpg"/>
 </div>
 <div id="lessonname">
-Lesson Name
+Quadrilaterals
 </div>
 </div>
 <div id="lesson">
-<img src="../assets/default/images/preview.jpg"/>
+<img src="../assets/default/images/preview2.jpg"/>
 <div id="lessonname">
-Lesson Name
+Adding up to 10
 </div>
 </div>
 <div id="lesson">
-<img src="../assets/default/images/preview.jpg"/>
+<img src="../assets/default/images/preview3.jpg"/>
 <div id="lessonname">
-Lesson Name
+Everyday expressions
 </div>
 </div>
 <div id="lesson">
-<img src="../assets/default/images/preview.jpg"/>
+<img src="../assets/default/images/preview4.jpg"/>
 <div id="lessonname">
-Lesson Name
+Can and can't
 </div>
 </div>
 </div>
 <div id="week2">
-Week 2
+<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">
-Week 3
+<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">
-Week 4
+<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="5to8">5to8</div>
@@ -112,19 +191,30 @@ $('#week_select').change(function() {
     $('#weeks div').hide();
     var e = '#' + $(':selected', $(this)).attr('value');
     $(e).show();
+	
+	$('div#lesson').show();
+	$('div#preview').show();
+	$('div#lessonname').show();
+	//TODO: need to optimize
 });
 
 $('#weeks div').hide();
 </script>
 
-<script type="text/javascript">
-	$(document).ready(function() {
+<script type="text/javascript"> 
+$(document).ready(function() {
+    $('#weeks div').hide();
     var e = '#' + $(':selected', $(this)).attr('value');
     $(e).show();
-});
 
-$('#months div').hide();
+	$('div#lesson').show();
+	$('div#preview').show();
+	$('div#lessonname').show();
+	//TODO: need to optimize
 });
+
+$('#weeks div').hide();
+
 </script>
 
 <script type="text/javascript"> 
diff --git a/css/chakra.css b/css/chakra.css
index 85ca61a..6c6611f 100644
--- a/css/chakra.css
+++ b/css/chakra.css
@@ -154,13 +154,13 @@ float: left;
 
 #weeks li a
 {
-height: auto;
 text-decoration: none;
 text-align: center;
 font-weight: bold;
 float: left;
 color:#000000;
-width: 4em;
+width: 2em;
+padding: 3;
 }
 
 #weeks a:hover {
@@ -203,6 +203,15 @@ color:#000000;
 width: 60px;
 }
 
+#curriculum
+{
+width: auto;
+text-align: center;
+float:right;
+background:#BDBDBD;
+padding: 3;
+}
+
 #week
 {
 list-style: none;
@@ -221,13 +230,12 @@ float: left;
 #week li a
 {
 height: auto;
-padding: 5;
 text-decoration: none;
 text-align: center;
 font-weight: bold;
 float: left;
 color:#000000;
-width: 25%;
+padding: 4em;
 }
 
 #week img