diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml
index b1b07f2c..2f2ed1d8 100644
--- a/app/views/admin/conferences/show.html.haml
+++ b/app/views/admin/conferences/show.html.haml
@@ -29,8 +29,8 @@
= render 'line_chart',
title: 'Submissions per week', data: @submissions
-# .col-md-4
- -# = render 'todo_list',
- -# conference_progress: @conference_progress, conference: @conference
+ = render 'todo_list',
+ conference_progress: @conference_progress, conference: @conference
.row#tickets
.col-md-8
= render 'line_chart',
@@ -43,14 +43,15 @@
%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
+ -# TODO-SNAP: Disabled for Snap!Con
+ %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
@@ -91,27 +92,27 @@
= 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
+ .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 6649529a..6c3d8f5b 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -9,10 +9,12 @@
.col-md-12
%h2
#{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
+ %br
%small
This page was loaded at
= 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.
@@ -26,7 +28,7 @@
= inyourtz(event_schedule.start_time, @conference.timezone) do
= date = event_schedule.start_time.strftime('%Y-%m-%d')
%a.pull-right{ title: 'Go up', href: '#program' }
- %i.fa.fa-angle-double-up.fa-lg{ 'aria-hidden': true }
+ %i.fa.fa-angle-double-up.fa-lg{ 'aria-hidden' => true }
- if event_schedule.start_time.strftime('%H:%M').eql?(time)
.col-xs-12.col-md-11.col-md-offset-1
= render 'event', event: event_schedule.event, event_schedule: event_schedule