Restyled registration flow steps

2016-07-21 18:24:38 -07:00
parent 1db977f35b
commit b8b36b7cc8
14 changed files with 195 additions and 24 deletions
@@ -1,5 +1,3 @@
-= columns(medium: 12) do
-	%h2=_(@page_title)
 = columns(medium: 3, large: 2) do
 	= admin_menu
 = columns(medium: 9, large: 10) do
@@ -1,7 +1,5 @@
 = columns(medium: 12) do
-	%h2=_(@page_title)
 	%p=_'articles.conference_registration.paragraphs.Contact_Info', :s, 2
-= columns(medium: 12) do
 	= form_tag register_path(@this_conference.slug) do
 		= textfield :name, @name, required: true, heading: 'articles.conference_registration.headings.name', big: true
 		= textfield :location, (params[:location] || @registration.city || location(lookup_ip_location)), required: true, heading: 'articles.conference_registration.headings.location'
@@ -1,5 +1,3 @@
-= columns(medium: 12) do
-	%h2=_(@page_title)
 = columns(medium: 12) do
 	= form_tag register_path(@this_conference.slug) do
 		= checkbox :can_provide_housing, @registration.can_provide_housing, 'articles.conference_registration.can_provide_housing', heading: 'articles.conference_registration.headings.can_provide_housing', help: 'articles.conference_registration.paragraphs.can_provide_housing', inline: true, toggles: 'hosting-options', centered: true
@@ -1,5 +1,4 @@
 = columns(medium: 12) do
-	%h2=_'articles.conference_registration.headings.Payment'
 	- if @registration.registration_fees_paid.present?
 		%p
 			%strong=_'articles.conference_registration.paragraphs.Payment_Made', :p, vars: { fees_paid: @registration.registration_fees_paid }
@@ -1,5 +1,4 @@
 = columns(medium: 12) do
-	%h2=_@page_title
 	%p=_'articles.conference_registration.paragraphs.Policy_Agreement', :s, 2
 = columns(medium: 10, push: 1) do
 	= render 'application/policy'
@@ -1,5 +1,3 @@
-= columns(medium: 12) do
-	%h2=_'articles.conference_registration.headings.Registration_Info'
 = columns(medium: 12) do
 	%p=_'articles.conference_registration.paragraphs.Registration_Info', :p, vars: { city: @this_conference.location.city }
 = form_tag register_path(@this_conference.slug), class: [:centered, :clearfix] do
@@ -1,5 +1,3 @@
-= columns(medium: 12) do
-	%h2=_@page_title
 = columns(medium: 12, class: 'major-group') do
 	- if @my_workshops.present?
 		%h3=_'articles.conference_registration.headings.Your_Workshops'
@@ -1,5 +1,4 @@
 = render :partial => 'page_header', :locals => {:page_key => 'Conference_Registration'}
-= registration_step_menu

 - if @warnings.present?
 	= row class: 'warnings', tag: :ul do
@@ -8,4 +7,7 @@
 				= warning
 %article
 	= row do
+		= columns(medium: 12) do
+			%h2=_(@page_title)
+			= registration_step_menu
 		= render @register_template.to_s