diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-29 18:36:57 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-29 18:36:57 -0400 |
| commit | 6dff23b065bd933ff2f571d2264c86902173d40b (patch) | |
| tree | 1b7853fce373897068d244cd2ae1487bf49cef6e /app/views | |
| parent | dc4a4d2f9a338e3d3560c514b0c97cb8bfea36b1 (diff) | |
| download | pokeviewer-6dff23b065bd933ff2f571d2264c86902173d40b.tar.gz pokeviewer-6dff23b065bd933ff2f571d2264c86902173d40b.tar.bz2 pokeviewer-6dff23b065bd933ff2f571d2264c86902173d40b.zip | |
Added ribbons
Gift ribbons currently partially work: the correct ribbon image and name is shown, but the ribbon description is not yet extracted from the game and thus is just blank.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/pokeviewer/pokemon/index.html.haml | 8 | ||||
| -rw-r--r-- | app/views/pokeviewer/pokemon/show.html.haml | 13 |
2 files changed, 16 insertions, 5 deletions
| diff --git a/app/views/pokeviewer/pokemon/index.html.haml b/app/views/pokeviewer/pokemon/index.html.haml index 7cee27a..f16f0bc 100644 --- a/app/views/pokeviewer/pokemon/index.html.haml +++ b/app/views/pokeviewer/pokemon/index.html.haml | |||
| @@ -17,12 +17,12 @@ | |||
| 17 | - box.contents.each_slice(6) do |row| | 17 | - box.contents.each_slice(6) do |row| |
| 18 | %tr | 18 | %tr |
| 19 | - row.each do |p| | 19 | - row.each do |p| |
| 20 | %td.pc-pokemon | 20 | %td.pc-pokemon.pkv-has-hover |
| 21 | - if p.nil? | 21 | - if p.nil? |
| 22 | .spacer | 22 | .spacer |
| 23 | - else | 23 | - else |
| 24 | = link_to image_tag(p.icon_path), p | 24 | = link_to image_tag(p.icon_path), p |
| 25 | .pc-data | 25 | .pc-data.pkv-hover |
| 26 | .pc-data-name= p.revisions.last.nickname | 26 | .pc-data-name= p.revisions.last.nickname |
| 27 | .pc-data-ot | 27 | .pc-data-ot |
| 28 | OT/ | 28 | OT/ |
| @@ -33,9 +33,9 @@ | |||
| 33 | %h2 Pokémon Not In Any Game | 33 | %h2 Pokémon Not In Any Game |
| 34 | %ul.pokemon-list | 34 | %ul.pokemon-list |
| 35 | - @unaccounted.each do |p| | 35 | - @unaccounted.each do |p| |
| 36 | %li.pc-pokemon | 36 | %li.pc-pokemon.pkv-has-hover |
| 37 | = link_to image_tag(p.icon_path), p | 37 | = link_to image_tag(p.icon_path), p |
| 38 | .pc-data | 38 | .pc-data.pkv-hover |
| 39 | .pc-data-name= p.revisions.last.nickname | 39 | .pc-data-name= p.revisions.last.nickname |
| 40 | .pc-data-ot | 40 | .pc-data-ot |
| 41 | OT/ | 41 | OT/ |
| diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml index 3a04914..e90148e 100644 --- a/app/views/pokeviewer/pokemon/show.html.haml +++ b/app/views/pokeviewer/pokemon/show.html.haml | |||
| @@ -76,4 +76,15 @@ | |||
| 76 | %span.pokemon-nature<= @pokemon.nature.titlecase | 76 | %span.pokemon-nature<= @pokemon.nature.titlecase |
| 77 | nature. | 77 | nature. |
| 78 | %p= @pokemon.display_met | 78 | %p= @pokemon.display_met |
| 79 | = condition_diagram @pokemon.revisions.last | 79 | .pokemon-contest |
| 80 | .pd-details Contest Condition | ||
| 81 | = condition_diagram @pokemon.revisions.last | ||
| 82 | .pokemon-ribbons | ||
| 83 | .pd-details Ribbons | ||
| 84 | %ul | ||
| 85 | - @pokemon.revisions.last.ribbons.each do |ribbon| | ||
| 86 | %li.pkv-has-hover | ||
| 87 | = image_tag("pokeviewer/ribbons/#{ribbon[:filename]}") | ||
| 88 | .pkv-hover | ||
| 89 | .pc-data-name= ribbon[:name] | ||
| 90 | = ribbon[:description] | ||