1 files changed, 29 insertions, 20 deletions
diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml
index a38d641..18a6788 100644
--- a/app/views/pokeviewer/pokemon/show.html.haml
+++ b/app/views/pokeviewer/pokemon/show.html.haml

@@ -7,24 +7,33 @@
    .pokemon-ot
      OT/
      %span{ class: @pokemon.ot_gender }>= @pokemon.ot_name
-    .pokemon-id= "ID/#{@pokemon.ot_number}"
+    .pokemon-id= "ID/#{@pokemon.display_ot_number}"
    .pokemon-level= "Lv. #{@pokemon.revisions.last.level}"
-  %table.pokemon-ivs
+  .pokemon-memo
-    %tr
+    .pd-details Trainer Memo
-      %th HP
+    .pd-contents
-      %td= @pokemon.revisions.last.hp
+      %p
-    %tr
+        %span.pokemon-nature<= @pokemon.nature.titlecase
-      %th Attack
+        nature.
-      %td= @pokemon.revisions.last.attack
+      %p= @pokemon.display_met
-    %tr
+  .pokemon-stats
-      %th Defense
+    .pd-details Stats
-      %td= @pokemon.revisions.last.defense
+    %table.pd-contents
-    %tr
+      %tr
-      %th Sp. Atk
+        %th HP
-      %td= @pokemon.revisions.last.special_attack
+        %td= @pokemon.revisions.last.hp
-    %tr
+      %tr
-      %th Sp. Def
+        %th Attack
-      %td= @pokemon.revisions.last.special_defense
+        %td= @pokemon.revisions.last.attack
-    %tr
+      %tr
-      %th Speed
+        %th Defense
-      %td= @pokemon.revisions.last.speed
+        %td= @pokemon.revisions.last.defense
+      %tr
+        %th Sp. Atk
+        %td= @pokemon.revisions.last.special_attack
+      %tr
+        %th Sp. Def
+        %td= @pokemon.revisions.last.special_defense
+      %tr
+        %th Speed
+        %td= @pokemon.revisions.last.speed

diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml index a38d641..18a6788 100644 --- a/app/views/pokeviewer/pokemon/show.html.haml +++ b/app/views/pokeviewer/pokemon/show.html.haml
@@ -7,24 +7,33 @@
7	.pokemon-ot	7	.pokemon-ot
8	OT/	8	OT/
9	%span{ class: @pokemon.ot_gender }>= @pokemon.ot_name	9	%span{ class: @pokemon.ot_gender }>= @pokemon.ot_name
10	.pokemon-id= "ID/#{@pokemon.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	%table.pokemon-ivs	12	.pokemon-memo
13	%tr	13	.pd-details Trainer Memo
14	%th HP	14	.pd-contents
15	%td= @pokemon.revisions.last.hp	15	%p
16	%tr	16	%span.pokemon-nature<= @pokemon.nature.titlecase
17	%th Attack	17	nature.
18	%td= @pokemon.revisions.last.attack	18	%p= @pokemon.display_met
19	%tr	19	.pokemon-stats
20	%th Defense	20	.pd-details Stats
21	%td= @pokemon.revisions.last.defense	21	%table.pd-contents
22	%tr	22	%tr
23	%th Sp. Atk	23	%th HP
24	%td= @pokemon.revisions.last.special_attack	24	%td= @pokemon.revisions.last.hp
25	%tr	25	%tr
26	%th Sp. Def	26	%th Attack
27	%td= @pokemon.revisions.last.special_defense	27	%td= @pokemon.revisions.last.attack
28	%tr	28	%tr
29	%th Speed	29	%th Defense
30	%td= @pokemon.revisions.last.speed	30	%td= @pokemon.revisions.last.defense
		31	%tr
		32	%th Sp. Atk
		33	%td= @pokemon.revisions.last.special_attack
		34	%tr
		35	%th Sp. Def
		36	%td= @pokemon.revisions.last.special_defense
		37	%tr
		38	%th Speed
		39	%td= @pokemon.revisions.last.speed