2017 refactor

app/views/conference_administration/_administrators.html.haml

@@ -4,7 +4,7 @@
   = admin_update_form do
     = checkboxes :organizations, (@organizations.map { |org| [org.name, org.id] }), @this_conference.organizations.map(&:id), 'test.test', vertical: true, big: true
     .actions.right.small
-      = button_tag :save, value: :set_organizations
+      = button :save, value: :set_organizations
   - @this_conference.organizations.each do | organization |
     %h4=organization.name
     - if organization.users.present?
@@ -16,11 +16,11 @@
               = admin_update_form class: [:inline, :right] do
                 = hidden_field_tag :user_id, user.id
                 = hidden_field_tag :org_id, organization.id
-                = button_tag :remove_member, value: :remove_org_member, class: [:small, :delete]
+                = button :remove_member, value: :remove_org_member, class: [:small, :delete]
     = admin_update_form class: 'mini-flex-form' do
       = hidden_field_tag :org_id, organization.id
       = emailfield :email, nil, required: true
-      = button_tag :add_member, value: :add_org_member, class: :small
+      = button :add_member, value: :add_org_member, class: :small
 
   %h3=_'articles.admin.info.headings.External_Administrators'
   %p=_'articles.admin.info.descriptions.External_Administrators'
@@ -32,10 +32,10 @@
           - unless user.id == current_user.id && !current_user.administrator?
             = admin_update_form class: [:inline, :right] do
               = hidden_field_tag :user_id, user.id
-              = button_tag :remove_member, value: :remove_administrator, class: [:small, :delete]
+              = button :remove_member, value: :remove_administrator, class: [:small, :delete]
   = admin_update_form class: 'mini-flex-form' do
     = userfield :email, nil, required: true
     -#= emailfield :email, nil, required: true
-    = button_tag :add_member, value: :add_administrator, class: :small
+    = button :add_member, value: :add_administrator, class: :small
 = columns(large: 2) do
    

app/views/conference_administration/_broadcast.html.haml

@@ -12,12 +12,12 @@
         %h3=@subject
         = richtext @body, 4
       .actions.right
-        = button_tag :test, value: :test, class: :secondary if @broadcast_step == :preview
+        = button :test, value: :test, class: :secondary if @broadcast_step == :preview
         = button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }), value: :send, class: :delete if @broadcast_step == :test
-        = button_tag :edit, value: :edit
+        = button :edit, value: :edit
     - else
       = selectfield :send_to, nil, broadcast_options, full: true
       = textfield :subject, @subject, required: true, big: true
       = textarea :body, @body, lang: @this_conference.locale, edit_on: :focus
       .actions.right
-        = button_tag :preview, value: :preview
+        = button :preview, value: :preview

app/views/conference_administration/_dates.html.haml

@@ -14,4 +14,4 @@
   = row do
     = columns(medium: 6, push: { medium: 1 }) do
       .actions
-        = button_tag :save, value: :save
+        = button :save, value: :save

app/views/conference_administration/_description.html.haml

@@ -2,4 +2,4 @@
   = admin_update_form do
     = translate_textarea :info, @this_conference, label: 'articles.conference_registration.headings.admin.edit.info', help: 'articles.conference_registration.paragraphs.admin.edit.info', edit_on: :focus
     .actions.right
-      = button_tag :save, value: :save
+      = button :save, value: :save

app/views/conference_administration/_events.html.haml

@@ -37,5 +37,5 @@
         = length_select @length, small: true
       = translate_fields @event, { title: { type: :textfield, big: true, label: 'forms.labels.generic.title' }, info: { type: :textarea, label: 'forms.labels.generic.info', edit_on: :focus } }
       .actions.next-prev
-        = button_tag :save, value: :save
-        = button_tag :cancel, value: :cancel, class: :subdued, formnovalidate: true if @event.id.present?
+        = button :save, value: :save
+        = button :cancel, value: :cancel, class: :subdued, formnovalidate: true if @event.id.present?

app/views/conference_administration/_locations.html.haml

@@ -36,7 +36,7 @@
   = columns(medium: 12) do
     .actions.next-prev
       - if @location.present?
-        = 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
       - else
-        = button_tag :create, value: :create
+        = button :create, value: :create

app/views/conference_administration/_meals.html.haml

@@ -20,7 +20,7 @@
             %td.form
               = admin_update_form do
                 = hidden_field_tag :meal, time
-                = button_tag :delete, value: :delete, class: [:small, :delete]
+                = button :delete, value: :delete, class: [:small, :delete]
     = admin_update_form do
       %h3=_'articles.admin.locations.headings.add_meal', :t
       .flex-inputs
@@ -30,6 +30,6 @@
       = textfield :title, nil, required: true, big: true, help: 'articles.admin.locations.paragraphs.meal_title'
       = textfield :info, nil, help: 'articles.admin.locations.paragraphs.meal_info'
       .actions.next-prev
-        = button_tag :add_meal, value: :add_meal
+        = button :add_meal, value: :add_meal
   - else
     .warning-info=_'articles.admin.meals.no_locations_warning'

app/views/conference_administration/_payment_message.html.haml

@@ -3,4 +3,4 @@
     = translate_textarea :payment_message, @this_conference, default: 'articles.conference_registration.paragraphs.Payment', help: 'articles.conference_registration.paragraphs.admin.payment.message', edit_on: :focus, short: true
 
     .actions.right
-      = button_tag :save, value: :save
+      = button :save, value: :save

app/views/conference_administration/_paypal.html.haml

@@ -5,4 +5,4 @@
     = passwordfield :paypal_password, @this_conference.paypal_password
     = textfield :paypal_signature, @this_conference.paypal_signature
     .actions.right
-      = button_tag :save, value: :save
+      = button :save, value: :save

app/views/conference_administration/_poster.html.haml

@@ -2,4 +2,4 @@
   = form_tag administration_update_path(@this_conference.slug, :poster), multipart: true do
     = filefield :poster, @this_conference.poster, required: true, label: false, preview: true
     .actions.left
-      = button_tag :upload, value: :upload, id: 'upload-file'
+      = button :upload, value: :upload, id: 'upload-file'

app/views/conference_administration/_providers.html.haml

@@ -7,4 +7,4 @@
     = selectfield :distance_unit, @conditions['distance']['unit'], [:km, :mi], label: false, inline: true
   = columns(medium: 12) do
     .actions.right
-      = button_tag :save, value: :save_distance
+      = button :save, value: :save_distance

app/views/conference_administration/_publish_schedule.html.haml

@@ -2,7 +2,7 @@
   = form_tag administration_update_path(@this_conference.slug, @admin_step) do
     - if @this_conference.workshop_schedule_published
       %p=_'articles.conference_registration.paragraphs.admin.schedule.published', :p
-      .actions= button_tag :un_publish, value: :publish, class: :delete
+      .actions= button :un_publish, value: :publish, class: :delete
     - else
       %p=_'articles.conference_registration.paragraphs.admin.schedule.un_published', :p
-      .actions= button_tag :publish, value: :publish
+      .actions= button :publish, value: :publish

app/views/conference_administration/_registration_status.html.haml

@@ -2,4 +2,4 @@
   = form_tag administration_update_path(@this_conference.slug, @admin_step) do
     = selectfield :registration_status, @this_conference.registration_status || 'closed', registration_status_options_list, inline_label: true
     .actions.left
-      = button_tag :save, value: :save
+      = button :save, value: :save

app/views/conference_administration/_registrations.html.haml

@@ -14,4 +14,4 @@
         = html_edit_table @excel_data, registrations_edit_table_options
         .actions.right
           %a.button.subdued{data: { 'closes-modal': 'new-registration' }}='Cancel'
-          = button_tag :save, value: :save, class: :modify
+          = button :save, value: :save, class: :modify

app/views/conference_administration/_schedule.html.haml

@@ -1,85 +1,86 @@
-= columns(medium: 12) do
-  - conference = @this_conference || @conference
-  - if conference.event_locations.blank? && @entire_page
-    .warning-info=_'articles.admin.schedule.no_locations_warning'
-  - else
-    - add_inline_script :schedule if @entire_page
-    #schedule-preview
-      - @schedule.each do | day, data |
-        %h4=date(day, :weekday)
-        %table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]}
-          - if data[:locations].present? && data[:locations].values.first != :add
-            %thead
-              %tr
-                %th.corner
-                - data[:locations].each do | id, location |
-                  %th=location.is_a?(Symbol) ? '' : location.title
-          %tbody
-            - data[:times].each do | time, time_data |
-              %tr
-                - rowspan = (time_data[:length] * 2).to_i
-                %th=time(time)
-                - if time_data[:type] == :workshop
-                  - data[:locations].each do | id, location |
-                    - if time_data[:item][:workshops][id].present?
-                      - workshop = time_data[:item][:workshops][id][:workshop]
-                      - status = time_data[:item][:workshops][id][:status]
-                    - else
-                      - workshop = status = nil
-                    %td{class: [time_data[:type], workshop.present? ? :filled : :open], rowspan: rowspan, data: workshop.present? ? nil : { block: time_data[:item][:block], day: day, location: id }}
-                      - if workshop.present? && workshop.event_location.present?
-                        = link_to view_workshop_path(@conference.slug, workshop.id), class: 'event-detail-link' do
-                          .details
-                            .title=workshop.title
-                        %template.event-details{data: { href: view_workshop_path(@conference.slug, workshop.id) }}
-                          %h1.title=workshop.title
-                          %p.address
-                            = workshop.event_location.title + _!(': ')
-                            = location_link workshop.event_location
-                          .workshop-description= richtext workshop.info, 1
-                        - if @can_edit
-                          = form_tag administration_update_path(conference.slug, @admin_step), class: 'deschedule-workshop' do
-                            .status
-                              .conflict-score
-                                %span.title Conflicts: 
-                                %span.value="#{status[:conflict_score]} / #{workshop.interested.size}"
-                              - if status[:errors].present?
-                                .errors
-                                  - status[:errors].each do | error |
-                                    .error=_"errors.messages.schedule.#{error[:name].to_s}", vars: error[:i18nVars]
-                            = hidden_field_tag :id, workshop.id
-                            = button_tag :deschedule, value: :deschedule_workshop, class: [:delete, :small]
-                      - elsif @can_edit
-                        .title="Block #{time_data[:item][:block] + 1}"
-                - elsif time_data[:type] != :nil
-                  %td{class: time_data[:type], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1}
-                    - case time_data[:type]
-                      - when :meal
-                        - location = EventLocation.where(id: time_data[:item]['location'].to_i).first
-                        - if location.present?
-                          %a.event-detail-link
+= row do
+  = columns(medium: 12) do
+    - conference = @this_conference || @conference
+    - if conference.event_locations.blank? && @entire_page
+      .warning-info=_'articles.admin.schedule.no_locations_warning'
+    - else
+      - add_inline_script :schedule if @entire_page
+      #schedule-preview
+        - @schedule.each do |day, data|
+          %h4=date(day, :weekday)
+          %table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]}
+            - if data[:locations].present? && data[:locations].values.first != :add
+              %thead
+                %tr
+                  %th.corner
+                  - data[:locations].each do |id, location|
+                    %th=location.is_a?(Symbol) ? '' : _!(location.title)
+            %tbody
+              - data[:times].each do |time, time_data|
+                %tr
+                  - rowspan = (time_data[:length] * 2).to_i
+                  %th=time(time)
+                  - if time_data[:type] == :workshop
+                    - data[:locations].each do |id, location|
+                      - if time_data[:item][:workshops][id].present?
+                        - workshop = time_data[:item][:workshops][id][:workshop]
+                        - status = time_data[:item][:workshops][id][:status]
+                      - else
+                        - workshop = status = nil
+                      %td{class: [time_data[:type], workshop.present? ? :filled : :open], rowspan: rowspan, data: workshop.present? ? nil : { block: time_data[:item][:block], day: day, location: id }}
+                        - if workshop.present? && workshop.event_location.present?
+                          = link_to view_workshop_path(@conference.slug, workshop.id), class: 'event-detail-link' do
                             .details
-                              .title= time_data[:item]['title']
-                              .location= location.title
-                          %template.event-details
-                            %h1.title=time_data[:item]['title']
+                              .title=_!workshop.title
+                          %template.event-details{data: { href: view_workshop_path(@conference.slug, workshop.id) }}
+                            %h1.title=_!workshop.title
                             %p.address
-                              = location.title + _!(': ')
-                              = location_link location
-                      - when :event
-                        - if time_data[:item].event_location.present?
-                          %a.event-detail-link
-                            .details
-                              .title= time_data[:item][:title]
-                              .location= time_data[:item].event_location.title
-                          %template.event-details
-                            %h1.title=time_data[:item][:title]
-                            %p.address
-                              = time_data[:item].event_location.title + _!(': ')
-                              = location_link time_data[:item].event_location
-                            = richtext time_data[:item][:info], 1
-    - if @entire_page
-      #workshop-selector
-        = form_tag administration_update_path(@this_conference.slug, @admin_step), class: 'workshop-dlg', id: 'workshop-table-form' do
-          %h3 Select a Workshop
-          #table
+                              = _!("#{workshop.event_location.title}:")
+                              = location_link workshop.event_location
+                            .workshop-description= richtext workshop.info, 1
+                          - if @can_edit
+                            = form_tag administration_update_path(conference.slug, @admin_step), class: 'deschedule-workshop' do
+                              .status
+                                .conflict-score
+                                  %span.title Conflicts: 
+                                  %span.value="#{status[:conflict_score]} / #{workshop.interested.size}"
+                                - if status[:errors].present?
+                                  .errors
+                                    - status[:errors].each do |error|
+                                      .error=_"errors.messages.schedule.#{error[:name].to_s}", vars: error[:i18nVars]
+                              = hidden_field_tag :id, workshop.id
+                              = button :deschedule, value: :deschedule_workshop, class: [:delete, :small]
+                        - elsif @can_edit
+                          .title="Block #{time_data[:item][:block] + 1}"
+                  - elsif time_data[:type] != :nil
+                    %td{class: time_data[:type], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1}
+                      - case time_data[:type]
+                        - when :meal
+                          - location = EventLocation.where(id: time_data[:item]['location'].to_i).first
+                          - if location.present?
+                            %a.event-detail-link
+                              .details
+                                .title=_!(time_data[:item]['title'])
+                                .location=_!location.title
+                            %template.event-details
+                              %h1.title=_!(time_data[:item]['title'])
+                              %p.address
+                                = _!("#{location.title}:")
+                                = location_link location
+                        - when :event
+                          - if time_data[:item].event_location.present?
+                            %a.event-detail-link
+                              .details
+                                .title=_!(time_data[:item][:title]) if time_data[:item][:title]
+                                .location=_!(time_data[:item].event_location.title)
+                            %template.event-details
+                              %h1.title=_!(time_data[:item][:title]) if time_data[:item][:title]
+                              %p.address
+                                = _!("#{time_data[:item].event_location.title}:")
+                                = location_link time_data[:item].event_location
+                              = richtext time_data[:item][:info], 1
+      - if @entire_page
+        #workshop-selector
+          = form_tag administration_update_path(@this_conference.slug, @admin_step), class: 'workshop-dlg', id: 'workshop-table-form' do
+            %h3 Select a Workshop
+            #table

app/views/conference_administration/_suggested_amounts.html.haml

@@ -5,4 +5,4 @@
       - for i in 1..5 do
         = numberfield "payment_amounts[#{i - 1}]", payment_amounts[i - 1], step: 0.01, min: 0.00, label: false
     .actions.right
-      = button_tag :save, value: :save
+      = button :save, value: :save

app/views/conference_administration/_workshop_times.html.haml

@@ -15,5 +15,5 @@
         .table-td=checkboxes :days, @block_days, info['days'].map(&:to_i), 'date.day_names', vertical: true, small: true
         .table-td.form
           = hidden_field_tag :workshop_block, block
-          = button_tag :delete_block, value: :delete_block, class: [:small, :delete] if block == @workshop_blocks.length - 2
-          = button_tag (is_new ? :add_block : :update_block), value: :save_block, class: [:small, :add]
+          = button :delete_block, value: :delete_block, class: [:small, :delete] if block == @workshop_blocks.length - 2
+          = button (is_new ? :add_block : :update_block), value: :save_block, class: [:small, :add]