about summary refs log tree commit diff stats
path: root/app/views
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-09-27 20:07:58 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-09-27 20:07:58 -0400
commitd18a7da044b8fdb4ded49e05865b3dc743c4fb58 (patch)
treed82c290e5badbe76a09e1a3e05267dfcf5599abd /app/views
parent3e4e4583fb751fb47013580ce86e2cc3a0e8353b (diff)
downloadpokeviewer-d18a7da044b8fdb4ded49e05865b3dc743c4fb58.tar.gz
pokeviewer-d18a7da044b8fdb4ded49e05865b3dc743c4fb58.tar.bz2
pokeviewer-d18a7da044b8fdb4ded49e05865b3dc743c4fb58.zip
Continued working on design, added moves
Still a very early design

Also, for Pokémon that have Natures that don't benefit and hinder the
same stat, there is now a + next to the stat that the Nature benefits,
and a - next to the stat it hinders.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/pokeviewer/application.html.erb14
-rw-r--r--app/views/layouts/pokeviewer/application.html.haml15
-rw-r--r--app/views/pokeviewer/pokemon/show.html.haml95
3 files changed, 82 insertions, 42 deletions
diff --git a/app/views/layouts/pokeviewer/application.html.erb b/app/views/layouts/pokeviewer/application.html.erb deleted file mode 100644 index 192490c..0000000 --- a/app/views/layouts/pokeviewer/application.html.erb +++ /dev/null
@@ -1,14 +0,0 @@
1<!DOCTYPE html>
2<html>
3<head>
4 <title>Pokeviewer</title>
5 <%= stylesheet_link_tag "pokeviewer/application", media: "all" %>
6 <%= javascript_include_tag "pokeviewer/application" %>
7 <%= csrf_meta_tags %>
8</head>
9<body>
10
11<%= yield %>
12
13</body>
14</html>
diff --git a/app/views/layouts/pokeviewer/application.html.haml b/app/views/layouts/pokeviewer/application.html.haml new file mode 100644 index 0000000..6bce8b9 --- /dev/null +++ b/app/views/layouts/pokeviewer/application.html.haml
@@ -0,0 +1,15 @@
1!!! 5
2%html
3 %head
4 %title Pokeviewer
5 = stylesheet_link_tag "pokeviewer/application", media: "all"
6 = javascript_include_tag "pokeviewer/application"
7 = csrf_meta_tags
8 %body
9 %header#banner Pokéviewer
10 #container
11 #left-sidebar
12 Sidebar stuff
13 #content= yield
14 #right-sidebar
15 Sidebar stuff
diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml index 18a6788..232d6bc 100644 --- a/app/views/pokeviewer/pokemon/show.html.haml +++ b/app/views/pokeviewer/pokemon/show.html.haml
@@ -9,31 +9,70 @@
9 %span{ class: @pokemon.ot_gender }>= @pokemon.ot_name 9 %span{ class: @pokemon.ot_gender }>= @pokemon.ot_name
10 .pokemon-id= "ID/#{@pokemon.display_ot_number}" 10 .pokemon-id= "ID/#{@pokemon.display_ot_number}"
11 .pokemon-level= "Lv. #{@pokemon.revisions.last.level}" 11 .pokemon-level= "Lv. #{@pokemon.revisions.last.level}"
12 .pokemon-memo 12 .pokemon-column
13 .pd-details Trainer Memo 13 .pokemon-stats
14 .pd-contents 14 .pd-details Stats
15 %p 15 %table.pd-contents
16 %span.pokemon-nature<= @pokemon.nature.titlecase 16 %tr
17 nature. 17 %th HP
18 %p= @pokemon.display_met 18 %th
19 .pokemon-stats 19 Attack
20 .pd-details Stats 20 - if @pokemon.nature_benefits?(:attack)
21 %table.pd-contents 21 %span.nature-benefit +
22 %tr 22 - if @pokemon.nature_hinders?(:attack)
23 %th HP 23 %span.nature-hinder -
24 %td= @pokemon.revisions.last.hp 24 %th
25 %tr 25 Defense
26 %th Attack 26 - if @pokemon.nature_benefits?(:defense)
27 %td= @pokemon.revisions.last.attack 27 %span.nature-benefit +
28 %tr 28 - if @pokemon.nature_hinders?(:defense)
29 %th Defense 29 %span.nature-hinder -
30 %td= @pokemon.revisions.last.defense 30 %th
31 %tr 31 Sp. Atk
32 %th Sp. Atk 32 - if @pokemon.nature_benefits?(:special_attack)
33 %td= @pokemon.revisions.last.special_attack 33 %span.nature-benefit +
34 %tr 34 - if @pokemon.nature_hinders?(:special_attack)
35 %th Sp. Def 35 %span.nature-hinder -
36 %td= @pokemon.revisions.last.special_defense 36 %th
37 %tr 37 Sp. Def
38 %th Speed 38 - if @pokemon.nature_benefits?(:special_defense)
39 %td= @pokemon.revisions.last.speed 39 %span.nature-benefit +
40 - if @pokemon.nature_hinders?(:special_defense)
41 %span.nature-hinder -
42 %th
43 Speed
44 - if @pokemon.nature_benefits?(:speed)
45 %span.nature-benefit +
46 - if @pokemon.nature_hinders?(:speed)
47 %span.nature-hinder -
48 %tr
49 %td= @pokemon.revisions.last.hp
50 %td= @pokemon.revisions.last.attack
51 %td= @pokemon.revisions.last.defense
52 %td= @pokemon.revisions.last.special_attack
53 %td= @pokemon.revisions.last.special_defense
54 %td= @pokemon.revisions.last.speed
55 .pokemon-row
56 .pokemon-moves
57 .pd-details Moves
58 %ul
59 %li= @pokemon.revisions.last.move_1.name
60 - if @pokemon.revisions.last.move_2
61 %li= @pokemon.revisions.last.move_2.name
62 - else
63 %li -
64 - if @pokemon.revisions.last.move_3
65 %li= @pokemon.revisions.last.move_3.name
66 - else
67 %li -
68 - if @pokemon.revisions.last.move_4
69 %li= @pokemon.revisions.last.move_4.name
70 - else
71 %li -
72 .pokemon-memo
73 .pd-details Trainer Memo
74 .pd-contents
75 %p
76 %span.pokemon-nature<= @pokemon.nature.titlecase
77 nature.
78 %p= @pokemon.display_met
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 15:06:07 +0000