diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-10-04 23:09:37 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-10-04 23:09:37 -0400 |
| commit | eae1c764df31b5e5aa2a2d8315b2b5c0997babf4 (patch) | |
| tree | 412387cc73d166c28fa4e0f5658bded6d4b7fbc8 /app/views | |
| parent | 52bac73894ad0fe20d7aec907bbd7f07e83ca477 (diff) | |
| download | pokeviewer-eae1c764df31b5e5aa2a2d8315b2b5c0997babf4.tar.gz pokeviewer-eae1c764df31b5e5aa2a2d8315b2b5c0997babf4.tar.bz2 pokeviewer-eae1c764df31b5e5aa2a2d8315b2b5c0997babf4.zip | |
Pokémon now show the Poké Ball that they're in
Also fixed a bug with viewing Pokémon that aren't in any game.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/pokeviewer/pokemon/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
| diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml index 4485932..e3bee11 100644 --- a/app/views/pokeviewer/pokemon/show.html.haml +++ b/app/views/pokeviewer/pokemon/show.html.haml | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .pokemon{ class: "in-#{@pokemon.trainer.game}" } | 1 | .pokemon{ class: (not @pokemon.trainer.nil?) && "in-#{@pokemon.trainer.game}" } |
| 2 | .pokemon-basics | 2 | .pokemon-basics |
| 3 | .pokemon-species-id= "No. #{@pokemon.species_id}" | 3 | .pokemon-species-id= "No. #{@pokemon.species_id}" |
| 4 | .pokemon-species-name= @pokemon.species.name | 4 | .pokemon-species-name= @pokemon.species.name |
| @@ -90,6 +90,7 @@ | |||
| 90 | = ribbon[:description] | 90 | = ribbon[:description] |
| 91 | .pokemon-etc | 91 | .pokemon-etc |
| 92 | .pd-details Misc | 92 | .pd-details Misc |
| 93 | = image_tag(@pokemon.pokeball_icon_path) | ||
| 93 | - unless @pokemon.revisions.last.item.nil? | 94 | - unless @pokemon.revisions.last.item.nil? |
| 94 | .pd-hold-item.pkv-has-hover | 95 | .pd-hold-item.pkv-has-hover |
| 95 | = image_tag(@pokemon.revisions.last.item.icon_path) | 96 | = image_tag(@pokemon.revisions.last.item.icon_path) |