Refactoring of proposal workflow. Fixes #215

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

@@ -8,13 +8,8 @@
 .row
   .col-md-8
     = semantic_form_for(@commercial, :url => (@commercial.new_record? ? admin_conference_commercials_path : admin_conference_commercial_path(@conference.short_title, @commercial))) do |f|
-      = f.input :commercial_type, as: :select, label: 'Conference Promo Media Type', class: 'form-control', collection: CONFIG['commercial_types'].values, include_blank: false, hint: 'This media-item will be used to represent this conference at various places in OSEM.'
+      = f.input :commercial_type, as: :select, label: 'Conference Promo Media Type', input_html: { class: 'select-help-toggle' }, collection: CONFIG['commercial_types'].values, include_blank: false, hint: 'This media-item will be used to represent this conference at various places in OSEM.'
       = f.input :commercial_id, label: 'Conference Promo Media ID', as: :string
-      %p{ class: 'help-block media-type', id: 'youtube-help' } Go to your YouTube video, click on "share" and copy everything behind http://youtu.be/"
-      %p{ class: 'help-block media-type', id: 'slideshare-help', style: 'display:none' } Go to your SlideShare, click on "share" -> "embed" and copy the id
-      %p{ class: 'help-block media-type', id: 'flickr-help', style: 'display:none' } Go to your flickr image, click on "Grab the link" -> "Show short url" and copy everything behind https://flic.kr/p/
-      %p{ class: 'help-block media-type', id: 'vimeo-help', style: 'display:none' } Go to your vimeo video, click on "share" and copy everything behind http://vimeo.com/
-      %p{ class: 'help-block media-type', id: 'speakerdeck-help', style: 'display:none' } Go to your SpeakerDeck, click on "share" -> "embed" and copy the data-id
-      %p{ class: 'help-block media-type', id: 'instagram-help', style: 'display:none' } Go to your Instagram photo page and copy everything behind instagram.com/p/ (without trailing /# hash symbol)
+      = render partial: 'commercials/commercial_help'
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/conference/_todo_list.html.haml

@@ -6,7 +6,7 @@
       .progress-bar{ 'role'=>'progressbar', 'aria-valuenow'=>"#{conference_progress['process']}", 'aria-valuemin'=>'0',
                     'aria-valuemax'=>'100', 'style'=>"width: #{conference_progress['process']}%;" }
         = conference_progress['process'] + '%'
-  %li{'class'=>class_for_todo(conference_progress['registration'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['registration'])}"}
     %span{'class'=>icon_for_todo(conference_progress['registration'])}
     - if can? :update, @conference
       - if conference.registration_period
@@ -15,43 +15,43 @@
         = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title'])
     - else
       Set up registration period
-  %li{'class'=>class_for_todo(conference_progress['cfp'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['cfp'])}"}
     %span{'class'=>icon_for_todo(conference_progress['cfp'])}
     - if can? :update, CallForPaper.new(conference_id: @conference.id)
       = link_to 'Set up call for papers', admin_conference_call_for_paper_path(conference_progress['short_title'])
     - else
       Set up call for papers
-  %li{'class'=>class_for_todo(conference_progress['venue'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['venue'])}"}
     %span{'class'=>icon_for_todo(conference_progress['venue'])}
     - if can? :update, @conference.venue
       = link_to 'Add venue', edit_admin_conference_venue_path(conference_progress['short_title'])
     - else
       Add venue
-  %li{'class'=>class_for_todo(conference_progress['rooms'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['rooms'])}"}
     %span{'class'=>icon_for_todo(conference_progress['rooms'])}
     - if can? :update, @conference.rooms.build
       = link_to 'Add rooms', admin_conference_rooms_path(conference_progress['short_title'])
     - else
       Add rooms
-  %li{'class'=>class_for_todo(conference_progress['tracks'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['tracks'])}"}
     %span{'class'=>icon_for_todo(conference_progress['tracks'])}
     - if can? :update, @conference.tracks.build
       = link_to 'Add tracks', admin_conference_tracks_path(conference_progress['short_title'])
     - else
       Add tracks
-  %li{'class'=>class_for_todo(conference_progress['event_types'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['event_types'])}"}
     %span{'class'=>icon_for_todo(conference_progress['event_types'])}
     - if can? :update, @conference.event_types.build
       = link_to 'Add event types', admin_conference_event_types_path(conference_progress['short_title'])
     - else
       Add event types
-  %li{'class'=>class_for_todo(conference_progress['difficulty_levels'])}
+  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['difficulty_levels'])}"}
     %span{'class'=>icon_for_todo(conference_progress['difficulty_levels'])}
     - if can? :update, @conference.difficulty_levels.build
       = link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
     - else
       Add difficulty levels
-  %li{class: class_for_todo(conference_progress['splashpage'])}
+  %li{class: "list-group-item #{class_for_todo(conference_progress['splashpage'])}"}
     %span{'class'=>icon_for_todo(conference_progress['splashpage'])}
     - if can? :update, @conference
       = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title'])

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

@@ -11,8 +11,9 @@
     = semantic_form_for(@event_type, :url => (@event_type.new_record? ? admin_conference_event_types_path : admin_conference_event_type_path(@conference.short_title, @event_type))) do |f|
       = f.input :title
       = f.input :length, :input_html => {:size => 3}
+      = f.input :description
       = f.input :minimum_abstract_length, :input_html => {:size => 3}
       = f.input :maximum_abstract_length, :input_html => {:size => 3}
       = f.input :color, :input_html => { :size => 6, :type => 'color' }
       %p.text-right
-        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
+        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }