From c4088694a80ae6881aaaeb75842fe5a7cb7af657 Mon Sep 17 00:00:00 2001 From: "Hilmer, Carsten" Date: Fri, 16 Sep 2016 13:38:34 +0200 Subject: [PATCH] CSS-Styles - Englische Namen eingebunden --- www/css/custom_style.css | 3 + .../imagedownload/html/imagedownload.html | 33 ++-- www/templates/menu/html/menu.html | 161 +----------------- www/templates/menu/js/controllers.js | 11 ++ .../pokemonliste/html/pokemon-detail.html | 6 +- .../pokemonliste/html/pokemon-list.html | 2 +- www/templates/pokemonliste/js/controllers.js | 8 + www/templates/pokemonliste/js/services.js | 9 + www/test.html | 4 + 9 files changed, 63 insertions(+), 174 deletions(-) diff --git a/www/css/custom_style.css b/www/css/custom_style.css index 7d55cba..fb1dc1d 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -14,6 +14,9 @@ md-input-container { font-size: 14px; } +.smallfont{ + font-size: 10px; +} .divcenter { margin-left: auto; diff --git a/www/templates/imagedownload/html/imagedownload.html b/www/templates/imagedownload/html/imagedownload.html index b9ce679..942185d 100644 --- a/www/templates/imagedownload/html/imagedownload.html +++ b/www/templates/imagedownload/html/imagedownload.html @@ -1,28 +1,35 @@ - + +

Pokemon Bilder Download

- Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon ™ Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon ™ Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden Nutzungsbedingungen von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder für eigene Zwecke verwenden. + Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon ™ Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon ™ Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden Nutzungsbedingungen von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder downloaden.

- Wichtiger Tipp: Bitte bedenke, dass der Download der Bilder einiges an Internet-Traffic verursacht. Um deinen mobilen Datentarif zu schonen solltest du den Download am besten per Wlan durchführen. + Wichtiger Tipp:
Bitte bedenke, dass der Download der Bilder einiges an Internet-Traffic verursacht. Um deinen mobilen Datentarif zu schonen solltest du den Download am besten per Wlan durchführen.

-

- Mit dem Klick auf den Butten (Bilder herunterladen) akzeptierst du die oben genannten Nutzungsbedingungen von © 2016 Pokémon/Nintendo. -

- - + +
+ +
+ + + + +
+
+
{{ progressprozent }} %
Aktuelle Datei: {{ currentfile }}

-

+

© 2016 Pokémon. © 1995-2015 Nintendo/Creatures Inc./GAME FREAK inc. TM, ® and Pokémon character names are trademarks of Nintendo.

diff --git a/www/templates/menu/html/menu.html b/www/templates/menu/html/menu.html index 997228e..de23cd1 100644 --- a/www/templates/menu/html/menu.html +++ b/www/templates/menu/html/menu.html @@ -37,29 +37,20 @@ Pokemon-Index
- +
- SQLite DB + Pokemons
- +
Bilder Herunterladen
- Share Application Content -
-
- -
-
- Email & Message -
-
Advertising Application
@@ -69,32 +60,7 @@ Google AdMob
- Push Notification -
-
- -
-
- Single Push -
-
-
-
- -
-
- Schedule Push -
-
Hardware Connect -
-
- -
-
- Mobile Contract -
-
@@ -103,47 +69,6 @@ Image Picker
-
-
- -
-
- Vibration -
-
-
-
- -
-
- Flashlight -
-
-
-
- -
-
- Device Information -
-
- Material User Interface -
-
- -
-
- Dashboard -
-
-
-
- -
-
- Default UI -
-
Themes
@@ -153,86 +78,6 @@ Try App
-
-
- -
-
- Pricing -
-
-
-
- -
-
- Menu Dashboard -
-
-
-
- -
-
- Expense -
-
-
-
- -
-
- News Feed -
-
-
-
- -
-
- Online Course -
-
-
-
- -
-
- Location Feed -
-
-
-
- -
-
- Cube Feed -
-
-
-
- -
-
- Cloth Shop -
-
-
-
- -
-
- Catalog -
-
-
-
- -
-
- Restaurant -
-
diff --git a/www/templates/menu/js/controllers.js b/www/templates/menu/js/controllers.js index 83b9c7a..58e7dac 100644 --- a/www/templates/menu/js/controllers.js +++ b/www/templates/menu/js/controllers.js @@ -104,6 +104,14 @@ appControllers.controller('menuCtrl', function ($scope, $timeout, $mdUtil, $mdSi if($ionicHistory.backView() == null){ + var myView=$ionicHistory.currentView(); + if (myView.stateName=='app.imagedownload'){ + $scope.navigateTo('app.pokemonlist'); + } + else{ + + + //Check is popup dialog is not open. if(jQuery('[id^=dialog]').length == 0 ) { @@ -130,6 +138,9 @@ appControllers.controller('menuCtrl', function ($scope, $timeout, $mdUtil, $mdSi // For cancel button actions. }); //End mdDialog } + + }//Else myView + } else{ //Go to the view of lasted state. diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index 4678f93..d65c7c2 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@
-

{{pokemon.pokemonname}}

+

{{pokemon.pokemonname}} - (engl.: {{ pokemon.pokemonnameeng }})

Pokedex-Id: {{ pokemon.pokedexidString }}

@@ -90,6 +90,7 @@

{{ pokemonentwicklung.pokemonname }}

+

engl.: {{ pokemonentwicklung.pokemonnameeng }}

@@ -100,6 +101,7 @@

{{ pokemonentwicklung.pokemonname }}

+

engl.: {{ pokemonentwicklung.pokemonnameeng }}

diff --git a/www/templates/pokemonliste/html/pokemon-list.html b/www/templates/pokemonliste/html/pokemon-list.html index f282339..63a4360 100644 --- a/www/templates/pokemonliste/html/pokemon-list.html +++ b/www/templates/pokemonliste/html/pokemon-list.html @@ -99,7 +99,7 @@
-

{{ pokemon.pokemonname }}

+

{{ pokemon.pokemonname }} - (engl.: {{ pokemon.pokemonnameeng }})

Pokedex-Id: {{ pokemon.pokedexidString }}
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index cf618dc..9c903f9 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -145,6 +145,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas pokemonpokedexid : entwarr[index] , pokemonimage : $scope.getPokemonImage(entwarr[index]), pokemonname : $scope.getPokemonName(entwarr[index]), + pokemonnameeng : $scope.getPokemonNameeng(entwarr[index]), pokemonentwickstufe :1, pokemonlistentyp : 1 }; @@ -168,6 +169,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas pokemonpokedexid : entwarronstep[indexonestep] , pokemonimage : $scope.getPokemonImage(entwarronstep[indexonestep]), pokemonname : $scope.getPokemonName(entwarronstep[indexonestep]), + pokemonnameeng : $scope.getPokemonNameeng(entwarronstep[indexonestep]), pokemonentwickstufe :2, pokemonlistentyp : 1 }; @@ -221,6 +223,12 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas return pokedexDB.getPokemonName(pokedexid); };//End getPokemonList. + // getPokemonList is for get all pokemons. + // By calling pokedexDB.all() service. + $scope.getPokemonNameeng = function (pokedexid) { + return pokedexDB.getPokemonNameeng(pokedexid); + };//End getPokemonList. + // getPokemonList is for get all pokemons. // By calling pokedexDB.all() service. $scope.getStandardAttacken = function (pokedexid) { diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index ecc20df..d8cef68 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -45,6 +45,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) var pokemonmaxstatuswerte = []; var pokemonentladeattackenliste = []; var pokemonname = []; + var pokemonnameeng = []; return { @@ -60,6 +61,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemonfundorte = []; pokemonimages = []; pokemonname = []; + pokemonnameeng = []; //Typen einlesen var query = "SELECT * FROM tblPokemonTyp order by ID ASC"; @@ -99,6 +101,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) { pokemonimages.push(''); pokemonname.push(''); + pokemonnameeng.push(''); for (var i = 0; i < res.rows.length; i++) { var dummypokedexid=''; @@ -127,6 +130,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokedexid : res.rows.item(i).POKEDEXID , pokedexidString : dummypokedexid , pokemonname : res.rows.item(i).POKEMONNAME , + pokemonnameeng : res.rows.item(i).POKEMONNAMEENG , pokemontypa : res.rows.item(i).POKEMONTYPA , pokemontypb : res.rows.item(i).POKEMONTYPB , pokemontypaString : pokemontypen[res.rows.item(i).POKEMONTYPA] , @@ -148,6 +152,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) }; pokemonimages.push(res.rows.item(i).POKEMONIMAGE); pokemonname.push(res.rows.item(i).POKEMONNAME); + pokemonnameeng.push(res.rows.item(i).POKEMONNAMEENG); pokemonList.push(dataItem); } } @@ -262,6 +267,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) { return pokemonname[pokedexid]; }, + getPokemonNameeng: function (pokedexid) + { + return pokemonnameeng[pokedexid]; + }, getStandardAttacken: function (pokedexid) { diff --git a/www/test.html b/www/test.html index 3d69b9e..ff63e42 100644 --- a/www/test.html +++ b/www/test.html @@ -63,5 +63,9 @@ Unlicht
+ + \ No newline at end of file