From f3b54198dd0a82693d69b682b76ae193f824c46d Mon Sep 17 00:00:00 2001 From: "Hilmer, Carsten" Date: Wed, 23 Nov 2016 11:18:48 +0100 Subject: [PATCH] Refactoring, auslagerung der Spielsets, dynamisches CSS --- www/css/style.css | 211 +----------------- www/index.html | 23 +- www/js/app.js | 9 +- www/spielsets/minispielset1/css/minispiel.css | 12 + .../js/minispiel1_controller.js | 2 +- .../minispielset1}/templates/minispiel1.html | 0 www/spielsets/spielset1/css/spielset.css | 174 +++++++++++++++ .../spielset1/images}/Mentor/mentor_64px.png | Bin .../spielset1/images}/Mentor/mentor_bravo.png | Bin .../images}/Mentor/mentorhelp_64px.png | Bin .../spielset1/images/{ => Tiere}/Affe.png | Bin .../spielset1/images/{ => Tiere}/Esel.png | Bin .../spielset1/images/{ => Tiere}/Hase.png | Bin .../spielset1/images/{ => Tiere}/Hund.png | Bin .../spielset1/images/{ => Tiere}/Kamel.png | Bin .../spielset1/images/{ => Tiere}/Katze.png | Bin .../spielset1/images/{ => Tiere}/Krokodil.png | Bin .../spielset1/images/{ => Tiere}/Kuh.png | Bin .../spielset1/images/{ => Tiere}/Loewe.png | Bin .../spielset1/images/{ => Tiere}/Maus.png | Bin .../spielset1/images/{ => Tiere}/Nashorn.png | Bin .../spielset1/images/{ => Tiere}/Nilpferd.png | Bin .../spielset1/images/{ => Tiere}/Schaf.png | Bin .../images/{ => Tiere}/Schildkroete.png | Bin .../spielset1/images/{ => Tiere}/Schwein.png | Bin .../spielset1/images/{ => Tiere}/Stier.png | Bin www/spielsets/spielset1/images/background.svg | 128 +++++++++++ .../spielset1}/js/suchspiel_controller.js | 2 +- www/spielsets/spielset1/spielset.json | 32 +-- .../spielset1}/templates/suchspiel.html | 0 www/templates/home.html | 2 +- 31 files changed, 346 insertions(+), 249 deletions(-) rename www/{ => spielsets/minispielset1}/js/minispiel1_controller.js (98%) rename www/{ => spielsets/minispielset1}/templates/minispiel1.html (100%) rename www/{img => spielsets/spielset1/images}/Mentor/mentor_64px.png (100%) rename www/{img => spielsets/spielset1/images}/Mentor/mentor_bravo.png (100%) rename www/{img => spielsets/spielset1/images}/Mentor/mentorhelp_64px.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Affe.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Esel.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Hase.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Hund.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Kamel.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Katze.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Krokodil.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Kuh.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Loewe.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Maus.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Nashorn.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Nilpferd.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Schaf.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Schildkroete.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Schwein.png (100%) rename www/spielsets/spielset1/images/{ => Tiere}/Stier.png (100%) create mode 100644 www/spielsets/spielset1/images/background.svg rename www/{ => spielsets/spielset1}/js/suchspiel_controller.js (99%) rename www/{ => spielsets/spielset1}/templates/suchspiel.html (100%) diff --git a/www/css/style.css b/www/css/style.css index 4b0cca7..c67f1d6 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -1,15 +1,5 @@ -/* Empty. Add your own CSS if you like -.scroll-content{ - background: url("../img/background.svg") no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -} -*/ - .scroll-content { - /*background: url("../img/Background/background.svg");*/ + background: url("../img/Background/background.svg"); background-size: cover; color: #333; font: 100% Arial, Sans Serif; @@ -19,21 +9,6 @@ overflow-x: hidden; } -/* -.scroll-content { -background: url("../img/background.svg"); --webkit-animation: backgroundScroll 50s linear infinite; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; -animation: backgroundScroll 50s linear infinite; -} - -@-webkit-keyframes backgroundScroll { -from {background-position: 0 0;} -to {background-position: -2000px 0;} -} - */ .baumhaus { background: url("../img/Background/treehouse.svg"); background-size: cover; @@ -87,19 +62,12 @@ to {background-position: -2000px 0;} overflow: hidden; } -/* Tierbilder groessen */ -.imagesizebig{ +/* Bild groessen */ +.suchspielbuttonsizebig{ width:128px; height:128px; } -.imagesizemedium{ - width:96px; - height:96px; -} - - - .gras { background: url("../img/Background/Grasbuechel.svg"); background-size: cover; @@ -109,133 +77,6 @@ to {background-position: -2000px 0;} overflow: hidden; } - -.statusbar{ - position: absolute; - bottom: 0px; - left: 0px; - width: 100%; - height: 64px; - overflow: hidden; - text-align: center; -} - - .myborder{ - display: inline-block; - border-radius: 6px; - color: black; - border-style: solid; - border-color: black; - border-width: 2px; - } - -.neon { - font-family: sans-serif; - text-transform: uppercase; - font-size: 60px; - font-weight: bold; - font-style: italic; - letter-spacing: .1em; - color: white; - text-shadow: 0 0 5px white, - 0 0 10px white, - 0 0 20px yellow, - 0 0 40px yellow, - 0 0 60px yellow, - 0 0 90px yellow, - 0 0 120px yellow, - 0 0 160px yellow; -} - - -.spieltimer { - font-family: sans-serif; - text-transform: uppercase; - font-size: 40px; - font-weight: bold; - font-style: italic; - letter-spacing: .1em; - color: white; - text-shadow: 0 0 5px white, - 0 0 10px white, - 0 0 20px yellow, - 0 0 40px yellow, - 0 0 60px yellow, - 0 0 90px yellow, - 0 0 120px yellow, - 0 0 160px yellow; -} - - -.spieltimerdiv { - position: absolute; - bottom:0px; - left:0px; - width: 100%; - height: 50px; - overflow: hidden; -} - -.punktestand { - position: absolute; - bottom:-15px; - right:0px; - width: 100%; - height: 50px; - font-family: sans-serif; - text-transform: uppercase; - font-size: 30px; - font-weight: bold; - font-style: italic; - letter-spacing: .1em; - color:white; - text-align: right; - overflow: hidden; -} - - - .redborder{ - display: inline-block; - border-radius: 6px; - color: black; - border-style: solid; - border-color: red; - border-width: 2px; - } - - -.mentorhilfe { - position: absolute; - bottom: 0; - left: 0; - width: 64px; - height: 64px; - overflow: hidden; - background: url('../img/Mentor/mentorhelp_64px.png'); -} - -.mentorborder { - position: absolute; - bottom: 0; - left: 0; - width: 64px; - height: 64px; - overflow: hidden; - background: url('../img/Mentor/mentorhelp_64px.png'); -} - -.mentor { - width: 64px; - height: 640px; - background: url('../img/Mentor/mentor_64px.png') left center; - -webkit-animation: mentorsprite 4s steps(10) infinite; -} - -@-webkit-keyframes mentorsprite { - 100% { background-position: 0 -640px; } -} - - .baumhausaction { position: absolute; top: 100px; @@ -266,29 +107,6 @@ to {background-position: -2000px 0;} } -.mentorborderbravo { - position: fixed; - top: 50%; - left: 50%; - width: 256px; - height: 256px; - margin-left: -128px; - margin-top: -128px; - overflow: hidden; -} - -.mentorbravo { - width: 256px; - height: 1024px; - background: url('../img/Mentor/mentor_bravo.png') left center; - -webkit-animation: mentorspritebravo 2.8s steps(4) infinite; -} - -@-webkit-keyframes mentorspritebravo { - 100% { background-position: 0 -1024px; } -} - - #background-wrap { bottom: 0; left: 0; @@ -359,29 +177,6 @@ to {background-position: -2000px 0;} transform: scale(0.5); } -/* -.x4 { - -webkit-animation: animateCloud 18s linear infinite; - -moz-animation: animateCloud 18s linear infinite; - animation: animateCloud 18s linear infinite; - - -webkit-transform: scale(0.4); - -moz-transform: scale(0.4); - transform: scale(0.4); -} - -.x5 { - -webkit-animation: animateCloud 25s linear infinite; - -moz-animation: animateCloud 25s linear infinite; - animation: animateCloud 25s linear infinite; - - -webkit-transform: scale(0.55); - -moz-transform: scale(0.55); - transform: scale(0.55); -} -*/ -/* OBJECTS */ - .ufo { background: url('../img/ufo.png'); position: relative; diff --git a/www/index.html b/www/index.html index e97f663..419f0f1 100644 --- a/www/index.html +++ b/www/index.html @@ -17,8 +17,6 @@ --> - - @@ -42,27 +40,14 @@ - - - + + + + - - - diff --git a/www/js/app.js b/www/js/app.js index 990e6a3..54dd360 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -17,7 +17,7 @@ window.globalVariable = { // angular.module is a global place for creating, registering and retrieving Angular modules // 'starter' is the name of this angular module example (also set in a attribute in index.html) // the 2nd parameter is an array of 'requires' -angular.module('kinderspiel', ['ionic', 'ngCordova','ngAnimate', 'ngDraggable', 'mn', 'kinderspiel.controllers', 'kinderspiel.services']) +angular.module('kinderspiel', ['ionic', 'ngCordova','ngAnimate', 'ngDraggable', 'mn', 'angularCSS', 'kinderspiel.controllers', 'kinderspiel.services']) .run(function($ionicPlatform, $rootScope, $state, backgroundsounds_mediahandler) { @@ -115,20 +115,23 @@ angular.module('kinderspiel', ['ionic', 'ngCordova','ngAnimate', 'ngDraggable', url: '/home', abstract: false, templateUrl: 'templates/home.html', + css: 'css/style.css', controller: 'home', reload: true }) .state('suchspiel', { url: '/suchspiel', cache: false, - templateUrl: 'templates/suchspiel.html', + templateUrl: 'spielsets/spielset1/templates/suchspiel.html', + css: 'spielsets/spielset1/css/spielset.css', controller: 'Suchspiel', reload: true }) .state('minispiel1', { url: '/minispiel1', cache: false, - templateUrl: 'templates/minispiel1.html', + templateUrl: 'spielsets/minispielset1/templates/minispiel1.html', + css: 'spielsets/minispielset1/css/minispiel.css', controller: 'Minispiel1', reload: true }) diff --git a/www/spielsets/minispielset1/css/minispiel.css b/www/spielsets/minispielset1/css/minispiel.css index 8ec76d8..e97d4e9 100644 --- a/www/spielsets/minispielset1/css/minispiel.css +++ b/www/spielsets/minispielset1/css/minispiel.css @@ -1,3 +1,15 @@ +/* Hintergrundbild */ +.scroll-content { + background: url("../images/background.png"); + background-size: cover; + color: #333; + font: 100% Arial, Sans Serif; + height: 100vh; + margin: 0; + padding: 0; + overflow-x: hidden; +} + .teddy { position: fixed; top: 50%; diff --git a/www/js/minispiel1_controller.js b/www/spielsets/minispielset1/js/minispiel1_controller.js similarity index 98% rename from www/js/minispiel1_controller.js rename to www/spielsets/minispielset1/js/minispiel1_controller.js index 0cd1fcb..49d492a 100644 --- a/www/js/minispiel1_controller.js +++ b/www/spielsets/minispielset1/js/minispiel1_controller.js @@ -19,7 +19,7 @@ $scope.$on("$ionicView.beforeEnter", function(event, data){ /* * Hintergrundbild setzen */ - $rootScope.backgroundimage = "spielsets/minispielset1/images/background.png"; + //$rootScope.backgroundimage = "spielsets/minispielset1/images/background.png"; }); $ionicPlatform.ready(function() { diff --git a/www/templates/minispiel1.html b/www/spielsets/minispielset1/templates/minispiel1.html similarity index 100% rename from www/templates/minispiel1.html rename to www/spielsets/minispielset1/templates/minispiel1.html diff --git a/www/spielsets/spielset1/css/spielset.css b/www/spielsets/spielset1/css/spielset.css index e69de29..8c03eee 100644 --- a/www/spielsets/spielset1/css/spielset.css +++ b/www/spielsets/spielset1/css/spielset.css @@ -0,0 +1,174 @@ +/* Hingrundbild */ +.scroll-content { + background: url("../images/background.svg"); + background-size: cover; + color: #333; + font: 100% Arial, Sans Serif; + height: 100vh; + margin: 0; + padding: 0; + overflow-x: hidden; +} + +/* Bildgrößen für Tierkarten */ +.imagesizebig{ + width:128px; + height:128px; +} + +.imagesizemedium{ + width:96px; + height:96px; +} + +/* Runder Rahmen für Tierkarten*/ +.myborder{ + display: inline-block; + border-radius: 6px; + color: black; + border-style: solid; + border-color: black; + border-width: 2px; + } + +/* Rahmen für Elemente am unteren Rand, Mentorenhilfe, timer, Punkte */ +.statusbar{ + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 64px; + overflow: hidden; + text-align: center; +} + +/* Neon Effekt für Spieltimer */ + .neon { + font-family: sans-serif; + text-transform: uppercase; + font-size: 60px; + font-weight: bold; + font-style: italic; + letter-spacing: .1em; + color: white; + text-shadow: 0 0 5px white, + 0 0 10px white, + 0 0 20px yellow, + 0 0 40px yellow, + 0 0 60px yellow, + 0 0 90px yellow, + 0 0 120px yellow, + 0 0 160px yellow; +} + +.spieltimer { + font-family: sans-serif; + text-transform: uppercase; + font-size: 40px; + font-weight: bold; + font-style: italic; + letter-spacing: .1em; + color: white; + text-shadow: 0 0 5px white, + 0 0 10px white, + 0 0 20px yellow, + 0 0 40px yellow, + 0 0 60px yellow, + 0 0 90px yellow, + 0 0 120px yellow, + 0 0 160px yellow; +} + + +.spieltimerdiv { + position: absolute; + bottom:0px; + left:0px; + width: 100%; + height: 50px; + overflow: hidden; +} + +.punktestand { + position: absolute; + bottom:-15px; + right:0px; + width: 100%; + height: 50px; + font-family: sans-serif; + text-transform: uppercase; + font-size: 30px; + font-weight: bold; + font-style: italic; + letter-spacing: .1em; + color:white; + text-align: right; + overflow: hidden; +} + +/* Roter Rahmen für Spielauflösung, noch ungenutzt */ + .redborder{ + display: inline-block; + border-radius: 6px; + color: black; + border-style: solid; + border-color: red; + border-width: 2px; + } + + +/* Standbild-Mentor in Statusbar */ +.mentorhilfe { + position: absolute; + bottom: 0; + left: 0; + width: 64px; + height: 64px; + overflow: hidden; + background: url('../images/Mentor/mentorhelp_64px.png'); +} + +/* Animierter-Mentor in Statusbar */ +.mentorborder { + position: absolute; + bottom: 0; + left: 0; + width: 64px; + height: 64px; + overflow: hidden; + background: url('../images/Mentor/mentorhelp_64px.png'); +} + +.mentor { + width: 64px; + height: 640px; + background: url('../images/Mentor/mentor_64px.png') left center; + -webkit-animation: mentorsprite 4s steps(10) infinite; +} + +@-webkit-keyframes mentorsprite { + 100% { background-position: 0 -640px; } +} + +/* Grosser Mentor bei Erfolg */ +.mentorborderbravo { + position: fixed; + top: 50%; + left: 50%; + width: 256px; + height: 256px; + margin-left: -128px; + margin-top: -128px; + overflow: hidden; +} + +.mentorbravo { + width: 256px; + height: 1024px; + background: url('../images/Mentor/mentor_bravo.png') left center; + -webkit-animation: mentorspritebravo 2.8s steps(4) infinite; +} + +@-webkit-keyframes mentorspritebravo { + 100% { background-position: 0 -1024px; } +} \ No newline at end of file diff --git a/www/img/Mentor/mentor_64px.png b/www/spielsets/spielset1/images/Mentor/mentor_64px.png similarity index 100% rename from www/img/Mentor/mentor_64px.png rename to www/spielsets/spielset1/images/Mentor/mentor_64px.png diff --git a/www/img/Mentor/mentor_bravo.png b/www/spielsets/spielset1/images/Mentor/mentor_bravo.png similarity index 100% rename from www/img/Mentor/mentor_bravo.png rename to www/spielsets/spielset1/images/Mentor/mentor_bravo.png diff --git a/www/img/Mentor/mentorhelp_64px.png b/www/spielsets/spielset1/images/Mentor/mentorhelp_64px.png similarity index 100% rename from www/img/Mentor/mentorhelp_64px.png rename to www/spielsets/spielset1/images/Mentor/mentorhelp_64px.png diff --git a/www/spielsets/spielset1/images/Affe.png b/www/spielsets/spielset1/images/Tiere/Affe.png similarity index 100% rename from www/spielsets/spielset1/images/Affe.png rename to www/spielsets/spielset1/images/Tiere/Affe.png diff --git a/www/spielsets/spielset1/images/Esel.png b/www/spielsets/spielset1/images/Tiere/Esel.png similarity index 100% rename from www/spielsets/spielset1/images/Esel.png rename to www/spielsets/spielset1/images/Tiere/Esel.png diff --git a/www/spielsets/spielset1/images/Hase.png b/www/spielsets/spielset1/images/Tiere/Hase.png similarity index 100% rename from www/spielsets/spielset1/images/Hase.png rename to www/spielsets/spielset1/images/Tiere/Hase.png diff --git a/www/spielsets/spielset1/images/Hund.png b/www/spielsets/spielset1/images/Tiere/Hund.png similarity index 100% rename from www/spielsets/spielset1/images/Hund.png rename to www/spielsets/spielset1/images/Tiere/Hund.png diff --git a/www/spielsets/spielset1/images/Kamel.png b/www/spielsets/spielset1/images/Tiere/Kamel.png similarity index 100% rename from www/spielsets/spielset1/images/Kamel.png rename to www/spielsets/spielset1/images/Tiere/Kamel.png diff --git a/www/spielsets/spielset1/images/Katze.png b/www/spielsets/spielset1/images/Tiere/Katze.png similarity index 100% rename from www/spielsets/spielset1/images/Katze.png rename to www/spielsets/spielset1/images/Tiere/Katze.png diff --git a/www/spielsets/spielset1/images/Krokodil.png b/www/spielsets/spielset1/images/Tiere/Krokodil.png similarity index 100% rename from www/spielsets/spielset1/images/Krokodil.png rename to www/spielsets/spielset1/images/Tiere/Krokodil.png diff --git a/www/spielsets/spielset1/images/Kuh.png b/www/spielsets/spielset1/images/Tiere/Kuh.png similarity index 100% rename from www/spielsets/spielset1/images/Kuh.png rename to www/spielsets/spielset1/images/Tiere/Kuh.png diff --git a/www/spielsets/spielset1/images/Loewe.png b/www/spielsets/spielset1/images/Tiere/Loewe.png similarity index 100% rename from www/spielsets/spielset1/images/Loewe.png rename to www/spielsets/spielset1/images/Tiere/Loewe.png diff --git a/www/spielsets/spielset1/images/Maus.png b/www/spielsets/spielset1/images/Tiere/Maus.png similarity index 100% rename from www/spielsets/spielset1/images/Maus.png rename to www/spielsets/spielset1/images/Tiere/Maus.png diff --git a/www/spielsets/spielset1/images/Nashorn.png b/www/spielsets/spielset1/images/Tiere/Nashorn.png similarity index 100% rename from www/spielsets/spielset1/images/Nashorn.png rename to www/spielsets/spielset1/images/Tiere/Nashorn.png diff --git a/www/spielsets/spielset1/images/Nilpferd.png b/www/spielsets/spielset1/images/Tiere/Nilpferd.png similarity index 100% rename from www/spielsets/spielset1/images/Nilpferd.png rename to www/spielsets/spielset1/images/Tiere/Nilpferd.png diff --git a/www/spielsets/spielset1/images/Schaf.png b/www/spielsets/spielset1/images/Tiere/Schaf.png similarity index 100% rename from www/spielsets/spielset1/images/Schaf.png rename to www/spielsets/spielset1/images/Tiere/Schaf.png diff --git a/www/spielsets/spielset1/images/Schildkroete.png b/www/spielsets/spielset1/images/Tiere/Schildkroete.png similarity index 100% rename from www/spielsets/spielset1/images/Schildkroete.png rename to www/spielsets/spielset1/images/Tiere/Schildkroete.png diff --git a/www/spielsets/spielset1/images/Schwein.png b/www/spielsets/spielset1/images/Tiere/Schwein.png similarity index 100% rename from www/spielsets/spielset1/images/Schwein.png rename to www/spielsets/spielset1/images/Tiere/Schwein.png diff --git a/www/spielsets/spielset1/images/Stier.png b/www/spielsets/spielset1/images/Tiere/Stier.png similarity index 100% rename from www/spielsets/spielset1/images/Stier.png rename to www/spielsets/spielset1/images/Tiere/Stier.png diff --git a/www/spielsets/spielset1/images/background.svg b/www/spielsets/spielset1/images/background.svg new file mode 100644 index 0000000..b3d34a2 --- /dev/null +++ b/www/spielsets/spielset1/images/background.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/www/js/suchspiel_controller.js b/www/spielsets/spielset1/js/suchspiel_controller.js similarity index 99% rename from www/js/suchspiel_controller.js rename to www/spielsets/spielset1/js/suchspiel_controller.js index 82823e1..734c8b3 100644 --- a/www/js/suchspiel_controller.js +++ b/www/spielsets/spielset1/js/suchspiel_controller.js @@ -57,7 +57,7 @@ $scope.$on("$ionicView.beforeEnter", function(event, data){ /* * Hintergrundbild setzen */ - $rootScope.backgroundimage = "img/Background/background.svg"; + //$rootScope.backgroundimage = "img/Background/background.svg"; }); $ionicPlatform.ready(function() { diff --git a/www/spielsets/spielset1/spielset.json b/www/spielsets/spielset1/spielset.json index 09a6bac..153fd3c 100644 --- a/www/spielsets/spielset1/spielset.json +++ b/www/spielsets/spielset1/spielset.json @@ -1,18 +1,18 @@ [ - {"id": 0, "bild": "spielsets/spielset1/images/Affe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_affe.mp3", "display": false, "einblendecssid": "card1ein", "ausblendecssid": "card1aus", "sortid": 0}, - {"id": 1, "bild": "spielsets/spielset1/images/Esel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_esel.mp3", "display": false, "einblendecssid": "card2ein", "ausblendecssid": "card2aus", "sortid": 0}, - {"id": 2, "bild": "spielsets/spielset1/images/Hase.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hase.mp3", "display": false, "einblendecssid": "card3ein", "ausblendecssid": "card3aus", "sortid": 0}, - {"id": 3, "bild": "spielsets/spielset1/images/Hund.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hund.mp3", "display": false, "einblendecssid": "card4ein", "ausblendecssid": "card4aus", "sortid": 0}, - {"id": 4, "bild": "spielsets/spielset1/images/Kamel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kamel.mp3", "display": false, "einblendecssid": "card5ein", "ausblendecssid": "card5aus", "sortid": 0}, - {"id": 5, "bild": "spielsets/spielset1/images/Katze.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_katze.mp3", "display": false, "einblendecssid": "card6ein", "ausblendecssid": "card6aus", "sortid": 0}, - {"id": 6, "bild": "spielsets/spielset1/images/Krokodil.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_krokodil.mp3", "display": false, "einblendecssid": "card7ein", "ausblendecssid": "card7aus", "sortid": 0}, - {"id": 7, "bild": "spielsets/spielset1/images/Kuh.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kuh.mp3", "display": false, "einblendecssid": "card8ein", "ausblendecssid": "card8aus", "sortid": 0}, - {"id": 8, "bild": "spielsets/spielset1/images/Loewe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_loewe.mp3", "display": false, "einblendecssid": "card9ein", "ausblendecssid": "card9aus", "sortid": 0}, - {"id": 9, "bild": "spielsets/spielset1/images/Maus.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_maus.mp3", "display": false, "einblendecssid": "card10ein", "ausblendecssid": "card10aus", "sortid": 0}, - {"id": 10, "bild": "spielsets/spielset1/images/Nashorn.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nashorn.mp3", "display": false, "einblendecssid": "card11ein", "ausblendecssid": "card11aus", "sortid": 0}, - {"id": 11, "bild": "spielsets/spielset1/images/Nilpferd.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nilpferd.mp3", "display": false, "einblendecssid": "card12ein", "ausblendecssid": "card12aus", "sortid": 0}, - {"id": 12, "bild": "spielsets/spielset1/images/Schaf.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schaf.mp3", "display": false, "einblendecssid": "card13ein", "ausblendecssid": "card13aus", "sortid": 0}, - {"id": 13, "bild": "spielsets/spielset1/images/Schildkroete.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schildkroete.mp3", "display": false, "einblendecssid": "card14ein", "ausblendecssid": "card14aus", "sortid": 0}, - {"id": 14, "bild": "spielsets/spielset1/images/Schwein.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schwein.mp3", "display": false, "einblendecssid": "card15ein", "ausblendecssid": "card15aus", "sortid": 0}, - {"id": 15, "bild": "spielsets/spielset1/images/Stier.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_stier.mp3", "display": false, "einblendecssid": "card16ein", "ausblendecssid": "card16aus", "sortid": 0} + {"id": 0, "bild": "spielsets/spielset1/images/Tiere/Affe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_affe.mp3", "display": false, "einblendecssid": "card1ein", "ausblendecssid": "card1aus", "sortid": 0}, + {"id": 1, "bild": "spielsets/spielset1/images/Tiere/Esel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_esel.mp3", "display": false, "einblendecssid": "card2ein", "ausblendecssid": "card2aus", "sortid": 0}, + {"id": 2, "bild": "spielsets/spielset1/images/Tiere/Hase.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hase.mp3", "display": false, "einblendecssid": "card3ein", "ausblendecssid": "card3aus", "sortid": 0}, + {"id": 3, "bild": "spielsets/spielset1/images/Tiere/Hund.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_hund.mp3", "display": false, "einblendecssid": "card4ein", "ausblendecssid": "card4aus", "sortid": 0}, + {"id": 4, "bild": "spielsets/spielset1/images/Tiere/Kamel.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kamel.mp3", "display": false, "einblendecssid": "card5ein", "ausblendecssid": "card5aus", "sortid": 0}, + {"id": 5, "bild": "spielsets/spielset1/images/Tiere/Katze.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_katze.mp3", "display": false, "einblendecssid": "card6ein", "ausblendecssid": "card6aus", "sortid": 0}, + {"id": 6, "bild": "spielsets/spielset1/images/Tiere/Krokodil.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_krokodil.mp3", "display": false, "einblendecssid": "card7ein", "ausblendecssid": "card7aus", "sortid": 0}, + {"id": 7, "bild": "spielsets/spielset1/images/Tiere/Kuh.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_kuh.mp3", "display": false, "einblendecssid": "card8ein", "ausblendecssid": "card8aus", "sortid": 0}, + {"id": 8, "bild": "spielsets/spielset1/images/Tiere/Loewe.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_loewe.mp3", "display": false, "einblendecssid": "card9ein", "ausblendecssid": "card9aus", "sortid": 0}, + {"id": 9, "bild": "spielsets/spielset1/images/Tiere/Maus.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_maus.mp3", "display": false, "einblendecssid": "card10ein", "ausblendecssid": "card10aus", "sortid": 0}, + {"id": 10, "bild": "spielsets/spielset1/images/Tiere/Nashorn.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nashorn.mp3", "display": false, "einblendecssid": "card11ein", "ausblendecssid": "card11aus", "sortid": 0}, + {"id": 11, "bild": "spielsets/spielset1/images/Tiere/Nilpferd.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_nilpferd.mp3", "display": false, "einblendecssid": "card12ein", "ausblendecssid": "card12aus", "sortid": 0}, + {"id": 12, "bild": "spielsets/spielset1/images/Tiere/Schaf.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schaf.mp3", "display": false, "einblendecssid": "card13ein", "ausblendecssid": "card13aus", "sortid": 0}, + {"id": 13, "bild": "spielsets/spielset1/images/Tiere/Schildkroete.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schildkroete.mp3", "display": false, "einblendecssid": "card14ein", "ausblendecssid": "card14aus", "sortid": 0}, + {"id": 14, "bild": "spielsets/spielset1/images/Tiere/Schwein.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_schwein.mp3", "display": false, "einblendecssid": "card15ein", "ausblendecssid": "card15aus", "sortid": 0}, + {"id": 15, "bild": "spielsets/spielset1/images/Tiere/Stier.png", "sound": "/android_asset/www/spielsets/spielset1/sounds/finde_stier.mp3", "display": false, "einblendecssid": "card16ein", "ausblendecssid": "card16aus", "sortid": 0} ] \ No newline at end of file diff --git a/www/templates/suchspiel.html b/www/spielsets/spielset1/templates/suchspiel.html similarity index 100% rename from www/templates/suchspiel.html rename to www/spielsets/spielset1/templates/suchspiel.html diff --git a/www/templates/home.html b/www/templates/home.html index 87e29bf..ce843af 100644 --- a/www/templates/home.html +++ b/www/templates/home.html @@ -2,7 +2,7 @@
- +