Merge branch 'temp'

42 files changed, 78 insertions, 81 deletions

diff --git a/examples/adding_up_to_10/css/knavbar.css b/examples/adding_up_to_10_canvas/css/knavbar.css
index b39f205..26e3896 100755
--- a/examples/adding_up_to_10/css/knavbar.css
+++ b/examples/adding_up_to_10_canvas/css/knavbar.css
@@ -5,12 +5,6 @@ margin:0;
 padding:0;
 }
 
-#knavbar {
-display: table;
-width: 800px;
-margin: 0 auto;
-}
-
 nav
 {
 list-style: none;
@@ -21,6 +15,24 @@ width:100%;
 background: #FFFFFF;
 }
 
+nav li
+{
+float: left;
+}
+
+nav li a
+{
+height: 63px;
+text-align: center;
+font-weight: bold;
+font-size: 110%;
+display: block;
+color:#000000;
+padding-left: 0.2em;
+padding-right: 0.2em;
+text-decoration: none;
+}
+
 nav img
 {
 border: none;
@@ -97,11 +109,6 @@ img
 border: none;
 }
 
-#lessonTitle
-{
-display: block;
-}
-
 nav a:hover {
 text-decoration: underline;
 outline-width:1px;
@@ -124,16 +131,4 @@ padding:0px;
 .icon_right
 {
 float: right;
-}
-
-.floatLeft {
-	float: left;
-	margin-left: 5px;
-	margin-bottom: 5px;
-}
-
-.floatRight {
-	float: right;
-	margin-right: 5px;
-	margin-bottom: 5px;
 }
\ No newline at end of file
diff --git a/examples/adding_up_to_10/css/lesson.css b/examples/adding_up_to_10_canvas/css/lesson.css
index e368b14..5147cfa 100755
--- a/examples/adding_up_to_10/css/lesson.css
+++ b/examples/adding_up_to_10_canvas/css/lesson.css
@@ -1,33 +1,32 @@
-@charset "UTF-8";
 
-#karma-main {
+#main {
 width:800px;
 height:600px;
 position:absolute;
 }
-
-#main {
+#action {
 float:left;
 position:relative;
 width: 650px;
 height: 600px;
 
 }
-#side {
+#sidebar {
 background-image: url(../assets/generic/images/sidebar.png);
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 float:left;
 height:600px;
 position:relative;
 width:150px;
 }
-
-#top {
+#actionTop {
 width: 650px;
 height: 300px;
 position:relative;
 }
-
 #bottom {
 clear:both;
 float:left;
@@ -35,26 +34,32 @@ width: 650px;
 height: 300px;
 position:relative;
 }
-#topLeftArea {
+#topLtSide {
 float:left;
 width: 300px;
 height: 300px;
 position:relative;
 }
-#topMiddleArea {
+#topMd {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 float:left;
 width: 50px;
 height: 300px;
 position:relative;
 }
-#topRightArea {
+#topRtSide {
 float:left;
 width: 300px;
 height:300px;
 position:relative;
 }
-#topLeftCard {
+#topLtBox {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 width: 200px;
 height: 200px;
@@ -63,22 +68,22 @@ position:absolute;
 top:50px;
 }
 
-#topLeftPaper {
+#topLtCanvas {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 position:absolute;
 top: 50px;
 left: 75px;
-width:200px; 
-height:200px;
 }
-
-#plusSign {
+#plussign {
 display: block;
 margin-left: auto;
 margin-right: auto;
 margin-top: 150px;
 }
-#topRightCard {
+#topRtBox {
 background: none none repeat scroll 0 0;
 width: 200px;
 height: 200px;
@@ -86,17 +91,18 @@ position:absolute;
 right: 50px;
 top: 50px;
 }
-#topRightPaper {
+#topRtCanvas {
 background:none none repeat scroll 0 0;
 position:absolute;
 left: 50px;
 right:50px;
 top:50px;
-width:200px;
-height:200px;
 }
 
 .bottom {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
 background:none none repeat scroll 0 0;
 float:left;
 width: 216.5px;
@@ -104,7 +110,7 @@ height: 300px;
 position:relative;
 }
 
-.bottomCard {
+.bottomBox {
     left:25px;
     position:absolute;
     width: 200px;
@@ -112,8 +118,7 @@ position:relative;
     top: 20px;
 }
 
-
-.sideItem {
+.sidebarItem {
     clear:both;
     float:left;
     width:150px;
@@ -129,7 +134,7 @@ top:10px;
 left:25px;
 }
 
-#timerPaper {
+#timerCanvas {
 position:absolute;
 width:100px;
 height:150px;
@@ -137,31 +142,28 @@ top:10px;
 left:25px;
 }
 
-#scoreBox {
+#scorebox {
 position:absolute;
 width:100px;
 height:150px;
 top:10px;
 left:25px;
-z-index: 10;
 }
 
-#scoreBoxText {
-position:relative;
-top:60px;
-font: 70px Arial;
-color: #fff;
-text-align: center;
-z-index: 100;
+#scoreboxCanvas {
+position:absolute;
+width:100px;
+height:150px;
+top:10px;
+left:25px;
 }
 
 
-#chimpPaper {
+#chimpCanvas {
 position:absolute;
 top:10px;
 left:25px;
-width:120px; 
-height:125px;
+
 }
 
 #buttons {
diff --git a/examples/adding_up_to_10/exercise.html b/examples/adding_up_to_10_canvas/exercise.html
index a99ec93..a99ec93 100755
--- a/examples/adding_up_to_10/exercise.html
+++ b/examples/adding_up_to_10_canvas/exercise.html
diff --git a/examples/adding_up_to_10/exercise.html b/examples/adding_up_to_10_canvas/index.html
index a99ec93..ea752d9 100755
--- a/examples/adding_up_to_10/exercise.html
+++ b/examples/adding_up_to_10_canvas/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<title>Adding up to 10 - Exercise (Alpha)</title>
+	<title>Karma - Adding Up to 10</title>
 	<meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal" />
 	<link type="text/css" rel="stylesheet" href="css/lesson.css" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -11,23 +11,12 @@
 	<script type="text/javascript" src="../../js/karma.Gettext.js"></script>
 	<script type="text/javascript" src="../../js/jquery.karma.js"></script>
 	<script type="text/javascript" src="js/lesson.js"></script>
-	<link rel="stylesheet" href="css/knavbar.css" type="text/css"/>
 
-</head>
 
-<body>
 
-<section id="navigation">
-	<nav id="knavbar">
-	<a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back" class="floatLeft"></a>
-	<div id="lessonTitle" class="floatLeft"><a id="welcome" href="index_knavbar.html">Adding up to 10</a></div>
-	<a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site" class="floatRight"></a>
-	<a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help" class="floatRight"></a>
-	<img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial" class="floatRight">
-	<a href="exercise.html" class="selected"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise" class="floatRight"></a>
-	</nav>
-</section>
+</head>
 
+<body>
   <div id="karma-main"> 
     <div id="action">
       <div id="actionTop">
@@ -88,7 +77,7 @@
 
 
   </div>
-</div>
+
 
 </body>
 
diff --git a/examples/adding_up_to_10/index_knavbar.html b/examples/adding_up_to_10_canvas/index_knavbar.html
index 6bd5e7a..e1e2fca 100755
--- a/examples/adding_up_to_10/index_knavbar.html
+++ b/examples/adding_up_to_10_canvas/index_knavbar.html
@@ -19,8 +19,8 @@
 <div id="lesson">
 
 <nav>
-<a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back" class="floatLeft"></a>
-<div id="lessonTitle" class="floatLeft"><a id="welcome" href="index_knavbar.html" class="selected">Adding up to 10</a></div>
+<li><a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
+<li><a id="welcome" href="index_knavbar.html" class="selected">Adding up to 10</a></li>
 </nav>
 
 <div id="subject">Mathematics</div>
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10_canvas/js/lesson.js
index ef878d3..ef878d3 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10_canvas/js/lesson.js
diff --git a/examples/adding_up_to_10/assets/en/sounds/en_correct.ogg b/examples/adding_up_to_10_svg/assets/en/sounds/en_correct.ogg
index a0d9e3a..a0d9e3a 100755
--- a/examples/adding_up_to_10/assets/en/sounds/en_correct.ogg
+++ b/examples/adding_up_to_10_svg/assets/en/sounds/en_correct.ogg
diff --git a/examples/adding_up_to_10/assets/en/sounds/en_incorrect.ogg b/examples/adding_up_to_10_svg/assets/en/sounds/en_incorrect.ogg
index 4805e55..4805e55 100755
--- a/examples/adding_up_to_10/assets/en/sounds/en_incorrect.ogg
+++ b/examples/adding_up_to_10_svg/assets/en/sounds/en_incorrect.ogg
diff --git a/examples/adding_up_to_10/assets/es-MX/sounds/es-MX_correct.ogg b/examples/adding_up_to_10_svg/assets/es-MX/sounds/es-MX_correct.ogg
index a54f738..a54f738 100755
--- a/examples/adding_up_to_10/assets/es-MX/sounds/es-MX_correct.ogg
+++ b/examples/adding_up_to_10_svg/assets/es-MX/sounds/es-MX_correct.ogg
diff --git a/examples/adding_up_to_10/assets/es-MX/sounds/es-MX_incorrect.ogg b/examples/adding_up_to_10_svg/assets/es-MX/sounds/es-MX_incorrect.ogg
index 0474b93..0474b93 100755
--- a/examples/adding_up_to_10/assets/es-MX/sounds/es-MX_incorrect.ogg
+++ b/examples/adding_up_to_10_svg/assets/es-MX/sounds/es-MX_incorrect.ogg
diff --git a/examples/adding_up_to_10/assets/generic/images/ball37px.png b/examples/adding_up_to_10_svg/assets/generic/images/ball37px.png
index 4388283..4388283 100755
--- a/examples/adding_up_to_10/assets/generic/images/ball37px.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/ball37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/balloon37px.png b/examples/adding_up_to_10_svg/assets/generic/images/balloon37px.png
index 8f47d6a..8f47d6a 100755
--- a/examples/adding_up_to_10/assets/generic/images/balloon37px.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/balloon37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/banana37px.png b/examples/adding_up_to_10_svg/assets/generic/images/banana37px.png
index 90728e6..90728e6 100755
--- a/examples/adding_up_to_10/assets/generic/images/banana37px.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/banana37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/chilli.png b/examples/adding_up_to_10_svg/assets/generic/images/chilli.png
index 5f8b64d..5f8b64d 100755
--- a/examples/adding_up_to_10/assets/generic/images/chilli.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/chilli.png
diff --git a/examples/adding_up_to_10/assets/generic/images/fish64px.png b/examples/adding_up_to_10_svg/assets/generic/images/fish64px.png
index a29f12c..a29f12c 100755
--- a/examples/adding_up_to_10/assets/generic/images/fish64px.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/fish64px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/flower37px.png b/examples/adding_up_to_10_svg/assets/generic/images/flower37px.png
index 224e707..224e707 100755
--- a/examples/adding_up_to_10/assets/generic/images/flower37px.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/flower37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/happyChimp_120x125.png b/examples/adding_up_to_10_svg/assets/generic/images/happyChimp_120x125.png
index 5e721c9..5e721c9 100755
--- a/examples/adding_up_to_10/assets/generic/images/happyChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/happyChimp_120x125.png
diff --git a/examples/adding_up_to_10/assets/generic/images/happyMonkey.jpg b/examples/adding_up_to_10_svg/assets/generic/images/happyMonkey.jpg
index bfe0d38..bfe0d38 100755
--- a/examples/adding_up_to_10/assets/generic/images/happyMonkey.jpg
+++ b/examples/adding_up_to_10_svg/assets/generic/images/happyMonkey.jpg
diff --git a/examples/adding_up_to_10/assets/generic/images/normalChimp_120x125.png b/examples/adding_up_to_10_svg/assets/generic/images/normalChimp_120x125.png
index a731df4..a731df4 100755
--- a/examples/adding_up_to_10/assets/generic/images/normalChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/normalChimp_120x125.png
diff --git a/examples/adding_up_to_10/assets/generic/images/plussign.png b/examples/adding_up_to_10_svg/assets/generic/images/plussign.png
index 915c5aa..915c5aa 100755
--- a/examples/adding_up_to_10/assets/generic/images/plussign.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/plussign.png
diff --git a/examples/adding_up_to_10/assets/generic/images/sadChimp_120x125.png b/examples/adding_up_to_10_svg/assets/generic/images/sadChimp_120x125.png
index 1dec5f0..1dec5f0 100755
--- a/examples/adding_up_to_10/assets/generic/images/sadChimp_120x125.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/sadChimp_120x125.png
diff --git a/examples/adding_up_to_10/assets/generic/images/scorebox.png b/examples/adding_up_to_10_svg/assets/generic/images/scorebox.png
index 424b60b..424b60b 100755
--- a/examples/adding_up_to_10/assets/generic/images/scorebox.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/scorebox.png
diff --git a/examples/adding_up_to_10/assets/generic/images/sidebar.png b/examples/adding_up_to_10_svg/assets/generic/images/sidebar.png
index 9632788..9632788 100755
--- a/examples/adding_up_to_10/assets/generic/images/sidebar.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/sidebar.png
diff --git a/examples/adding_up_to_10/assets/generic/images/yellowBox.png b/examples/adding_up_to_10_svg/assets/generic/images/yellowBox.png
index f7a72ca..f7a72ca 100755
--- a/examples/adding_up_to_10/assets/generic/images/yellowBox.png
+++ b/examples/adding_up_to_10_svg/assets/generic/images/yellowBox.png
diff --git a/examples/adding_up_to_10/assets/generic/sounds/correct.ogg b/examples/adding_up_to_10_svg/assets/generic/sounds/correct.ogg
index c89ce57..c89ce57 100755
--- a/examples/adding_up_to_10/assets/generic/sounds/correct.ogg
+++ b/examples/adding_up_to_10_svg/assets/generic/sounds/correct.ogg
diff --git a/examples/adding_up_to_10/assets/generic/sounds/incorrect.ogg b/examples/adding_up_to_10_svg/assets/generic/sounds/incorrect.ogg
index 2306562..2306562 100755
--- a/examples/adding_up_to_10/assets/generic/sounds/incorrect.ogg
+++ b/examples/adding_up_to_10_svg/assets/generic/sounds/incorrect.ogg
diff --git a/examples/adding_up_to_10/assets/generic/sounds/trigger.ogg b/examples/adding_up_to_10_svg/assets/generic/sounds/trigger.ogg
index f22512a..f22512a 100755
--- a/examples/adding_up_to_10/assets/generic/sounds/trigger.ogg
+++ b/examples/adding_up_to_10_svg/assets/generic/sounds/trigger.ogg
diff --git a/examples/adding_up_to_10/assets/he/sounds/he_correct.ogg b/examples/adding_up_to_10_svg/assets/he/sounds/he_correct.ogg
index 4e12c65..4e12c65 100755
--- a/examples/adding_up_to_10/assets/he/sounds/he_correct.ogg
+++ b/examples/adding_up_to_10_svg/assets/he/sounds/he_correct.ogg
diff --git a/examples/adding_up_to_10/assets/he/sounds/he_incorrect.ogg b/examples/adding_up_to_10_svg/assets/he/sounds/he_incorrect.ogg
index 9e314bb..9e314bb 100755
--- a/examples/adding_up_to_10/assets/he/sounds/he_incorrect.ogg
+++ b/examples/adding_up_to_10_svg/assets/he/sounds/he_incorrect.ogg
diff --git a/examples/adding_up_to_10/assets/ne/sounds/ne_correct.ogg b/examples/adding_up_to_10_svg/assets/ne/sounds/ne_correct.ogg
index 8ced3cd..8ced3cd 100755
--- a/examples/adding_up_to_10/assets/ne/sounds/ne_correct.ogg
+++ b/examples/adding_up_to_10_svg/assets/ne/sounds/ne_correct.ogg
diff --git a/examples/adding_up_to_10/assets/ne/sounds/ne_incorrect.ogg b/examples/adding_up_to_10_svg/assets/ne/sounds/ne_incorrect.ogg
index 106fe0f..106fe0f 100755
--- a/examples/adding_up_to_10/assets/ne/sounds/ne_incorrect.ogg
+++ b/examples/adding_up_to_10_svg/assets/ne/sounds/ne_incorrect.ogg
diff --git a/examples/adding_up_to_10/css/knavbar.css b/examples/adding_up_to_10_svg/css/knavbar.css
index b39f205..b39f205 100755
--- a/examples/adding_up_to_10/css/knavbar.css
+++ b/examples/adding_up_to_10_svg/css/knavbar.css
diff --git a/examples/adding_up_to_10/css/lesson.css b/examples/adding_up_to_10_svg/css/lesson.css
index e368b14..e368b14 100755
--- a/examples/adding_up_to_10/css/lesson.css
+++ b/examples/adding_up_to_10_svg/css/lesson.css
diff --git a/examples/adding_up_to_10/index.html b/examples/adding_up_to_10_svg/exercise.html
index 6a861d1..97d0855 100755
--- a/examples/adding_up_to_10/index.html
+++ b/examples/adding_up_to_10_svg/exercise.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<title>Karma - Adding Up to 10</title>
+	<title>Adding up to 10 - Exercise (Alpha)</title>
 	<meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal" />
 	<link type="text/css" rel="stylesheet" href="css/lesson.css" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -12,12 +12,23 @@
 	<script type="text/javascript" src="../../js/karma.Gettext.js"></script>
 	<script type="text/javascript" src="../../js/jquery.karma.js"></script>
 	<script type="text/javascript" src="js/lesson.js"></script>
-
-
+	<link rel="stylesheet" href="css/knavbar.css" type="text/css"/>
 
 </head>
 
 <body>
+
+<section id="navigation">
+	<nav id="knavbar">
+	<a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back" class="floatLeft"></a>
+	<div id="lessonTitle" class="floatLeft"><a id="welcome" href="index_knavbar.html">Adding up to 10</a></div>
+	<a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site" class="floatRight"></a>
+	<a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help" class="floatRight"></a>
+	<img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial" class="floatRight">
+	<a href="exercise.html" class="selected"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise" class="floatRight"></a>
+	</nav>
+</section>
+
   <div id="karma-main"> 
     <div id="main">
       <div id="top">
@@ -77,7 +88,7 @@
     <div id="overlay"></div>
     <div id="overlayPaper"></div>
   </div>
-
+</div>
 
 </body>
 
diff --git a/examples/adding_up_to_10/index.html b/examples/adding_up_to_10_svg/index.html
index 6a861d1..6a861d1 100755
--- a/examples/adding_up_to_10/index.html
+++ b/examples/adding_up_to_10_svg/index.html
diff --git a/examples/adding_up_to_10/index_knavbar.html b/examples/adding_up_to_10_svg/index_knavbar.html
index 6bd5e7a..6bd5e7a 100755
--- a/examples/adding_up_to_10/index_knavbar.html
+++ b/examples/adding_up_to_10_svg/index_knavbar.html
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10_svg/js/lesson.js
index ef878d3..ef878d3 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10_svg/js/lesson.js
diff --git a/examples/adding_up_to_10/po/en.po b/examples/adding_up_to_10_svg/po/en.po
index 4d1444f..4d1444f 100755
--- a/examples/adding_up_to_10/po/en.po
+++ b/examples/adding_up_to_10_svg/po/en.po
diff --git a/examples/adding_up_to_10/po/es-MX.po b/examples/adding_up_to_10_svg/po/es-MX.po
index ca1e61c..ca1e61c 100755
--- a/examples/adding_up_to_10/po/es-MX.po
+++ b/examples/adding_up_to_10_svg/po/es-MX.po
diff --git a/examples/adding_up_to_10/po/es.po b/examples/adding_up_to_10_svg/po/es.po
index b665366..b665366 100755
--- a/examples/adding_up_to_10/po/es.po
+++ b/examples/adding_up_to_10_svg/po/es.po
diff --git a/examples/adding_up_to_10/po/he-IL.po b/examples/adding_up_to_10_svg/po/he-IL.po
index f681aca..f681aca 100755
--- a/examples/adding_up_to_10/po/he-IL.po
+++ b/examples/adding_up_to_10_svg/po/he-IL.po
diff --git a/examples/adding_up_to_10/resources.html b/examples/adding_up_to_10_svg/resources.html
index 0e93455..0e93455 100755
--- a/examples/adding_up_to_10/resources.html
+++ b/examples/adding_up_to_10_svg/resources.html