Testing tests

app/views/workshops/_form.html.haml

@@ -1,40 +1,23 @@
-= form_for @workshop do |f|
-  - if @workshop.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@workshop.errors.count, "error")} prohibited this workshop from being saved:"
-      %ul
-        - @workshop.errors.full_messages.each do |msg|
-          %li= msg
-
-  .field
-    = f.label :title
-    = f.text_field :title
-  .field
-    = f.label :slug
-    = f.text_field :slug
-  .field
-    = f.label :info
-    = f.text_area :info
-  .field
-    = f.label :conference_id
-    = f.number_field :conference_id
-  .field
-    = f.label :workshop_stream_id
-    = f.number_field :workshop_stream_id
-  .field
-    = f.label :workshop_presentation_style
-    = f.number_field :workshop_presentation_style
-  .field
-    = f.label :min_facilitators
-    = f.number_field :min_facilitators
-  .field
-    = f.label :location_id
-    = f.number_field :location_id
-  .field
-    = f.label :start_time
-    = f.datetime_select :start_time
-  .field
-    = f.label :end_time
-    = f.datetime_select :end_time
-  .actions
-    = f.submit 'Save'
+= form_for @workshop, url: conference_workshops_path(@conference, @workshop) do |f|
+	.columns
+		- if @workshop.errors.any?
+			#error_explanation
+				%h2= "#{pluralize(@workshop.errors.count, "error")} prohibited this workshop from being saved:"
+				%ul
+					- @workshop.errors.full_messages.each do |msg|
+						%li= msg
+		= field f, :title, :text_field
+		= field f, :slug, :text_field
+	.columns.medium-4
+		%h2=_'workshop.form.help.title', :t
+		=_'workshop.form.help', :p
+	.columns.medium-8
+		= field f, :info, :text_area
+		= field f, :workshop_stream_id, :number_field
+		= field f, :workshop_presentation_style, :number_field
+		=# field f, :min_facilitators, :number_field
+		=# field f, :location_id, :number_field
+		=# field f, :start_time, :datetime_select
+		=# field f, :end_time, :datetime_select
+	.columns
+		= actions :save

app/views/workshops/edit.html.haml

@@ -1,7 +1,6 @@
-%h1 Editing workshop
+- page_style :form
 
-= render 'form'
+= tabs!
 
-= link_to 'Show', @workshop
-\|
-= link_to 'Back', workshops_path
+.row
+	= render 'form'

app/views/workshops/index.html.haml

@@ -14,7 +14,6 @@
     %th End time
     %th
     %th
-    %th
 
   - @workshops.each do |workshop|
     %tr
@@ -28,10 +27,9 @@
       %td= workshop.location_id
       %td= workshop.start_time
       %td= workshop.end_time
-      %td= link_to 'Show', workshop
-      %td= link_to 'Edit', edit_workshop_path(workshop)
-      %td= link_to 'Destroy', workshop, :method => :delete, :data => { :confirm => 'Are you sure?' }
+      %td= link_to 'Show', conference_workshop_path(@conference, workshop)
+      %td= link_to 'Edit', edit_conference_workshop_path(@conference, workshop)
 
 %br
 
-= link_to 'New Workshop', new_workshop_path
+= link_to 'New Workshop', new_conference_workshop_path

app/views/workshops/new.html.haml

@@ -1,5 +1,6 @@
-%h1 New workshop
+- page_style :form
 
-= render 'form'
+= tabs!
 
-= link_to 'Back', workshops_path
+.row
+	= render 'form'

app/views/workshops/show.html.haml

@@ -1,36 +1,30 @@
 %p#notice= notice
 
-%p
-  %b Title:
-  = @workshop.title
-%p
-  %b Slug:
-  = @workshop.slug
-%p
-  %b Info:
-  = @workshop.info
-%p
-  %b Conference:
-  = @workshop.conference_id
-%p
-  %b Workshop stream:
-  = @workshop.workshop_stream_id
-%p
-  %b Workshop presentation style:
-  = @workshop.workshop_presentation_style
-%p
-  %b Min facilitators:
-  = @workshop.min_facilitators
-%p
-  %b Location:
-  = @workshop.location_id
-%p
-  %b Start time:
-  = @workshop.start_time
-%p
-  %b End time:
-  = @workshop.end_time
+.row
+	.columns.medium-12
+		%h1= @workshop.title
 
-= link_to 'Edit', edit_workshop_path(@workshop)
-\|
-= link_to 'Back', workshops_path
+= tabs!
+
+.row
+	.columns.medium-4
+		%p
+			%b Workshop stream:
+			= @workshop.workshop_stream_id
+		%p
+			%b Workshop presentation style:
+			= @workshop.workshop_presentation_style
+		%p
+			%b Min facilitators:
+			= @workshop.min_facilitators
+		%p
+			%b Location:
+			= @workshop.location_id
+		%p
+			%b Start time:
+			= @workshop.start_time
+		%p
+			%b End time:
+			= @workshop.end_time
+	.columns.medium-8
+		=p @workshop, :info