Merge branch 'master' into responsive_charts

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,46 +15,48 @@
         = 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'])
+      = link_to 'Set up call for papers', admin_conference_program_cfps_path(conference_progress['short_title'])
     - else
       Set up call for papers
-  %li{ 'class' => "list-group-item #{class_for_todo(conference_progress['venue'])}" }
-    %span{ 'class' => icon_for_todo(conference_progress['venue']) }
-    - if can? :update, @conference.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
       - if conference.venue
         = link_to 'Add venue', edit_admin_conference_venue_path(conference_progress['short_title'])
       - else
         = link_to 'Add venue', new_admin_conference_venue_path(conference_progress['short_title'])
     - 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/edit.html.haml

@@ -17,6 +17,7 @@
         = image_tag @conference.picture.thumb.url
       = f.input :picture, label: false, hint: 'This will be displayed on the front page.'
       = f.hidden_field :picture_cache
+      = f.input :ticket_layout, as: :select, collection: Conference.ticket_layouts.keys, hint: "Layout type for tickets of the conference."
       = f.inputs name: 'Scheduling' do
         = f.input :timezone, as: :time_zone, hint: 'The conference time zone'
         = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', readonly: 'readonly' }
@@ -24,5 +25,5 @@
         = f.input :start_hour, input_html: {size: 2, type: 'number', min: 0, max: 23}
         = f.input :end_hour, input_html: {size: 2, type: 'number', min: 1, max: 24}
       = f.inputs name: 'Registrations' do
-        = f.input :registration_limit, as: :number, in: 0..9999, hint: 'Limit the number of registrations to the conference (0 no limit). You currently have ' + pluralize(@conference.registrations.count, 'registration')
+        = f.input :registration_limit, as: :number, in: 0..9999, hint: 'Limit the number of registrations to the conference (0 no limit). Please note that the registration limit doesn\'t apply to speakers of confirmed events (they will still be able to register even if it has been reached). You currently have ' + pluralize(@conference.registrations.count, 'registration')
       = f.action :submit, as: :button, button_html: {class: 'btn btn-primary'}

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

@@ -60,6 +60,17 @@
                                                unit: 'weeks' }
   .col-md-4
     = render partial: 'doughnut_chart', locals: { title: 'User', data: @user_distribution }
+.row#tickets
+  .col-md-8
+    = render partial: 'line_chart', locals: { title: 'Tickets sold over time',
+                                               name: 'tickets',
+                                               conferences: @conferences,
+                                               active_conferences: @active_conferences,
+                                               deactive_conferences: @deactive_conferences,
+                                               y: @tickets,
+                                               x: @ticket_weeks,
+                                               unit: 'weeks' }
+%br
 .row
   .col-md-8
     %ul.nav.nav-tabs#recentTable

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

@@ -69,6 +69,17 @@
       .col-md-4
         = render partial: 'todo_list', locals: { conference_progress: @conference_progress,
                                                  conference: @conference }
+      .row#tickets
+        .col-md-8
+          = render partial: 'line_chart', locals: { title: 'Tickets sold over time',
+                                                      name: 'tickets',
+                                                      conferences: @tickets,
+                                                      active_conferences: @tickets,
+                                                      deactive_conferences: [],
+                                                      y: @tickets_data,
+                                                      x: @ticket_weeks,
+                                                      unit: 'weeks' }
+%br
 .row
   .col-md-12#doughnut
     %ul.nav.nav-tabs#doughnut_tabs
@@ -101,11 +112,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