CSS-Styles - Englische Namen eingebunden

www/css/custom_style.css

@@ -14,6 +14,9 @@ md-input-container {
     font-size: 14px;
 }
 
+.smallfont{
+    font-size: 10px;
+}
 
 .divcenter {
     margin-left: auto;

www/templates/imagedownload/html/imagedownload.html

@@ -1,28 +1,35 @@
 <ion-view view-title="Pokedex Helper">
-  <ion-content class="padding font-robo400medium">
+
+  <ion-content class="padding smallfont">
     <h2>Pokemon Bilder Download</h2>
     <p>
-    Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon &#0153; Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon &#0153; Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> 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 &#0153; Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon &#0153; Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder downloaden.
     </p>
     <p>
-    Wichtiger Tipp: <b>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.</b>
+    Wichtiger Tipp: <br><b>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.</b>
     </p>
-    <p>
+
-    Mit dem Klick auf den Butten (Bilder herunterladen) akzeptierst du die oben genannten <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo.
+    <div class="row">
-    </p>
+        <!--control section-->
-    <button class="button button-full" ng-click="downloadImages()" ng-show="DownloadisVisible">
+        <div style="width: 100%;  text-align: center;" class="col">
+
+            <button style=" width: 60%;height: 40px;vertical-align: middle;" class="md-raised md-primary md-button md-default-theme" ng-click="downloadImages()" ng-show="DownloadisVisible">
                 Bilder herunterladen
             </button>
-    <button class="button button-full" ng-click="downloadabbrechen()" ng-show="AbbrechenisVisible">
+            <button style=" width: 60%;height: 40px;vertical-align: middle;" class="md-raised md-warn md-button md-default-theme" ng-click="downloadabbrechen()" ng-show="AbbrechenisVisible">
                 Download abbrechen
             </button>
+
+        </div> <!--end control section-->
+    </div>
+
     <progress id="progressbar" max="152" value="{{ progressval }}"> </progress>
     <div id="progressbarlabel">{{ progressprozent }} %</div>
     <div id="currentfile">Aktuelle Datei: {{ currentfile }}</div>
     <p>
        
     </p>
-    <p class="font-robo400small">
+    <p class="smallfont">
        © 2016 Pokémon. © 1995-2015 Nintendo/Creatures Inc./GAME FREAK inc. TM, ® and Pokémon character names are trademarks of Nintendo.
     </p>
   </ion-content>

www/templates/menu/html/menu.html

@@ -37,29 +37,20 @@
                 <md-subheader class="md-warn">Pokemon-Index</md-subheader>
                 <div class="row menu-item"  ng-click="navigateTo('app.pokemonlist')">
                     <div class="col-33">
-                        <i class="fa fa-database"></i>
+                        <i class="fa fa-book"></i>
                     </div>
                     <div class="col-66">
-                        <span>SQLite DB</span>
+                        <span>Pokemons</span>
                     </div>
                 </div>
                 <div class="row menu-item"  ng-click="navigateTo('app.imagedownload')">
                     <div class="col-33">
-                        <i class="fa fa-database"></i>
+                        <i class="fa fa-picture-o"></i>
                     </div>
                     <div class="col-66">
                         <span>Bilder Herunterladen</span>
                     </div>
                 </div>
-                <md-subheader class="md-warn">Share Application Content</md-subheader>
-                <div class="row menu-item"  ng-click="navigateTo('app.contractUs')">
-                    <div class="col-33">
-                        <i class="fa fa-inbox"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Email & Message</span>
-                    </div>
-                </div>
                 <md-subheader class="md-warn">Advertising Application</md-subheader>
                 <div class="row menu-item"  ng-click="navigateTo('app.googleAdmob')">
                     <div class="col-33">
@@ -69,32 +60,7 @@
                         <span>Google AdMob</span>
                     </div>
                 </div>
-                <md-subheader class="md-warn">Push Notification</md-subheader>
-                <div class="row menu-item"  ng-click="navigateTo('app.singlePushNotification')">
-                    <div class="col-33">
-                        <i class="fa fa-sign-in fa-rotate-90"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Single Push</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.schedulePushNotification')">
-                    <div class="col-33">
-                        <i class="fa fa-clock-o"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Schedule Push</span>
-                    </div>
-                </div>
                 <md-subheader class="md-warn">Hardware Connect</md-subheader>
-                <div class="row menu-item"  ng-click="navigateTo('app.mobileContractList')">
-                    <div class="col-33">
-                        <i class="fa fa-users"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Mobile Contract</span>
-                    </div>
-                </div>
                 <div class="row menu-item"  ng-click="navigateTo('app.imagePicker')">
                     <div class="col-33">
                         <i class="fa fa-picture-o"></i>
@@ -103,47 +69,6 @@
                         <span>Image Picker</span>
                     </div>
                 </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.vibration')">
-                    <div class="col-33">
-                        <i class="fa fa-asterisk"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Vibration</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.flashLight')">
-                    <div class="col-33">
-                        <i class="fa fa-bolt"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Flashlight</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.deviceInformation')">
-                    <div class="col-33">
-                        <i class="fa fa-info"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Device Information</span>
-                    </div>
-                </div>
-                <md-subheader class="md-warn">Material User Interface</md-subheader>
-                <div class="row menu-item"  ng-click="navigateTo('app.dashboard')">
-                    <div class="col-33">
-                        <i class="fa fa-th-list"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Dashboard</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.defaultUI')">
-                    <div class="col-33">
-                        <i class="fa fa-bookmark-o"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Default UI</span>
-                    </div>
-                </div>
                 <md-subheader class="md-warn">Themes</md-subheader>
                 <div class="row menu-item"  ng-click="navigateTo('app.tryAppNoBackBtn')">
                     <div class="col-33">
@@ -153,86 +78,6 @@
                         <span>Try App</span>
                     </div>
                 </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.pricing')">
-                    <div class="col-33">
-                        <i class="fa fa-line-chart"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Pricing</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.menuDashboard')">
-                    <div class="col-33">
-                        <i class="fa fa-th-large"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Menu Dashboard</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.expense')">
-                    <div class="col-33">
-                        <i class="fa fa-suitcase"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Expense</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.newsFeed')">
-                    <div class="col-33">
-                        <i class="fa fa-newspaper-o"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>News Feed</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.onlineCourse')">
-                    <div class="col-33">
-                        <i class="fa fa-graduation-cap"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Online Course</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.locationFeed')">
-                    <div class="col-33">
-                        <i class="fa fa-flag"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Location Feed</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.cubeFeed')">
-                    <div class="col-33">
-                        <i class="fa fa-cubes"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Cube Feed</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.clothShop')">
-                    <div class="col-33">
-                        <i class="fa fa-heart"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Cloth Shop</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.catalog')">
-                    <div class="col-33">
-                        <i class="fa fa-tags"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Catalog</span>
-                    </div>
-                </div>
-                <div class="row menu-item"  ng-click="navigateTo('app.restaurant')">
-                    <div class="col-33">
-                        <i class="fa fa-cutlery"></i>
-                    </div>
-                    <div class="col-66">
-                        <span>Restaurant</span>
-                    </div>
-                </div>
             </div>
         </ion-content><!--end menu content section-->
         <!--end menu section-->

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.

www/templates/pokemonliste/html/pokemon-detail.html

@@ -5,7 +5,7 @@
 <!--State name : app.contractdetail-->
 <!--URL : #app/contractdetail-->
 
-<ion-view title="{{pokemon.pokemonname}}">
+<ion-view title="{{pokemon.pokemonname}} - (Eng.: {{ pokemon.pokemonnameeng }})">
     <!--left button on navigation bar-->
     <ion-nav-buttons side="left">
         <a ng-click="$ionicGoBack()" class="button back-button buttons  button-clear header-item nav-back-btn">
@@ -19,7 +19,7 @@
 
         <div class="item item-avatar">
             <img src="{{pokemon.pokemonimage}}">
-            <h2>{{pokemon.pokemonname}}</h2>
+            <h2>{{pokemon.pokemonname}} - (engl.: {{ pokemon.pokemonnameeng }})</h2>
             <p>Pokedex-Id: {{ pokemon.pokedexidString }}</p>
         </div>
 
@@ -90,6 +90,7 @@
                     <img ng-if="pokemonentwicklung.pokemonlistentyp == 2" src="img/arrow_down.png" width="64" height="64">
                     <img ng-if="pokemonentwicklung.pokemonlistentyp == 1" src="{{pokemonentwicklung.pokemonimage}}" width="64" height="64">
                     <p ng-if="pokemonentwicklung.pokemonlistentyp == 1">{{ pokemonentwicklung.pokemonname }} </p>
+                    <p ng-if="pokemonentwicklung.pokemonlistentyp == 1">engl.: {{ pokemonentwicklung.pokemonnameeng }}</p>
                 </div>
             </div>
             <div class="col-33 col-center"></div>
@@ -100,6 +101,7 @@
              <div class="divcenter">
                 <img ng-if="pokemonentwicklung.pokemonlistentyp == 1" src="{{pokemonentwicklung.pokemonimage}}" width="64" height="64">
                 <p ng-if="pokemonentwicklung.pokemonlistentyp == 1">{{ pokemonentwicklung.pokemonname }} </p>
+                <p ng-if="pokemonentwicklung.pokemonlistentyp == 1">engl.: {{ pokemonentwicklung.pokemonnameeng }}</p>
             </div>
         </div>
         </div>

www/templates/pokemonliste/html/pokemon-list.html

@@ -99,7 +99,7 @@
                 <div class="col-75">
                 <div class="row" ng-click="navigateTo('app.pokemondetail',pokemon)">
                 <div class="col-100">
-                    <h4>{{ pokemon.pokemonname }}</h4>
+                    <h4>{{ pokemon.pokemonname }} - (engl.: {{ pokemon.pokemonnameeng }})</h4>
                     <h5>Pokedex-Id: {{ pokemon.pokedexidString }}</h5>
                 </div>
                 </div>

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   
                         }; 
@@ -223,6 +225,12 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
 
         // 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) {
         $scope.pokemonattackenliste = pokedexDB.getStandardAttacken(pokedexid);
     };//End getPokemonList.

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)
         {
             

www/test.html

@@ -63,5 +63,9 @@
          Unlicht
     </div>
 
+    <button class="md-raised md-warn md-button md-default-theme">
+      Download abbrechen
+    </button>
+
 </body><!-- end body section-->
 </html>