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 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Pokeviewer</title>
-  <%= stylesheet_link_tag    "pokeviewer/application", media: "all" %>
-  <%= javascript_include_tag "pokeviewer/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-<%= yield %>
-</body>
-</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 @@
+!!! 5
+%html
+  %head
+    %title Pokeviewer
+    = stylesheet_link_tag "pokeviewer/application", media: "all"
+    = javascript_include_tag "pokeviewer/application"
+    = csrf_meta_tags
+  %body
+    %header#banner Pokéviewer
+    #container
+      #left-sidebar
+        Sidebar stuff
+      #content= yield
+      #right-sidebar
+        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 @@
      %span{ class: @pokemon.ot_gender }>= @pokemon.ot_name
    .pokemon-id= "ID/#{@pokemon.display_ot_number}"
    .pokemon-level= "Lv. #{@pokemon.revisions.last.level}"
-  .pokemon-memo
+  .pokemon-column
-    .pd-details Trainer Memo
+    .pokemon-stats
-    .pd-contents
+      .pd-details Stats
-      %p
+      %table.pd-contents
-        %span.pokemon-nature<= @pokemon.nature.titlecase
+        %tr
-        nature.
+          %th HP
-      %p= @pokemon.display_met
+          %th
-  .pokemon-stats
+            Attack
-    .pd-details Stats
+            - if @pokemon.nature_benefits?(:attack)
-    %table.pd-contents
+              %span.nature-benefit +
-      %tr
+            - if @pokemon.nature_hinders?(:attack)
-        %th HP
+              %span.nature-hinder -
-        %td= @pokemon.revisions.last.hp
+          %th
-      %tr
+            Defense
-        %th Attack
+            - if @pokemon.nature_benefits?(:defense)
-        %td= @pokemon.revisions.last.attack
+              %span.nature-benefit +
-      %tr
+            - if @pokemon.nature_hinders?(:defense)
-        %th Defense
+              %span.nature-hinder -
-        %td= @pokemon.revisions.last.defense
+          %th
-      %tr
+            Sp. Atk
-        %th Sp. Atk
+            - if @pokemon.nature_benefits?(:special_attack)
-        %td= @pokemon.revisions.last.special_attack
+              %span.nature-benefit +
-      %tr
+            - if @pokemon.nature_hinders?(:special_attack)
-        %th Sp. Def
+              %span.nature-hinder -
-        %td= @pokemon.revisions.last.special_defense
+          %th
-      %tr
+            Sp. Def
-        %th Speed
+            - if @pokemon.nature_benefits?(:special_defense)
-        %td= @pokemon.revisions.last.speed
+              %span.nature-benefit +
+            - if @pokemon.nature_hinders?(:special_defense)
+              %span.nature-hinder -
+          %th
+            Speed
+            - if @pokemon.nature_benefits?(:speed)
+              %span.nature-benefit +
+            - if @pokemon.nature_hinders?(:speed)
+              %span.nature-hinder -
+        %tr
+          %td= @pokemon.revisions.last.hp
+          %td= @pokemon.revisions.last.attack
+          %td= @pokemon.revisions.last.defense
+          %td= @pokemon.revisions.last.special_attack
+          %td= @pokemon.revisions.last.special_defense
+          %td= @pokemon.revisions.last.speed
+    .pokemon-row
+      .pokemon-moves
+        .pd-details Moves
+        %ul
+          %li= @pokemon.revisions.last.move_1.name
+          - if @pokemon.revisions.last.move_2
+            %li= @pokemon.revisions.last.move_2.name
+          - else
+            %li -
+          - if @pokemon.revisions.last.move_3
+            %li= @pokemon.revisions.last.move_3.name
+          - else
+            %li -
+          - if @pokemon.revisions.last.move_4
+            %li= @pokemon.revisions.last.move_4.name
+          - else
+            %li -
+      .pokemon-memo
+        .pd-details Trainer Memo
+        .pd-contents
+          %p
+            %span.pokemon-nature<= @pokemon.nature.titlecase
+            nature.
+          %p= @pokemon.display_met

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