Merge branch 'delint'

* delint:
  Hide stuff again on admin conf show
  update snapcon logo
  more delinting
  Delint event page
  Delint by re-enabling everying on the conference admin page

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

@@ -28,9 +28,9 @@
           .col-md-12
             = render 'line_chart',
               title: 'Submissions per week', data: @submissions
-      .col-md-4
+      -# .col-md-4
-        -# = render 'todo_list',
+      -#   = render 'todo_list',
-        -#   conference_progress: @conference_progress, conference: @conference
+      -#     conference_progress: @conference_progress, conference: @conference
       .row#tickets
         .col-md-8
           = render 'line_chart',
@@ -43,48 +43,48 @@
         %a{ href: '#distribution_all', 'data-toggle' => 'tab' }
           %span.fa.fa-star
           All
-      %li
+      -# %li
-        %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' }
+      -#   %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' }
-          %span.fa.fa-comment
+      -#     %span.fa.fa-comment
-          Confirmed
+      -#     Confirmed
-      %li
+      -# %li
-        %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' }
+      -#   %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' }
-          %span.fa.fa-archive
+      -#     %span.fa.fa-archive
-          Withdrawn
+      -#     Withdrawn
     .tab-content
       .tab-pane.active#distribution_all
         .row
           .col-md-4
             = render 'donut_chart', title: 'Event types',
               combined_data: @event_type_distribution
-          .col-md-4
-            -# = render 'donut_chart', title: 'Difficulty levels',
-            -#   combined_data: @difficulty_levels_distribution
-          .col-md-4
-            -# = render 'donut_chart', title: 'Tracks',
-            -#   combined_data: @tracks_distribution
-      .tab-pane#distribution_confirmed
-        .row
-          .col-md-4
-            -# = render 'donut_chart', title: 'Event types',
-            -#   combined_data: @event_type_distribution_confirmed
-          .col-md-4
-            -# = render 'donut_chart', title: 'Difficulty levels',
-            -#   combined_data: @difficulty_levels_distribution_confirmed
-          .col-md-4
-            -# = render 'donut_chart', title: 'Tracks',
-            -#   combined_data: @tracks_distribution_confirmed
-      .tab-pane#distribution_withdrawn
-        .row
-          .col-md-4
-            = render 'donut_chart', title: 'Event types',
-              combined_data: @event_type_distribution_withdrawn
           .col-md-4
             = render 'donut_chart', title: 'Difficulty levels',
-              combined_data: @difficulty_levels_distribution_withdrawn
+              combined_data: @difficulty_levels_distribution
           .col-md-4
             = render 'donut_chart', title: 'Tracks',
-              combined_data: @tracks_distribution_withdrawn
+              combined_data: @tracks_distribution
+      -# .tab-pane#distribution_confirmed
+      -#   .row
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Event types',
+      -#         combined_data: @event_type_distribution_confirmed
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Difficulty levels',
+      -#         combined_data: @difficulty_levels_distribution_confirmed
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Tracks',
+      -#         combined_data: @tracks_distribution_confirmed
+      -# .tab-pane#distribution_withdrawn
+      -#   .row
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Event types',
+      -#         combined_data: @event_type_distribution_withdrawn
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Difficulty levels',
+      -#         combined_data: @difficulty_levels_distribution_withdrawn
+      -#     .col-md-4
+      -#       = render 'donut_chart', title: 'Tracks',
+      -#         combined_data: @tracks_distribution_withdrawn
 
 .row
   .col-md-8

app/views/conference_registrations/_event.html.haml

@@ -1,9 +1,9 @@
-.panel.panel-default{class: ("panel-success" if event.registrations.include?(@registration)) }
+.panel.panel-default{c lass: ("panel-success" if event.registrations.include?(@registration)) }
   .panel-heading
-    %label{for: "registration_event_ids_#{event.id}"}
+    %label{ for: "registration_event_ids_#{event.id}" }
-      %h3{style: 'margin: 0 auto;'}
+      %h3{ style: 'margin: 0 auto;' }
-        = hidden_field_tag "registration[event_ids][]", nil
+        = hidden_field_tag 'registration[event_ids][]', nil
-        = check_box_tag "registration[event_ids][]", event.id, event.registrations.include?(@registration), id: "registration_event_ids_#{event.id}"
+        = check_box_tag 'registration[event_ids][]', event.id, event.registrations.include?(@registration), id: "registration_event_ids_#{event.id}"
         = event.title
         %small
           = event.subtitle
@@ -13,16 +13,16 @@
             (Scheduled on: #{event.time.to_date})
 
   .panel-body
-    -# %p
+    %p
-    -#   = canceled_replacement_event_label(event, event_schedule)
+      = canceled_replacement_event_label(event, event_schedule)
-    -#   = replacement_event_notice(event_schedule)
+      = replacement_event_notice(event_schedule)
     %p
       - if event.speakers.any?
         presented by #{event.speaker_names}
     - if event_schedule.present?
       .h4.track
         %span.fa.fa-clock-o
-        %span.label{ style: "background-color: grey" }
+        %span.label{ style: 'background-color: grey' }
           = event_schedule.start_time.strftime('%A, %B %-d %H:%M')
           \-
           = event_schedule.end_time.strftime('%H:%M')

app/views/schedules/happening_now.haml

@@ -9,26 +9,25 @@
     .col-md-12
       %h2
         #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
-      %h3
+        %small
-        This page was loaded at
+          This page was loaded at
-        = inyourtz(Time.now) do
+          = inyourtz(Time.now) do
-          #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')}
+            #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')}
 
   .row
     / TODO: Clean this up, merge with all events page.
-    / scheduled events
     - date = nil
     - time = nil
     - @events_schedules.each do |event_schedule|
       - unless event_schedule.start_time.strftime('%Y-%m-%d').eql?(date)
         .col-xs-12.col-md-12
           .date-content
-            %span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" }
+            %span{ class: 'date-title', id: event_schedule.start_time.strftime('%Y-%m-%d') }
               = inyourtz(event_schedule.start_time, @conference.timezone) do
                 = date = event_schedule.start_time.strftime('%Y-%m-%d')
-            %a{ title: "Go up", class: "pull-right", href: "#program" }
+            %a{ title: 'Go up', class: 'pull-right', href: '#program' }
-              %i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
+              %i.fa.fa-angle-double-up.fa-lg{ 'aria-hidden': true }
-      - unless event_schedule.start_time.strftime('%H:%M').eql?(time)
+      - if !event_schedule.start_time.strftime('%H:%M').eql?(time)
         .col-xs-12.col-md-1
           .start-time
             = inyourtz(event_schedule.start_time, @conference.timezone) do
@@ -37,6 +36,7 @@
           .new-time-event
             = render 'event', event: event_schedule.event, event_schedule: event_schedule
       - else
+        -# TODO: Add comment describing this condition.
         .col-xs-12.col-md-11.col-md-offset-1
           = render 'event', event: event_schedule.event, event_schedule: event_schedule