Merge 3a1e1da9e7 into 93404d543f

app/helpers/application_helper.rb

@@ -45,7 +45,7 @@ module ApplicationHelper
   def voting_open_or_close(program)
     return if program.voting_period?
     if program.voting_start_date > Time.current
-      return 'Voting period has not started yet!'
+      return 'Voting period has nmot started yet!'
     else # voting_end_date > Date.today because voting_start_date < voting_end_date
       return 'Voting period is over!'
     end
@@ -597,4 +597,13 @@ module ApplicationHelper
     end
     concurrent_events
   end
+
+  ##
+  # ====Gets
+  # a conference object
+  # Sets class hidden if conference is over 
+  def hidden_if_conference_over(conference)
+    'hidden' if Date.today > conference.end_date
+  end
 end
+

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

@@ -1,12 +1,12 @@
 .list-group
-  %li.list-group-item
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)}" }
     %h4
       Conference progress
     .progress
       .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' => "list-group-item #{class_for_todo(conference_progress['registration'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)}  #{class_for_todo(conference_progress['registration'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['registration']) }
     - if can? :update, @conference
       - if conference.registration_period
@@ -15,13 +15,13 @@
         = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title'])
     - else
       Set up registration period
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['cfp'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)}  #{class_for_todo(conference_progress['cfp'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['cfp']) }
     - if can? :update, Cfp.new(program_id: @program.id)
       = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title'])
     - else
       Set up call for papers
-  %li{'class'=>"list-group-item #{class_for_todo(conference_progress['venue'])}"}
+  %li{'class'=>"list-group-item #{hidden_if_conference_over(conference)} #{class_for_todo(conference_progress['venue'])}"}
     %span{'class'=>icon_for_todo(conference_progress['venue'])}
     - if can? :update, Venue.new(conference: @conference)
       - @conference.reload
@@ -32,31 +32,31 @@
     - else
       - @conference.reload
       Add venue
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['rooms'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)} #{class_for_todo(conference_progress['rooms'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['rooms']) }
     - if @conference.venue && (can? :update, @conference.venue.rooms.build)
       = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title'])
     - else
       Add rooms
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['tracks'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)} #{class_for_todo(conference_progress['tracks'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['tracks']) }
     - if can? :update, @conference.program.tracks.build
       = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title'])
     - else
       Add tracks
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['event_types'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)} #{class_for_todo(conference_progress['event_types'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['event_types']) }
     - if can? :update, @conference.program.event_types.build
       = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title'])
     - else
       Add event types
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['difficulty_levels'])}" }
+  %li{ 'class' => "list-group-item #{hidden_if_conference_over(conference)} #{class_for_todo(conference_progress['difficulty_levels'])}" }
     %span{ 'class' => icon_for_todo(conference_progress['difficulty_levels']) }
     - if can? :update, @conference.program.difficulty_levels.build
       = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title'])
     - else
       Add difficulty levels
-  %li{ class: "list-group-item #{class_for_todo(conference_progress['splashpage'])}" }
+  %li{ class: "list-group-item #{hidden_if_conference_over(conference)} #{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/conferences/show.html.haml

@@ -101,11 +101,11 @@
 .row
   .col-md-8
     %ul.nav.nav-tabs#recentTable
-      %li.active
+      %li{ 'class' => "active #{hidden_if_conference_over(@conference)}" }
         %a{ href: '#recent_reg', 'data-toggle' => 'tab' }
           %span.fa.fa-user
           Recent Registrations
-      %li
+      %li{ 'class' => "#{hidden_if_conference_over(@conference)}" }
         %a{ href: '#recent_submissions', 'data-toggle' => 'tab' }
           %span.fa.fa-file-text
           Recent Submissions

app/views/admin/reports/_all_events.html.haml

@@ -27,7 +27,13 @@
           %td
             = link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
             %br
-            .small (Presented by #{event.speaker_names})
+            .small
+              (Presented by
+              - speakers = event.speakers.uniq
+              - speakers.each.with_index(1) do |speaker,index|
+                = link_to speaker.name, admin_user_path(speaker)
+                = ',' unless index == speakers.length
+              )
 
           - %w(registered biography commercials subtitle difficulty_level).each do |info|
             %td{'data-order' => "#{progress_status[info]}"}

app/views/admin/reports/_events_with_requirements.html.haml

@@ -21,7 +21,11 @@
         %tr
           %td= event.id
           %td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
-          %td  #{event.speaker_names}
+          %td
+            - speakers = event.speakers.uniq
+            - speakers.each.with_index(1) do |speaker,index|
+              = link_to speaker.name, admin_user_path(speaker)
+              = ',' unless index == speakers.length
           %td= event.description
           %td= event.room.name if event.room
           %td= event.time.to_date if event.time

app/views/admin/reports/_events_without_commercials.html.haml

@@ -17,4 +17,8 @@
         %tr
           %td= event.id
           %td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
-          %td  #{event.speaker_names}
+          %td
+            - speakers = event.speakers.uniq
+            - speakers.each.with_index(1) do |speaker,index|
+              = link_to speaker.name, admin_user_path(speaker)
+              = ',' unless index == speakers.length