Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <bryan@olenepal.org>2009-09-04 00:52:39 (GMT)
committer root <bryan@olenepal.org>2009-09-04 00:52:39 (GMT)
commit61fc73a544ebe750ca185878cfc5826d8832f87b (patch)
treefeee9dca755ba1b409317227ecffcc035149d509
parent31a73aea84a6687c64c7f9dfa6638e8a758b4a65 (diff)
parent93482766ed8729c0bf34b4d3ff569a0c73276000 (diff)
Merge branch 'felipe' of gitorious@git.sugarlabs.org:karma/mainline into multicanvas
-rwxr-xr-xchakra/grade1mathematics.html28
-rwxr-xr-xlessons/quadrilaterals/index.html2
2 files changed, 3 insertions, 27 deletions
diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html
index 96f7ff0..c63aa5e 100755
--- a/chakra/grade1mathematics.html
+++ b/chakra/grade1mathematics.html
@@ -290,34 +290,10 @@ Can and can't
</div>
<script type="text/javascript">
-$('#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() {
- $('#weeks div').hide();
- var e = '#' + $(':selected', $(this)).attr('value');
- $(e).show();
-
- $('div#lesson').show();
- $('div#preview').show();
- $('div#lessonname').show();
- //TODO: need to optimize
+ //$('#weeksA').show();
+ //$('#week1').show();
});
-
-$('#weeks div').hide();
-
</script>
<script type="text/javascript">
diff --git a/lessons/quadrilaterals/index.html b/lessons/quadrilaterals/index.html
index a265d07..b551ad6 100755
--- a/lessons/quadrilaterals/index.html
+++ b/lessons/quadrilaterals/index.html
@@ -24,7 +24,7 @@
<li id="welcome"><a href="#tab_welcome" class="selected" >Quadrilaterals</a></li>
<li id="tutorial"><a href="#tab_tutorial"><img src="../../assets/default/images/tutorial.png" alt="Tutorial" title="Tutorial"></a></li>
<li id="exercise"><a href="#tab_exercise"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li id="game"><a href="#tab_game"><img src="../../assets/default/images/games.png" alt="Game" title="Game"></a></li>
+<li id="game"><a href="#tab_game"><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></a></li>
<li id="resources"><a href="#tab_resources"><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/generic/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>