merge

app/views/admin/event_types/_form.html.haml

@@ -15,6 +15,7 @@
       = f.input :description, as: :text, hint: markdown_hint, input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.input :minimum_abstract_length, input_html: {size: 3}
       = f.input :maximum_abstract_length, input_html: {size: 3}
+      = f.input :submission_instructions, as: :text, hint: markdown_hint, input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.input :color, input_html: { size: 6, type: 'color' }
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/event_types/index.html.haml

@@ -10,6 +10,7 @@
       %thead
         %th Title
         %th Description
+        %th Instructions
         %th Length
         %th Abstract Length
         %th Color
@@ -21,6 +22,8 @@
               = event_type.title
             %td
               = markdown(event_type.description)
+            %td
+              = markdown(event_type.submission_instructions)
             %td
               = event_type.length
               Minutes

app/views/admin/survey_questions/_form.html.haml

@@ -15,7 +15,7 @@
 
       .row
         .col-md-12
-          = f.input :title
+          = f.input :title, input_html: { autofocus: true }
           = f.input :mandatory
           .survey-possible-answers{ class: @survey_question.choice? ? '' : 'hidden' }
             = f.input :possible_answers, hint: 'Comma separated', input_html: { rows: 3 }

app/views/admin/surveys/_survey_stats.html.haml

@@ -7,4 +7,4 @@
     .panel-body
       - question_replies = survey_question.survey_replies
       - if question_replies.any?
-        = pie_chart question_replies.group(:text).count, library: { legend: 'bottom', plotOptions: { pie: { dataLabels: { enabled: false }, showInLegend: true } } }
+        = pie_chart question_replies.group(:text).count, library: { legend: { position: 'bottom' }, plotOptions: { pie: { dataLabels: { enabled: false }, showInLegend: true } } }

app/views/admin/users/index.html.haml

@@ -20,6 +20,7 @@
         %th{ width: '0' } Conferences Attended
         %th{ width: '50%' } Roles
         %th{ width: '0' } Actions
+        %th{ style: 'display: none' } Confirmed?
       %tbody
 
 :javascript
@@ -37,6 +38,7 @@
         {
           "data": "confirmed_at",
           "render": function (data, type, row, meta) {
+            console.log(meta)
             return '<input type="checkbox" class="switch-checkbox" '+
                    'id="user_'+row.id+'_confirmed" '+
                    'name="user_'+row.id+'_confirmed" '+
@@ -73,6 +75,11 @@
                    '<a class="btn-primary" href="'+data.edit_url+'">Edit</a>'+
                    '</div>';
           }
+        },
+        {
+          "data": "confirmed",
+          "className": 'hidden',
+          "render": false
         }
       ]
     });

app/views/admin/users/show.html.haml

@@ -12,8 +12,10 @@
       .tab-content
         #user-info-content.tab-pane{class: "#{'active' unless params[:tab] == 'submissions-content'}"}
           - if can? :edit, @user
-            .pull-right
+            .pull-right.btn-group
               = link_to 'Edit', edit_admin_user_path(@user), class: 'btn btn-primary'
+              = link_to 'Delete', admin_user_path(@user),method: :delete, class: 'btn btn-danger',
+                data: {confirm: "Are you sure?"}
           %table.table
             - @show_attributes.each do |attr|
               %tr

app/views/conference_registrations/_event.html.haml

@@ -7,6 +7,11 @@
         = event.title
         %small
           = event.subtitle
+        .text-muted
+          = registered_text(event)
+          - if event.scheduled?
+            (Scheduled on: #{event.time.to_date})
+
   .panel-body
     -# %p
     -#   = canceled_replacement_event_label(event, event_schedule)

app/views/conference_registrations/show.html.haml

@@ -9,9 +9,9 @@
           -if @conference.venue
             at
             %strong
-              = "#{@conference.venue.name},"
-            = "#{@conference.venue.street},"
-            = "#{@conference.venue.city} / #{@conference.venue.country_name}."
+              = "#{@conference.venue_name},"
+            = "#{@conference.venue_street},"
+            = "#{@conference.city} / #{@conference.country_name}."
           %small
             = date_string(@conference.start_date, @conference.end_date)
   - unless @conference.code_of_conduct.blank?

app/views/conferences/_conference_details.html.haml

@@ -12,10 +12,10 @@
               = date_string(conference.start_date, conference.end_date)
           - if conference.venue
             %p
-              = "#{conference.venue.city}/#{conference.venue.country_name}"
+              = "#{conference.city}/#{conference.country_name}"
           - unless conference.description.blank?
             %p
-              = markdown(conference.description)
+              = markdown(conference.description, escape_html=false)
         .col-md-2
           .btn-group-vertical
             - if !@conference || @conference != conference

app/views/conferences/index.html.haml

@@ -10,16 +10,19 @@
       .col-md-12
         %p.text-right
           %button{ type: 'button', class: 'btn btn-link btn-sm', 'data-toggle' => 'collapse', 'data-target' => '#antiquated', 'aria-expanded' => 'true', 'aria-controls' => 'antiquated'}
-            Older conferences
+            Past Conferences
             %span.notranslate
               = "(#{@antiquated.count})"
-            %i.fa.fa-chevron-right
-            %i.fa.fa-chevron-down{ style: 'display: none' }
-    #antiquated.collapse
+            %i.fa.fa-chevron-right{ style: 'display: none' }
+            %i.fa.fa-chevron-down
+    #antiquated
       - @antiquated.each do |conference|
         = render '/conferences/conference_details', conference: conference
-  - if @antiquated.empty? && @current.empty? && User.empty?
-    = render partial: 'new_install'
+  %p
+    Add the events to your calendar:
+    %span.btn-group
+      = link_to("Days only", calendar_url(protocol: 'webcal', format: 'ics'), class: 'btn btn-default')
+      = link_to("Detailed", calendar_url(protocol: 'webcal', format: 'ics', full: true), class: 'btn btn-default')
 
 -content_for :script_body do
   :javascript

app/views/conferences/new_install.html.haml

@@ -17,5 +17,5 @@
         will the be administrator of it.
       %p
         We hope you enjoy using OSEM, if you have any question don't hesitate to
-        = link_to('http://osem.io/#contact') do
+        = link_to('https://osem.io/#contact') do
           contact us!

app/views/layouts/_user_menu.html.haml

@@ -23,8 +23,8 @@
   %li
     = link_to(conference_conference_registration_path(@conference)) do
       %span.fa.fa-id-badge
-        = @conference.short_title
-        registration
+      = @conference.short_title
+      registration
 -if @conference && @conference.program
   %li
     = link_to(conference_program_proposals_path(@conference.short_title)) do

app/views/physical_tickets/show.html.haml

@@ -9,9 +9,9 @@
           - if @conference.venue
             at
             %strong
-              #{@conference.venue.name},
-            #{@conference.venue.street},
-            #{@conference.venue.city} / #{@conference.venue.country_name}.
+              #{@conference.venue_name},
+            #{@conference.venue_street},
+            #{@conference.city} / #{@conference.country_name}.
           %small
             = date_string(@conference.start_date, @conference.end_date)
   .row

app/views/proposals/_proposal_form.html.haml

@@ -47,9 +47,16 @@
       words.
 
     %br
+    - @conference.program.event_types.each do |event_type|
+      %span{ class: 'help-block select-help-text event_event_type_id collapse', id: "#{event_type.id}-help" }
+        %h3
+          = event_type.name
+          Instructions
+        = markdown(event_type.submission_instructions)
 
     = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' }, placeholder: '' },
       hint: markdown_hint('Only conference organizers will read this.')
+    %button.btn.btn-primary.primary-button{ type: 'button', id: 'sub_text_reset', data: { confirm: 'Do you really want to reset your submission text to the provided template?' } } Reset to Template
 
     %p
       You have used
@@ -62,7 +69,7 @@
         250
       words.
 
-    - if current_user.is_admin? or @program.cfp.enable_registrations?
+    - if current_user.is_admin? or @program.cfp&.enable_registrations?
       = f.inputs 'Enable pre-registration' do
         = f.input :require_registration, label: 'Require participants to register to your event'
         - message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'

app/views/proposals/new.html.haml

@@ -33,20 +33,20 @@
               = f.input :title, as: :string, required: true, input_html: { required: true }
               = f.input :event_type_id, as: :select,
                 collection: @program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
-                data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
+                data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length, help: type.description }]},
                 include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
 
+              - if @program.languages.present?
+                = f.input :language, as: :select,
+                  collection: @languages,
+                  include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
+
               - @program.event_types.each do |event_type|
                 %div{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help"}
                   %strong Directions
                   %div
                     = markdown(event_type.description)
 
-              - if @program.languages.present?
-                = f.input :language, as: :select,
-                  collection: @languages,
-                  include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
-
               = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown' } },
                 hint: markdown_hint
 
@@ -61,21 +61,22 @@
                   250
                 words.
 
+              %br
+              - @conference.program.event_types.each do |event_type|
+                %span{ class: 'help-block select-help-text event_event_type_id collapse', id: "#{event_type.id}-help" }
+                  %h3
+                    = event_type.name
+                    Instructions
+                  %p Please use this as the template for your submission.
+                  This part of the submission is intended only for the conference committee.
+                  %hr
+                  = markdown(event_type.submission_instructions)
+
+
               = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' } },
                 hint: markdown_hint
 
-              %p
-                You have used
-                %span#submission-count #{@event.submission_word_count}
-                words. Submission descriptions must be between
-                %span#submission-minimum-word-count
-                  0
-                and
-                %span#submission-maximum-word-count
-                  250
-                words.
-
-
+              %button.btn.btn-primary.primary-button{ type: 'button', id: 'sub_text_reset', data: { confirm: 'Do you really want to reset your submission text to the provided template?' } } Reset to Template
 
               - if @program.cfp.enable_registrations?
                 = f.input :require_registration, label: 'Require participants to register to your event'

app/views/schedules/show.html.haml

@@ -26,9 +26,13 @@
 
           .visible-md-inline.visible-lg-inline
             = render partial: 'carousel', locals: { date: date, hrs_per_slide: 3 }
-    %p.pull-right
-      = link_to app_conference_schedule_path do
-        Get the mobile app!
+    %p
+      %span
+        = link_to conference_schedule_url(protocol: 'webcal', format: 'ics') do
+          Add the schedule to your calendar
+      %span.pull-right
+        = link_to app_conference_schedule_path do
+          Get the mobile app!
 
 :javascript
   // change of active tab and the button title when a date is clicked