From eae1c764df31b5e5aa2a2d8315b2b5c0997babf4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 4 Oct 2017 23:09:37 -0400 Subject: Pokémon now show the Poké Ball that they're in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixed a bug with viewing Pokémon that aren't in any game. --- app/views/pokeviewer/pokemon/show.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views') 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 @@ -.pokemon{ class: "in-#{@pokemon.trainer.game}" } +.pokemon{ class: (not @pokemon.trainer.nil?) && "in-#{@pokemon.trainer.game}" } .pokemon-basics .pokemon-species-id= "No. #{@pokemon.species_id}" .pokemon-species-name= @pokemon.species.name @@ -90,6 +90,7 @@ = ribbon[:description] .pokemon-etc .pd-details Misc + = image_tag(@pokemon.pokeball_icon_path) - unless @pokemon.revisions.last.item.nil? .pd-hold-item.pkv-has-hover = image_tag(@pokemon.revisions.last.item.icon_path) -- cgit 1.4.1