Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline

Conflicts:
	js/jquery.karma.js

6 files changed, 35 insertions, 66 deletions

diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html
index 8c6ef8f..b6a1215 100755
--- a/chakra/grade1mathematics.html
+++ b/chakra/grade1mathematics.html
@@ -55,28 +55,13 @@
 <li><a href="#week4"><img src="../assets/default/images/week4.png" class="icon"></a></li>
 <br /><br />
 <div id="week1" class="lessonlist">
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
+<li><a href="../examples/adding_up_to_10/index.html"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
 </div>
 <div id="week2" class="lessonlist">
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
 </div>
 <div id="week3" class="lessonlist">
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
 </div>
 <div id="week4" class="lessonlist">
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
 </div>
 </div>
 <div id="weeksB" class="weeklist">
@@ -87,28 +72,12 @@
 <li><a href="#week8"><img src="../assets/default/images/week4.png" class="icon"></a></li>
 <br /><br />
 <div id="week5" class="lessonlist">
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
 </div>
 <div id="week6" class="lessonlist">
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
 </div>
 <div id="week7" class="lessonlist">
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
 </div>
 <div id="week8" class="lessonlist">
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview4.jpg" alt="Quadrilaterals" title="Quadrilaterals"><div id="lessonname">Quadrilaterals</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview1.jpg" alt="Adding up to 10" title="Adding up to 10"><div id="lessonname">Adding up to 10</div></a></li>
-<li><a href="tab_grade8"><img class="preview" src="../assets/default/images/preview2.jpg" alt="Everyday expressions" title="Everyday expressions"><div id="lessonname">Everyday expressions</div></a></li>
-<li><a href="tab_grade7"><img class="preview" src="../assets/default/images/preview3.jpg" alt="Can and can't" title="Can and can't"><div id="lessonname">Can and can't</div></a></li>
 </div>
 </div>
 </div>
diff --git a/docs/lesson_plan_template/LessonPlan.html b/docs/lesson_plan_template/LessonPlan.html
index d1f1fc4..4a928e4 100755
--- a/docs/lesson_plan_template/LessonPlan.html
+++ b/docs/lesson_plan_template/LessonPlan.html
@@ -5,6 +5,7 @@
 	<title>Lesson Plan</title>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
     <link type="text/css" rel="stylesheet" href="css/style.css" />
+    <link type="text/css" rel="stylesheet" href="css/Printstyle.css" media="print"/>
 </head>
 <body>
 
diff --git a/docs/lesson_plan_template/TeachersNote.html b/docs/lesson_plan_template/TeachersNote.html
index 52e0b4a..2f811d8 100755
--- a/docs/lesson_plan_template/TeachersNote.html
+++ b/docs/lesson_plan_template/TeachersNote.html
@@ -5,6 +5,7 @@
 	<title>Teacher's Note</title>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
 	<link type="text/css" rel="stylesheet" href="css/style.css" />
+	<link type="text/css" rel="stylesheet" href="css/Printstyle.css" media="print"/>
 </head>
 <body>
 <div class="heading">Teacher's Note</div>
diff --git a/docs/lesson_plan_template/css/style.css b/docs/lesson_plan_template/css/style.css
index f4df4bc..1c7c2f6 100755
--- a/docs/lesson_plan_template/css/style.css
+++ b/docs/lesson_plan_template/css/style.css
@@ -1,5 +1,5 @@
 blockquote {border: 2px solid #000; padding: 10px;}
-div.heading {font-size: 250%; font-weight: bold; text-align: center;}
+div.heading {font-size: 200%; font-weight: bold; text-align: center;}
 .bold {font-weight: bold; line-height: 150%}
     .table
     {
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js
index 15ed461..c67dbb1 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10/js/lesson.js
@@ -108,13 +108,13 @@ k.main(function() {
 	    var imgId = imgNames[ level ] ;
 
  
-	    var card = function (ctx, n, minx, miny, d ) {
-		ctx.save();
+	    var card = function (surface, n, minx, miny, d ) {
+		surface.save();
 		var r = k.rectangle({x:minx, y:miny, width:maskd, height:maskd,
-		    stroke:false,fill:false}).draw(ctx);
+		    stroke:false,fill:false}).draw(surface);
 		
 		//do the clip
-		ctx.clip();
+		//surface.clip();
 		var pos = [];
 		var x, y, flag;
 
@@ -126,7 +126,7 @@ k.main(function() {
 			y = k.math.rand( 0, d );
 			for ( var j=0; j<pos.length; j++) {
 			    if ( k.geometry.distance2( pos[j], 
-				{"x": x, "y": y} )  < 80 ) {
+				{"x": x, "y": y} )  < 120 ) {
 				flag = true;
 				break;
 			    }
@@ -134,32 +134,32 @@ k.main(function() {
 			
 		    }while ( flag === true );
 		    pos.push( { "x":x, "y": y } ); 
-		    k.library.images[ imgId ].draw(ctx, x, y )
+		    k.library.images[ imgId ].draw(surface, x, y )
 		}
 		
 		
 		
-		ctx.restore();
+		surface.restore();
 	    }
 
 
 	    //put the cards
-	    card(k.surfaces["topLt"].ctx, n0 , 0, 0, d);
-	    card(k.surfaces["topRt"].ctx, n1 , 0, 0, d);
-	    card(k.surfaces["bottomLt"].ctx, choices[ 0 ] ,  0, 0, d);
-	    card(k.surfaces["bottomMd"].ctx, choices[ 1 ] , 0, 0, d);
-	    card(k.surfaces["bottomRt"].ctx, choices[ 2 ] , 0, 0, d);
+	    card(k.surfaces["topLt"], n0 , 0, 0, d);
+	    card(k.surfaces["topRt"], n1 , 0, 0, d);
+	    card(k.surfaces["bottomLt"], choices[ 0 ] ,  0, 0, d);
+	    card(k.surfaces["bottomMd"], choices[ 1 ] , 0, 0, d);
+	    card(k.surfaces["bottomRt"], choices[ 2 ] , 0, 0, d);
 	    
     }
 
     var writeScore = function (){
-	k.surfaces["scorebox"].ctx.save();
-	k.surfaces["scorebox"].clear();
-	k.surfaces["scorebox"].ctx.font = "bold 50px sans-serif white";
-	k.surfaces["scorebox"].ctx.fillStyle = "#fff";
-	k.surfaces["scorebox"].ctx.textBaseline = "middle";
-	k.surfaces["scorebox"].ctx.fillText("" + score, 30, 100);
-	k.surfaces["scorebox"].ctx.restore();
+	k.surfaces["scorebox"].save().
+	clear().
+	font("bold 50px sans-serif white").
+	fillStyle("#fff").
+	textBaseline("middle").
+	fillText("" + score, 30, 100).
+	restore();
     };
 
     var answer = function (correct, tooSlow) {
@@ -191,17 +191,14 @@ k.main(function() {
     var animateChimp = function (answer) {
 	k.surfaces["chimp"].clear();
 	if( answer === true){
-	    k.library.images["happyChimp"].draw(k.surfaces["chimp"].
-					  ctx, 0, 0);
+	    k.library.images["happyChimp"].draw(k.surfaces["chimp"], 0, 0);
 	} else {
-	    k.library.images["sadChimp"].draw(k.surfaces["chimp"].
-	    				     ctx, 0, 0);
+	    k.library.images["sadChimp"].draw(k.surfaces["chimp"], 0, 0);
 	}
 
 	var restoreChimp = function () {
 	    k.surfaces["chimp"].clear();
-	    k.library.images["normalChimp"].draw(k.surfaces["chimp"].
-	    					 ctx, 0, 0);
+	    k.library.images["normalChimp"].draw(k.surfaces["chimp"], 0, 0);
 	};
 
 	timerId = setTimeout(restoreChimp, 800);
@@ -228,12 +225,12 @@ k.main(function() {
 
 	//put the buttons
 	var buttons=[];
-	buttons[ 0 ] = { "canvas": k.surfaces["bottomLt"].canvas, "id": 0};
-	buttons[ 1 ] = { "canvas": k.surfaces["bottomMd"].canvas, "id": 1};
-	buttons[ 2 ] = { "canvas": k.surfaces["bottomRt"].canvas, "id": 2};
+	buttons[ 0 ] = { "surface": k.surfaces["bottomLt"], "id": 0};
+	buttons[ 1 ] = { "surface": k.surfaces["bottomMd"], "id": 1};
+	buttons[ 2 ] = { "surface": k.surfaces["bottomRt"], "id": 2};
 	
 	$.each(buttons, function( key, item ) {
-		item.canvas.addEventListener('click',  function( ev ) {
+		item.surface.canvas.addEventListener('click',  function( ev ) {
 		   if ( choices[ item.id ] === total){
 		       answer(true);
 		   }else { answer(false);	   } 
@@ -241,7 +238,7 @@ k.main(function() {
 		}, true);
 	});
     timerId = setInterval (timerFn, 2000);     
-    k.library.images["normalChimp"].draw(k.surfaces["chimp"].ctx, 0, 0);
+    k.library.images["normalChimp"].draw(k.surfaces["chimp"], 0, 0);
     game();
 //end of Karma.main
 });
diff --git a/js/jquery.karma.js b/js/jquery.karma.js
index 7438bb6..a9c5a59 100755
--- a/js/jquery.karma.js
+++ b/js/jquery.karma.js
@@ -202,9 +202,9 @@ var Karma = function(options ) {
 				toFix[ i ] ].localized.replace('\$', lang );
 		}
 		//dirty hack to support {lang}_AudioFile
-		var prefix = lang.substring(0, 2)+"_";
+		alert(lang);
+		var prefix = lang+"_";
 		that.paths[ "sounds" ].localized+=prefix;
-		that.paths[ "sounds" ].generic+=prefix;
 	}
 	/**
 	It will attempt to load a language file, the posible languages are defined 
@@ -458,7 +458,7 @@ Karma.prototype.main = function ( cb ) {
 			statusUpdate( counters.loaded, counters.error, totalItems);
 			if ( counters.loaded + counters.error === totalItems ) {
 				if ( counters.error > 0 ){
-					throw ( "Images not found: " + errors );
+					throw ( "Media files not found: " + errors );
 				}
 				$("#karma-loader:hiden:first").fadeOut("slow",function(){ 
 					$(this).remove();});
@@ -748,6 +748,7 @@ var KSurface = Class(
 				width  || this.width, 
 				height || this.height
 			);
+		    return this;
 		},
 		draw: function (  ) {