Multiple fixes for prod

2017-07-01 16:02:38 -07:00
parent c5143ddb0e
commit c28566e210
13 changed files with 137 additions and 103 deletions
@@ -1,4 +1,4 @@
-= render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
+= render partial: 'application/header', locals: {image_file: @banner_image || 'grafitti.jpg'}
 %article
  = row do
    = columns do
@@ -18,7 +18,7 @@
          = checkboxes :languages, User.AVAILABLE_LANGUAGES, (current_user.languages || [I18n.locale]).map(&:to_sym), 'languages', heading: 'articles.conference_registration.headings.languages'
          = 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
+          .actions.center
            = button :save, value: :save
      - else
        %h2=_'forms.actions.generic.login'
@@ -1,4 +1,19 @@
 = columns(large: 8, push: { large: 2}) do
+  %h3=_'articles.admin.info.headings.External_Administrators'
+  %p=_'articles.admin.info.descriptions.External_Administrators'
+  - if @this_conference.administrators.present?
+    .details.org-members
+      - @this_conference.administrators.each do | user |
+        = raw_data_set(:h5, user.name) do
+          = user.email
+          - unless user.id == current_user.id && !current_user.administrator?
+            = admin_update_form class: [:inline, :right] do
+              = hidden_field_tag :user_id, user.id
+              = button :remove_member, value: :remove_administrator, class: [:small, :delete]
+  = admin_update_form class: 'mini-flex-form' do
+    = userfield :email, nil, required: true
+    = button :add_member, value: :add_administrator, class: :small
+
  %h3=_'articles.admin.info.headings.Host_Organizations'
  %p=_'articles.admin.info.descriptions.Host_Organizations', vars: { city_name: @this_conference.city.city }
  = admin_update_form do
@@ -22,20 +37,5 @@
      = emailfield :email, nil, required: true
      = button :add_member, value: :add_org_member, class: :small

-  %h3=_'articles.admin.info.headings.External_Administrators'
-  %p=_'articles.admin.info.descriptions.External_Administrators'
-  - if @this_conference.administrators.present?
-    .details.org-members
-      - @this_conference.administrators.each do | user |
-        = raw_data_set(:h5, user.name) do
-          = user.email
-          - unless user.id == current_user.id && !current_user.administrator?
-            = admin_update_form class: [:inline, :right] do
-              = hidden_field_tag :user_id, user.id
-              = 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 :add_member, value: :add_administrator, class: :small
 = columns(large: 2) do
  &nbsp;
@@ -1,23 +1,26 @@
-= columns(medium: 12) do
-  = admin_update_form do
-    - if @broadcast_step == :preview || @broadcast_step == :test
-      = hidden_field_tag :subject, @subject
-      = hidden_field_tag :body, @body
-      = hidden_field_tag :send_to, @send_to
+= admin_update_form do
+  - if @broadcast_step == :preview || @broadcast_step == :test
+    = hidden_field_tag :subject, @subject
+    = hidden_field_tag :body, @body
+    = hidden_field_tag :send_to, @send_to
+    = columns(medium: 12) do
      - if @broadcast_step == :preview
-        %p= _'articles.conference_registration.paragraphs.admin.broadcast.test', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
+        %p= (_'articles.conference_registration.paragraphs.admin.broadcast.test', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe
      - else
-        .warning-info.make-room= _'articles.conference_registration.paragraphs.admin.broadcast.preview', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
+        .warning-info.make-room=(_'articles.conference_registration.paragraphs.admin.broadcast.preview', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe
+    = columns(medium: 10, push: { medium: 1 }) do
      .test-preview
        %h3=@subject
        = richtext @body, 4
-      .actions.right
-        = 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
+    = columns(medium: 12) do
+      .actions.center
+        = button :test, value: :test, class: :warning if @broadcast_step == :preview
+        = button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe, value: :send, class: :delete if @broadcast_step == :test
        = button :edit, value: :edit
-    - else
+  - else
+    = columns(medium: 12) do
      = 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
+      .actions.center
        = button :preview, value: :preview
@@ -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 :un_publish, value: :publish, class: :delete
+      .actions.center= button :un_publish, value: :publish, class: :delete
    - else
      %p=_'articles.conference_registration.paragraphs.admin.schedule.un_published', :p
-      .actions= button :publish, value: :publish
+      .actions.center= button :publish, value: :publish
@@ -1,5 +1,6 @@
 - links ||= [ :register ]
 - sections ||= [ :info ]
+- is_registered = conference.registered?(current_user)
 = row(tag: :header) do
  = columns(class: 'conference-banner') do
    .title
@@ -9,8 +10,11 @@
        - if conference.start_date.present? && conference.end_date.present?
          .secondary
            = date_span(conference.start_date.to_date, conference.end_date.to_date)
+    .register-link
+      = (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
    - if conference.poster.present?
-      %img{src: conference.poster.full.url, role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
+      %figure
+        %img{src: conference.poster.full.url, role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
 %article
  = row(class: 'conference-details') do
    = columns(medium: 10, push: {medium: 1}) do
@@ -19,8 +23,14 @@
      - conference.extended_details.each do |section|
        - if sections.include?(section) && conference.copy_data[section][:show]
          %h3=(_ conference.copy_data[section][:heading], vars: conference.copy_data[section][:vars]) unless conference.copy_data[section][:heading] == false
-          = richtext conference.copy_data[section][:value]
+          = richtext conference.copy_data[section][:value], (conference.copy_data[section][:heading] == false ? 2 : 3)
        
+      .links
+        = (link_to (_(is_registered ? 'actions.conference.edit_registration' : 'forms.actions.generic.register')), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
+        = (link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: :button) if links.include?(:read_more)
+        = (link_to (_'forms.actions.generic.administrate'), administrate_conference_path(conference.slug), class: [:button]) if links.include?(:administrate)
+        = (link_to (_'forms.actions.generic.edit'), edit_conference_path(conference.slug), class: [:button, :subdued]) if links.include?(:edit)
+
      - if conference.registration_status == :open && sections.include?(:workshops)
        - if conference.workshop_schedule_published
          - add_inline_script :home_schedule
@@ -30,9 +40,6 @@
          %h3=_'articles.workshops.headings.Proposed_Workshops'
          %p=_'articles.workshops.paragraphs.Proposed_Workshops'
          = render 'workshops/workshop_previews', workshops: (conference.workshops.sort { |a, b| a.title.downcase <=> b.title.downcase })
-      .links
-        = (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
-        = (link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: :button) if links.include?(:read_more)
-        = (link_to (_'forms.actions.generic.administrate'), administrate_conference_path(conference.slug), class: [:button]) if links.include?(:administrate)
-        = (link_to (_'forms.actions.generic.edit'), edit_conference_path(conference.slug), class: [:button, :subdued]) if links.include?(:edit)
+          .actions.center
+            = link_to (_'actions.workshops.create'), create_workshop_path(conference.slug), class: [:button, :modify]

@@ -2,4 +2,4 @@
  = @this_conference.poster.full.url || image_path('default_poster.jpg')
 - content_for :title do
  =@this_conference.title
-= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info] + @this_conference.extended_details + [:workshops]
+= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info] + @this_conference.extended_details