2017 refactor

app/views/application/500.html.haml

@@ -1,6 +1,5 @@
-= render :partial => 'application/header', :locals => {:image_file => 'parts.jpg'}
+= render partial: 'application/header', locals: {image_file: 'parts.jpg'}
 = row do
   = columns(medium: 12) do
     %p= _'error.500.description', :p
     = render 'contact', cancel_btn: false, contact_reason: :website
-    

app/views/application/_contact.html.haml

@@ -9,6 +9,6 @@
   = textfield :subject, nil, required: true, big: true
   = textarea :message, nil, required: true, plain: true
   .actions
-    = button_tag :send, value: :send
+    = button :send, value: :send
     - if cancel_btn
       %button.close.subdued=_'forms.actions.generic.cancel'

app/views/application/_login.html.haml

@@ -2,5 +2,5 @@
 = form_tag do_confirm_path, class: 'flex-form' do
 	= hidden_field_tag :dest, settings_path if dest.present?
 	= emailfield :email, nil, big: true
-	= button_tag :continue, :value => :confirm_email
+	= button :continue, value: :confirm_email
 	= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: dest), class: [:button, :facebook]

app/views/application/_login_confirm.html.haml

@@ -4,4 +4,4 @@
 		= form_tag :do_confirm, :authenticity_token => false, class: 'flex-form' do
 			= emailfield :email, nil, required: true, big: true
 			= hidden_field_tag :token, @confirmation.token
-			= button_tag :login
+			= button :login

app/views/application/_login_confirmation_sent.html.haml

@@ -1,4 +1,4 @@
 = row do
-	= columns(medium: 12) do
-		%h2=_'articles.permission_denied.headings.confirmation_sent'
-		%p=_'articles.conference_registration.paragraphs.email_confirm', :p
+  = columns(medium: 12) do
+    %h2=_'articles.permission_denied.headings.confirmation_sent'
+    %p=_'articles.conference_registration.paragraphs.email_confirm', :p

app/views/application/_not_a_translator.html.haml

@@ -6,4 +6,4 @@
 	= columns(medium: 6) do
 		= form_tag :translator_request do
 			= text_area_tag :comment, nil, placeholder: true, required: true
-			= button_tag :translator_request
+			= button :translator_request

app/views/application/_translator_login.html.haml

@@ -8,4 +8,4 @@
 			.email-field.input-field
 				= email_field_tag :email, nil, required: true
 				= label_tag :email
-			= button_tag :login
+			= button :login

app/views/application/contact.html.haml

@@ -1,10 +1,10 @@
 = render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
 %article
-	= row do
-		= columns do
-			- if @sent
-				%h2=_'articles.contact.headings.sent', :t
-				%p=_'articles.contact.paragraphs.sent', :p
-			- else
-				%h2=_'articles.contact.headings.contact'
-				= render 'contact', cancel_btn: false
+  = row do
+    = columns do
+      - if @sent
+        %h2=_'articles.contact.headings.sent', :t
+        %p=_'articles.contact.paragraphs.sent', :p
+      - else
+        %h2=_'articles.contact.headings.contact'
+        = render 'contact', cancel_btn: false

app/views/application/home.html.haml

@@ -1,5 +1,6 @@
 - content_for :og_image do
-  = @conference.poster.full.url || image_path('default_poster.jpg')
+  - if @conference.present?
+    = @conference.poster.full.url || image_path('default_poster.jpg')
 - if @conferences
   - @conferences.each do | conference |
     = render 'conferences/conference', conference: conference, links: [ :read_more, :register ]

app/views/application/permission_denied.html.haml

@@ -1,10 +1,10 @@
 = render :partial => 'application/header', :locals => {:image_file => @banner_image || '403.jpg'}
 %article
-	- if @template.present?
-		=render @template
-	- else
-		= row do
-			= columns do
-				%h2=_'error.403.title','Sorry, you currently don\'t have access to this page'
-				%p=_'error.403.description', :p
-				= render 'contact', cancel_btn: false, contact_reason: :website
+  - if @template.present?
+    =render @template
+  - else
+    = row do
+      = columns do
+        %h2=_'error.403.title','Sorry, you currently don\'t have access to this page'
+        %p=_'error.403.description', :p
+        = render 'contact', cancel_btn: false, contact_reason: :website

app/views/application/update_user.html.haml

@@ -6,4 +6,4 @@
 			%p=_'articles.conference_registration.paragraphs.provide_email', :p			
 			= form_tag oauth_save_path, class: 'flex-form' do
 				= emailfield :email, nil, required: true, big: true
-				= button_tag :save, value: :save
+				= button :save, value: :save

app/views/application/user_settings.html.haml

@@ -19,7 +19,7 @@
           = radiobuttons :preferred_language, I18n.backend.enabled_locales, current_user.locale || I18n.locale, 'languages', heading: 'articles.conference_registration.headings.preferred_language'
           = checkbox :email_subscribe, current_user.is_subscribed != false, 'articles.user_settings.email_subscribe', heading: 'articles.user_settings.headings.email_subscribe', help: 'articles.user_settings.paragraphs.email_subscribe', inline: true, right_help: true
           .actions
-            = button_tag :save, value: :save
+            = button :save, value: :save
       - else
         %h2=_'forms.actions.generic.login'
         = render 'login'