diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml index 89daeff5..eaf6a031 100644 --- a/app/views/admin/conferences/show.html.haml +++ b/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 - = render 'todo_list', - conference_progress: @conference_progress, conference: @conference + -# .col-md-4 + -# = render 'todo_list', + -# conference_progress: @conference_progress, conference: @conference .row#tickets .col-md-8 = render 'line_chart', @@ -43,14 +43,14 @@ %a{ href: '#distribution_all', 'data-toggle' => 'tab' } %span.fa.fa-star All - %li - %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' } - %span.fa.fa-comment - Confirmed - %li - %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' } - %span.fa.fa-archive - Withdrawn + -# %li + -# %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' } + -# %span.fa.fa-comment + -# Confirmed + -# %li + -# %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' } + -# %span.fa.fa-archive + -# Withdrawn .tab-content .tab-pane.active#distribution_all .row @@ -63,28 +63,28 @@ .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 - .col-md-4 - = render 'donut_chart', title: 'Tracks', - combined_data: @tracks_distribution_withdrawn + -# .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 diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml index bb1244f4..0c64470d 100644 --- a/app/views/schedules/happening_now.haml +++ b/app/views/schedules/happening_now.haml @@ -9,10 +9,10 @@ .col-md-12 %h2 #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes. - %h3 - This page was loaded at - = inyourtz(Time.now) do - #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')} + %small + This page was loaded at + = inyourtz(Time.now) do + #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')} .row / TODO: Clean this up, merge with all events page. @@ -27,7 +27,6 @@ = date = event_schedule.start_time.strftime('%Y-%m-%d') %a{ title: 'Go up', class: 'pull-right', href: '#program' } %i.fa.fa-angle-double-up.fa-lg{ 'aria-hidden': true } - -# rubocop:disable Style/UnlessElse - if !event_schedule.start_time.strftime('%H:%M').eql?(time) .col-xs-12.col-md-1 .start-time @@ -40,7 +39,6 @@ -# 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 - -# rubocop:enable Style/UnlessElse :javascript // Refresh the page every 5 minutes.