Grafiken, css und typo

This commit is contained in:
Hilmer, Carsten
2016-08-25 16:12:50 +02:00
parent 8d2aa126a3
commit f0a63c234b
6 changed files with 799 additions and 11 deletions

View File

@@ -38,7 +38,7 @@
<md-menu md-position-mode="target-right target" class="md-list-item-md-menu-right">
<p ng-click="$mdOpenMenu()">
<md-icon md-menu-origin md-svg-icon="more"></md-icon>
<md-icon md-menu-origin md-svg-icon="img/icons/action.svg"></md-icon>
</p>
<md-menu-content width="1">
<md-menu-item>
@@ -48,47 +48,47 @@
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="callTo(contract.pokemonname)">
<span class="menu-item-button" >{{pokemon.pokemonname}} zu Lesezeichen hinzufügen</span>
<span class="menu-item-button" >{{pokemon.pokemonname}} zu deinen Lesezeichen hinzufügen</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">{{pokemon.pokemonname}} zu Favoriten hinzufügen</span>
<span class="menu-item-button">{{pokemon.pokemonname}} zu deinen Favoriten hinzufügen</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">{{pokemon.pokemonname}} zum Vergleich öffnen</span>
<span class="menu-item-button">{{pokemon.pokemonname}} mit anderem Pokemon vergleichen</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">Zeige alle vom gleichen Typ</span>
<span class="menu-item-button">Pokemon vom gleichen Typ anzeigen</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">Zeige alle vom gleichen Typ {{ pokemon.pokemontypaString }}</span>
<span class="menu-item-button">Pokemon vom gleichen Typ {{ pokemon.pokemontypaString }} anzeigen</span>
</a>
</md-menu-item>
<md-menu-item ng-if="pokemon.pokemontypb > 0">
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">Zeige alle vom gleichen Typ {{ pokemon.pokemontypbString }}</span>
<span class="menu-item-button">Pokemon vom gleichen Typ {{ pokemon.pokemontypbString }} anzeigen</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">Zeige alle stärke Pokemon</span>
<span class="menu-item-button">Welche Pokemon sind stärker als {{pokemon.pokemonname}}</span>
</a>
</md-menu-item>
<md-menu-item>
<a class="md-button md-default-theme" ng-click="navigateTo('app.contractdetail',contract)">
<span class="menu-item-button">Zeige alle schwächeren Pokemon</span>
<span class="menu-item-button">Welche Pokemon sind schwächer als {{pokemon.pokemonname}}</span>
</a>
</md-menu-item>
@@ -99,7 +99,7 @@
</div>
<div class="col-75">
<h4>{{ pokemon.pokemonname }}</h4>
<h5>Nr.: {{ pokemon.pokedexidString }}</h5>
<h5>Pokedex-Id: {{ pokemon.pokedexidString }}</h5>
<div ng-if="pokemon.pokemontypa > 0" class="pokemontyp{{ pokemon.pokemontypa }}">
<img src="img/typbilder/{{ pokemon.pokemontypa }}.png" alt="PokemonTyp" width="32" height="32">
{{ pokemon.pokemontypaString }}

View File

@@ -70,7 +70,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
{
var dummypokedexid='';
dummypokedexid=res.rows.item(i).POKEDEXID;
dummypokedexid=res.rows.item(i).POKEDEXID.toString();
if (dummypokedexid.length==1){
dummypokedexid='00' + dummypokedexid;