diff options
author | Bryan Berry <bryan@olenepal.org> | 2010-02-01 09:44:59 (GMT) |
---|---|---|
committer | Bryan Berry <bryan@olenepal.org> | 2010-02-01 09:44:59 (GMT) |
commit | 6eb14bc9700d6b873c5a716812e943e026872ca5 (patch) | |
tree | 2d89c76ffc4d72251ae0eaf18548704d50f2f203 | |
parent | 8adc6d0e39a1dec5d2e43c316d7bde1d18babed4 (diff) |
shrink bg image and delete some unneeded images
-rw-r--r-- | css/kStart.css | 2 | ||||
-rwxr-xr-x | examples/English_Animal_Identification/assets/image/background.jpg | bin | 76111 -> 0 bytes | |||
-rw-r--r-- | examples/English_Animal_Identification/assets/image/background.png | bin | 736613 -> 82348 bytes | |||
-rw-r--r-- | examples/English_Animal_Identification/assets/image/background1.png | bin | 736592 -> 0 bytes | |||
-rwxr-xr-x | examples/English_Animal_Identification/assets/image/main.jpg | bin | 89900 -> 0 bytes | |||
-rwxr-xr-x | examples/English_Animal_Identification/assets/image/orginal.jpg | bin | 127521 -> 0 bytes | |||
-rwxr-xr-x | examples/English_Animal_Identification/assets/image/play_again.jpg | bin | 11128 -> 0 bytes | |||
-rwxr-xr-x | examples/English_Animal_Identification/assets/image/play_again_icon.png | bin | 1226 -> 0 bytes | |||
-rwxr-xr-x | examples/English_Animal_Identification/css/lesson.css | 2 | ||||
-rwxr-xr-x | examples/English_Animal_Identification/js/lesson.js | 22 | ||||
-rw-r--r-- | examples/English_Animal_Identification/start.html | 17 | ||||
-rwxr-xr-x | js/ui.kFooter.js | 4 |
12 files changed, 34 insertions, 13 deletions
diff --git a/css/kStart.css b/css/kStart.css index 5ea1f3b..1bee535 100644 --- a/css/kStart.css +++ b/css/kStart.css @@ -16,7 +16,7 @@ #kStart #top{ height: 15%; width: 100%; - color: blue; + color: #8a72c4; } #backBtn{ diff --git a/examples/English_Animal_Identification/assets/image/background.jpg b/examples/English_Animal_Identification/assets/image/background.jpg Binary files differdeleted file mode 100755 index ca0ae47..0000000 --- a/examples/English_Animal_Identification/assets/image/background.jpg +++ /dev/null diff --git a/examples/English_Animal_Identification/assets/image/background.png b/examples/English_Animal_Identification/assets/image/background.png Binary files differindex 25911d1..146c777 100644 --- a/examples/English_Animal_Identification/assets/image/background.png +++ b/examples/English_Animal_Identification/assets/image/background.png diff --git a/examples/English_Animal_Identification/assets/image/background1.png b/examples/English_Animal_Identification/assets/image/background1.png Binary files differdeleted file mode 100644 index c972f15..0000000 --- a/examples/English_Animal_Identification/assets/image/background1.png +++ /dev/null diff --git a/examples/English_Animal_Identification/assets/image/main.jpg b/examples/English_Animal_Identification/assets/image/main.jpg Binary files differdeleted file mode 100755 index c764a7a..0000000 --- a/examples/English_Animal_Identification/assets/image/main.jpg +++ /dev/null diff --git a/examples/English_Animal_Identification/assets/image/orginal.jpg b/examples/English_Animal_Identification/assets/image/orginal.jpg Binary files differdeleted file mode 100755 index 869a3c1..0000000 --- a/examples/English_Animal_Identification/assets/image/orginal.jpg +++ /dev/null diff --git a/examples/English_Animal_Identification/assets/image/play_again.jpg b/examples/English_Animal_Identification/assets/image/play_again.jpg Binary files differdeleted file mode 100755 index db3ae56..0000000 --- a/examples/English_Animal_Identification/assets/image/play_again.jpg +++ /dev/null diff --git a/examples/English_Animal_Identification/assets/image/play_again_icon.png b/examples/English_Animal_Identification/assets/image/play_again_icon.png Binary files differdeleted file mode 100755 index ce6b708..0000000 --- a/examples/English_Animal_Identification/assets/image/play_again_icon.png +++ /dev/null diff --git a/examples/English_Animal_Identification/css/lesson.css b/examples/English_Animal_Identification/css/lesson.css index 7646c16..75bba59 100755 --- a/examples/English_Animal_Identification/css/lesson.css +++ b/examples/English_Animal_Identification/css/lesson.css @@ -1,6 +1,6 @@ @CHARSET "UTF-8"; body { - background: url(../assets/image/background.jpg) no-repeat; + background: url(../assets/image/background.png) no-repeat; width: 1200px; height: 884px; -moz-background-size: 100% 100%; diff --git a/examples/English_Animal_Identification/js/lesson.js b/examples/English_Animal_Identification/js/lesson.js index d71f853..8ddb02d 100755 --- a/examples/English_Animal_Identification/js/lesson.js +++ b/examples/English_Animal_Identification/js/lesson.js @@ -41,10 +41,24 @@ $(document).ready( $('.imageBox').hide(); $('#gameOver').show(); }); - - load_images(); //load the image numbers for random display - game(); //let the game begin - + kFooter.bind('kFooterRestart', + function() { + object_counter = 1; + imgNameRand = []; + optPosition = []; + optOtherPos = []; + imageObject = []; + score = 0; + wrong_selected = 0; //wrong option selected so don't score up + + load_images(); + game(); + + } + ); + + load_images(); //load the image numbers for random display + game(); //let the game begin function checkDisplay(){ //Displays the correct and incorrect info diff --git a/examples/English_Animal_Identification/start.html b/examples/English_Animal_Identification/start.html index 2f1aeb7..8e8521b 100644 --- a/examples/English_Animal_Identification/start.html +++ b/examples/English_Animal_Identification/start.html @@ -47,8 +47,11 @@ </div> </div> <div id="bottom"> - <div id="logo" class="center"><div></div></div> - + <a href="http://www.olenepal.org"> + <div id="logo" class="center"> + <div></div> + </div> + </a> <div id="copyright"> Copyright <a href="http://www.olenepal.org">OLE Nepal</a> 2009, <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a> @@ -56,10 +59,14 @@ </div> <script type="text/javascript"> Karma.scaleToViewport(); - /*if (window.innerWidth !== 1200){ - //$('#kStart').css({width:'800px', height:'600px'}); - $('#kStart').css({width: window.innerWidth, height: window.innerHeight -13}); + + /*if(globalStorage['foo'] === "foobar"){ + console.log('fussybar'); + } else{ + document.write("" + globalStorage.getItem('foo')); + globalStorage['foo'] = "foobar"; } */ + </script> </body> </html>
\ No newline at end of file diff --git a/js/ui.kFooter.js b/js/ui.kFooter.js index 23a4eef..c126521 100755 --- a/js/ui.kFooter.js +++ b/js/ui.kFooter.js @@ -315,7 +315,7 @@ * @type boolean * @default false */ - startButton: true, + startButton: false, /** Display the Retart Button * @type boolean * @default true @@ -325,7 +325,7 @@ * @type boolean * @default false */ - pauseButton: true + pauseButton: false }; })(jQuery);
\ No newline at end of file |