From 5bb09b0ec7de1e6d95c33ed780cd426b367ba95a Mon Sep 17 00:00:00 2001 From: hitman Date: Thu, 24 Sep 2009 05:29:42 +0000 Subject: can now add images to all the boxes --- diff --git a/assets/default/images/chakra_logo.png b/assets/default/images/chakra_logo.png index b7f9b3a..b7f9b3a 100644..100755 --- a/assets/default/images/chakra_logo.png +++ b/assets/default/images/chakra_logo.png Binary files differ diff --git a/assets/default/images/english.png b/assets/default/images/english.png index 6a3eaab..6a3eaab 100644..100755 --- a/assets/default/images/english.png +++ b/assets/default/images/english.png Binary files differ diff --git a/assets/default/images/favicon.ico b/assets/default/images/favicon.ico index 20bf7f1..20bf7f1 100644..100755 --- a/assets/default/images/favicon.ico +++ b/assets/default/images/favicon.ico Binary files differ diff --git a/assets/default/images/geography.png b/assets/default/images/geography.png index 3a9a2dc..3a9a2dc 100644..100755 --- a/assets/default/images/geography.png +++ b/assets/default/images/geography.png Binary files differ diff --git a/assets/default/images/grade1.png b/assets/default/images/grade1.png index 2e27b65..2e27b65 100644..100755 --- a/assets/default/images/grade1.png +++ b/assets/default/images/grade1.png Binary files differ diff --git a/assets/default/images/grade2_bw.png b/assets/default/images/grade2_bw.png index 28eb7c0..28eb7c0 100644..100755 --- a/assets/default/images/grade2_bw.png +++ b/assets/default/images/grade2_bw.png Binary files differ diff --git a/assets/default/images/grade3.png b/assets/default/images/grade3.png index 8248bf0..8248bf0 100644..100755 --- a/assets/default/images/grade3.png +++ b/assets/default/images/grade3.png Binary files differ diff --git a/assets/default/images/grade4_bw.png b/assets/default/images/grade4_bw.png index c597442..c597442 100644..100755 --- a/assets/default/images/grade4_bw.png +++ b/assets/default/images/grade4_bw.png Binary files differ diff --git a/assets/default/images/grade5_bw.png b/assets/default/images/grade5_bw.png index a8a9d8a..a8a9d8a 100644..100755 --- a/assets/default/images/grade5_bw.png +++ b/assets/default/images/grade5_bw.png Binary files differ diff --git a/assets/default/images/grade6.png b/assets/default/images/grade6.png index 26e6f9b..26e6f9b 100644..100755 --- a/assets/default/images/grade6.png +++ b/assets/default/images/grade6.png Binary files differ diff --git a/assets/default/images/grade7_bw.png b/assets/default/images/grade7_bw.png index 6ff1dd1..6ff1dd1 100644..100755 --- a/assets/default/images/grade7_bw.png +++ b/assets/default/images/grade7_bw.png Binary files differ diff --git a/assets/default/images/grade8_bw.png b/assets/default/images/grade8_bw.png index 15b3be7..15b3be7 100644..100755 --- a/assets/default/images/grade8_bw.png +++ b/assets/default/images/grade8_bw.png Binary files differ diff --git a/assets/default/images/health.png b/assets/default/images/health.png index 305c8d0..305c8d0 100644..100755 --- a/assets/default/images/health.png +++ b/assets/default/images/health.png Binary files differ diff --git a/assets/default/images/help.png b/assets/default/images/help.png index 9209167..9209167 100644..100755 --- a/assets/default/images/help.png +++ b/assets/default/images/help.png Binary files differ diff --git a/assets/default/images/history.png b/assets/default/images/history.png index 79a79c0..79a79c0 100644..100755 --- a/assets/default/images/history.png +++ b/assets/default/images/history.png Binary files differ diff --git a/assets/default/images/karma_logo.png b/assets/default/images/karma_logo.png index dc8610a..dc8610a 100644..100755 --- a/assets/default/images/karma_logo.png +++ b/assets/default/images/karma_logo.png Binary files differ diff --git a/assets/default/images/mathematics.png b/assets/default/images/mathematics.png index e8a6ee2..e8a6ee2 100644..100755 --- a/assets/default/images/mathematics.png +++ b/assets/default/images/mathematics.png Binary files differ diff --git a/assets/default/images/music.png b/assets/default/images/music.png index 0530497..0530497 100644..100755 --- a/assets/default/images/music.png +++ b/assets/default/images/music.png Binary files differ diff --git a/assets/default/images/mystuff.png b/assets/default/images/mystuff.png index 40d3dba..40d3dba 100644..100755 --- a/assets/default/images/mystuff.png +++ b/assets/default/images/mystuff.png Binary files differ diff --git a/assets/default/images/nepali.png b/assets/default/images/nepali.png index 08b82a7..08b82a7 100644..100755 --- a/assets/default/images/nepali.png +++ b/assets/default/images/nepali.png Binary files differ diff --git a/assets/default/images/profile.png b/assets/default/images/profile.png index 16b5f9b..16b5f9b 100644..100755 --- a/assets/default/images/profile.png +++ b/assets/default/images/profile.png Binary files differ diff --git a/assets/default/images/science.png b/assets/default/images/science.png index 7422dcb..7422dcb 100644..100755 --- a/assets/default/images/science.png +++ b/assets/default/images/science.png Binary files differ diff --git a/chakra/grade1.html b/chakra/grade1.html index d061a73..d061a73 100644..100755 --- a/chakra/grade1.html +++ b/chakra/grade1.html diff --git a/chakra/grade1english.html b/chakra/grade1english.html index 2f062ec..2f062ec 100644..100755 --- a/chakra/grade1english.html +++ b/chakra/grade1english.html diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html index 70d7de1..70d7de1 100644..100755 --- a/chakra/grade1mathematics.html +++ b/chakra/grade1mathematics.html diff --git a/css/chakra.css b/css/chakra.css index f9a6304..f9a6304 100644..100755 --- a/css/chakra.css +++ b/css/chakra.css diff --git a/docs/jsdoc/symbols/jQuery.html b/docs/jsdoc/symbols/jQuery.html index 465eabf..465eabf 100644..100755 --- a/docs/jsdoc/symbols/jQuery.html +++ b/docs/jsdoc/symbols/jQuery.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html b/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html index b9a0ae2..b9a0ae2 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KGraphic.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KGroup.html b/docs/jsdoc/symbols/jQueryanonymous-KGroup.html index c0860cc..c0860cc 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KGroup.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KGroup.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KImage.html b/docs/jsdoc/symbols/jQueryanonymous-KImage.html index d10b28f..d10b28f 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KImage.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KImage.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KMedia.html b/docs/jsdoc/symbols/jQueryanonymous-KMedia.html index 9633275..9633275 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KMedia.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KMedia.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KObject.html b/docs/jsdoc/symbols/jQueryanonymous-KObject.html index 8641378..8641378 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KObject.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KObject.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html b/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html index f1e9ded..f1e9ded 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KRectangle.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KShape.html b/docs/jsdoc/symbols/jQueryanonymous-KShape.html index 7c11509..7c11509 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KShape.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KShape.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KSound.html b/docs/jsdoc/symbols/jQueryanonymous-KSound.html index ad3a13d..ad3a13d 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KSound.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KSound.html diff --git a/docs/jsdoc/symbols/jQueryanonymous-KSurface.html b/docs/jsdoc/symbols/jQueryanonymous-KSurface.html index f136bcd..f136bcd 100644..100755 --- a/docs/jsdoc/symbols/jQueryanonymous-KSurface.html +++ b/docs/jsdoc/symbols/jQueryanonymous-KSurface.html diff --git a/docs/jsdoc/symbols/src/jquery.karma.js.html b/docs/jsdoc/symbols/src/jquery.karma.js.html index 9d74e19..9d74e19 100644..100755 --- a/docs/jsdoc/symbols/src/jquery.karma.js.html +++ b/docs/jsdoc/symbols/src/jquery.karma.js.html diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js index 8f47041..d07ca2f 100755 --- a/examples/adding_up_to_10/js/lesson.js +++ b/examples/adding_up_to_10/js/lesson.js @@ -86,13 +86,13 @@ k.main(function() { }; */ -/* function game () { + function game () { // $.each(sets, function () { // this.remove(); // }); - writeScore(); +// writeScore(); total = k.math.rand( 2, 10 ); //the total n0 = total - k.math.rand(1, total - 1 ); //first number n1 = total - n0; //second number @@ -120,26 +120,26 @@ k.main(function() { var imgId = imgNames[ level ] ; - var card = function (paper, prefix, n, d ) { + var card = function (box, n, d) { // var r = k.rectangle({x:minx, y:miny, width:maskd, height:maskd, // stroke:false,fill:false}).draw(surface); //do the clip //surface.clip(); - var pos = []; - var x, y, flag; - var imgNames = {}; - var x, y; - + var pos = []; + var x, y, flag; + var imgNames = {}; + var prefix = box["prefix"]; imgNames[prefix] = []; - - - - for (var i=0; i