2017 refactor

app/views/workshops/_show.html.haml

@@ -27,7 +27,7 @@
               =_"roles.workshops.facilitator.#{workshop.role(u).to_s}"
             - if is_facilitator && preview.blank?
               .details
-                .email=u.email
+                .email=_!u.email
               - if f.role.to_sym == :requested
                 =(link_to (_'actions.workshops.Approve'), approve_facilitate_workshop_request_path(workshop.conference.slug, workshop.id, f.user_id, 'approve'), :class => [:button, :modify])
                 =(link_to (_'actions.workshops.Deny'), approve_facilitate_workshop_request_path(workshop.conference.slug, workshop.id, f.user_id, 'deny'), :class => [:button, :delete])
@@ -46,7 +46,7 @@
               = email_field_tag :email, nil, required: true
               = label_tag :email
             = off_screen (_'forms.actions.aria.add'), 'add-new-desc'
-            = button_tag :add, aria: { labelledby: 'add-new-desc' }
+            = button :add, aria: { labelledby: 'add-new-desc' }
   - languages = JSON.parse(workshop.languages || '[]')
   - if languages.present?
     = columns(medium: 6) do
@@ -55,7 +55,7 @@
   - if workshop.theme.present?
     = columns(medium: 6) do
       %h3=_'articles.workshops.headings.theme','Theme'
-      %p= Workshop.all_themes.include?((workshop.theme || '').to_sym) ? (_"workshop.options.theme.#{workshop.theme}") : workshop.theme
+      %p= Workshop.all_themes.include?((workshop.theme || '').to_sym) ? (_"workshop.options.theme.#{workshop.theme}") : _!(workshop.theme)
   - if is_facilitator || workshop.conference.host?(current_user)
     - needs = JSON.parse(workshop.needs || '[]')
     - if needs.present?
@@ -69,21 +69,21 @@
   = columns(medium: 12, id: :comments) do
     %h3=_'articles.workshops.headings.Comments'
     %ul.comments
-      - workshop.comments.each do | comment |
+      - workshop.comments.each do |comment|
         %li.comment{id: "comment-#{comment.id}"}
           = comment(comment)
           - sub_comments = comment.comments
           - if sub_comments.present?
             %ul.sub-comments.comments
-              - sub_comments.each do | sub_comment |
+              - sub_comments.each do |sub_comment|
                 %li.sub-comment.comment{id: "comment-#{sub_comment.id}"}
                   = comment(sub_comment)
           = form_tag workshop_comment_path(workshop.conference.slug, workshop.id) do
             = hidden_field_tag :comment_id, comment.id
             = textarea :reply, nil, plain: true, required: true, label: false, labelledby: "replyto-#{comment.id}"
             .actions.right
-              = button_tag :reply, value: :reply, data: {opens: "#comment-#{comment.id} form", focus: :textarea}, class: :small, id: "replyto-#{comment.id}"
+              = button :reply, value: :reply, data: {opens: "#comment-#{comment.id} form", focus: :textarea}, class: :small, id: "replyto-#{comment.id}"
     = form_tag workshop_comment_path(workshop.conference.slug, workshop.id) do
       = textarea :comment, nil, plain: true, required: true, label: false, labelledby: :add_comment
       .actions.right
-        = button_tag :add_comment, value: :add_comment, id: :add_comment
+        = button :add_comment, value: :add_comment, id: :add_comment

app/views/workshops/_workshop_previews.html.haml

@@ -2,7 +2,7 @@
   - workshops.sort_by{ |w| w.title.downcase }.each do |w|
     - is_interested = w.interested?(current_user)
     %li{class: [is_interested ? :interested : nil]}
-      %h4.title=w.title
+      %h4.title=_!(w.title)
       .workshop-interest
         - if w.can_show_interest?(current_user)
           = form_tag toggle_workshop_interest_path(w.conference.slug, w.id), class: 'js-xhr' do

app/views/workshops/delete.html.haml

@@ -1,11 +1,11 @@
 = render 'conferences/page_header', :page_key => 'Delete_Workshop'
 %article
-	= row do
-		= columns(medium: 12) do
-			%h2=_'articles.workshops.headings.Delete_Workshop',"Are you sure you want to delete the workshop: <em>#{@workshop.title}</em>?", :vars => {:title => "<em>#{@workshop.title}</em>".html_safe}
-			%p=_'articles.workshops.paragraphs.Delete_Workshop'
-			= form_tag delete_workshop_path(@this_conference.slug, @workshop.id), class: 'composition' do
-				.actions
-					= button_tag :confirm, :value => :confirm, :class => :delete
-					= button_tag :cancel, :value => :cancel
+  = row do
+    = columns(medium: 12) do
+      %h2=_'articles.workshops.headings.Delete_Workshop',"Are you sure you want to delete the workshop: <em>#{@workshop.title}</em>?", vars: {title: "<em>#{@workshop.title}</em>".html_safe}
+      %p=_'articles.workshops.paragraphs.Delete_Workshop'
+      = form_tag delete_workshop_path(@this_conference.slug, @workshop.id), class: 'composition' do
+        .actions
+          = button :confirm, value: :confirm, class: :delete
+          = button :cancel, value: :cancel
 

app/views/workshops/edit.html.haml

@@ -1,6 +0,0 @@
-- page_style :form
-
-= tabs!
-
-.row
-	= render 'form'

app/views/workshops/facilitate.html.haml

@@ -1,16 +1,16 @@
-= render 'conferences/page_header', :page_key => 'Facilitate_Workshop'
+= render 'conferences/page_header', page_key: 'Facilitate_Workshop'
 %article
-	= row do
-		= form_tag facilitate_workshop_request_path(@this_conference.slug, @workshop.id), class: 'composition' do
-			= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
-			= columns(medium: 12) do
-				%h2=_'articles.workshops.headings.facilitate', "Request to Facilitate ‘#{@workshop.title}’", :vars => { :workshop_title => @workshop.title }
-				= registration_step_menu
-				=m('articles.workshops.paragraphs.facilitate_request','Please tell the current workshop facilitators who you are, why you want to help facilitate the workshop, and how you think you will help make the workshop better. All of the current facilitators will be emailed and they may ask more questions before approving or denying your request. Please note that this will reveal your email address to the facilitators.')
-				.text-area-field.input-field
-					= label_tag :message
-					= text_area_tag :message, nil, :required => true
-			= columns(medium: 12) do
-				.actions.right
-					= button_tag :send, :value => :send
+  = row do
+    = form_tag facilitate_workshop_request_path(@this_conference.slug, @workshop.id), class: 'composition' do
+      = (hidden_field_tag :workshop_id, @workshop.id) if @workshop
+      = columns(medium: 12) do
+        %h2=_'articles.workshops.headings.facilitate', "Request to Facilitate ‘#{@workshop.title}’", vars: { workshop_title: @workshop.title }
+        = registration_step_menu
+        =_('articles.workshops.paragraphs.facilitate_request','Please tell the current workshop facilitators who you are, why you want to help facilitate the workshop, and how you think you will help make the workshop better. All of the current facilitators will be emailed and they may ask more questions before approving or denying your request. Please note that this will reveal your email address to the facilitators.')
+        .text-area-field.input-field
+          = label_tag :message
+          = text_area_tag :message, nil, required: true
+      = columns(medium: 12) do
+        .actions.right
+          = button :send, value: :send
 

app/views/workshops/facilitate_request_sent.html.haml

@@ -1,12 +1,12 @@
 = render 'conferences/page_header', :page_key => 'Conference_Registration'
 
 %article
-	= row do
-		%h2=_'page_titles.conferences.Facilitate_Workshop'
-		= registration_step_menu
-		= columns(medium: 12) do
-			=m('articles.workshops.paragraphs.facilitate_request_sent','Your request has been sent. You will receive an email once your request is approved or denied or if the current facilitators have any questions.')
-		= columns(medium: 12) do
-			.actions
-				= link_to (_'actions.workshops.View'), view_workshop_path(@this_conference.slug, @workshop.id), :class => 'button'
-				= link_to (_'actions.workshops.View_All'), register_step_path(@this_conference.slug, :wokshops), :class => 'button'
+  = row do
+    %h2=_'page_titles.conferences.Facilitate_Workshop'
+    = registration_step_menu
+    = columns(medium: 12) do
+      =_('articles.workshops.paragraphs.facilitate_request_sent','Your request has been sent. You will receive an email once your request is approved or denied or if the current facilitators have any questions.')
+    = columns(medium: 12) do
+      .actions
+        = link_to (_'actions.workshops.View'), view_workshop_path(@this_conference.slug, @workshop.id), :class => 'button'
+        = link_to (_'actions.workshops.View_All'), register_step_path(@this_conference.slug, :wokshops), :class => 'button'

app/views/workshops/index.html.haml

@@ -1,4 +1,4 @@
-= render 'conferences/page_header', :page_key => 'Workshops'
+= render 'conferences/page_header', page_key: 'Workshops'
 
 %article
   = row do
@@ -10,9 +10,10 @@
   = row do
     = columns(medium: 12) do
       %h3=_'articles.workshops.headings.Your_Workshops'
-      = render 'workshops/workshop_previews', :workshops => @my_workshops
+      = render 'workshops/workshop_previews', workshops: @my_workshops
       = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] if @conference.registration_open
   = row do
     = columns(medium: 12) do
-      %h3=_'articles.workshops.headings.All_Workshops'
-      = render 'workshops/workshop_previews', :workshops => @workshops
+      %h3=_'articles.conference_registration.headings.All_Workshops'
+      -#%h3 All Workshops weather you like it or not
+      = render 'workshops/workshop_previews', workshops: @workshops

app/views/workshops/new.html.haml

@@ -36,6 +36,6 @@
           = textarea :notes, @workshop.notes, warning: 'articles.workshops.paragraphs.notes'
       = columns(medium: 12) do
         .actions.next-prev
-          = button_tag :save, value: :save
-          = button_tag :cancel, value: :cancel, class: :subdued, formnovalidate: true
+          = button :save, value: :save
+          = button :cancel, value: :cancel, class: :subdued, formnovalidate: true