gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some re-delinting

Browse source
This commit is contained in:
Michael Ball 2021-03-22 03:18:47 -07:00
parent 75b60c2578
commit 048207cd38
2 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/views/admin/conferences/show.html.haml
View file

@ -29,8 +29,8 @@
= render 'line_chart', = render 'line_chart',
title: 'Submissions per week', data: @submissions 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 .row#tickets
.col-md-8 .col-md-8
= render 'line_chart', = render 'line_chart',
@ -43,14 +43,15 @@
%a{ href: '#distribution_all', 'data-toggle' => 'tab' } %a{ href: '#distribution_all', 'data-toggle' => 'tab' }
%span.fa.fa-star %span.fa.fa-star
All All
-# %li -# TODO-SNAP: Disabled for Snap!Con
-# %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' } %li
-# %span.fa.fa-comment %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' }
-# Confirmed %span.fa.fa-comment
-# %li Confirmed
-# %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' } %li
-# %span.fa.fa-archive %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' }
-# Withdrawn %span.fa.fa-archive
Withdrawn
.tab-content .tab-content
.tab-pane.active#distribution_all .tab-pane.active#distribution_all
.row .row
@ -91,27 +92,27 @@
= render 'donut_chart', title: 'Tracks', = render 'donut_chart', title: 'Tracks',
combined_data: @tracks_distribution combined_data: @tracks_distribution
-# .tab-pane#distribution_confirmed -# .tab-pane#distribution_confirmed
-# .row .row
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Event types', = render 'donut_chart', title: 'Event types',
-# combined_data: @event_type_distribution_confirmed combined_data: @event_type_distribution_confirmed
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Difficulty levels', = render 'donut_chart', title: 'Difficulty levels',
-# combined_data: @difficulty_levels_distribution_confirmed combined_data: @difficulty_levels_distribution_confirmed
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Tracks', = render 'donut_chart', title: 'Tracks',
-# combined_data: @tracks_distribution_confirmed combined_data: @tracks_distribution_confirmed
-# .tab-pane#distribution_withdrawn .tab-pane#distribution_withdrawn
-# .row .row
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Event types', = render 'donut_chart', title: 'Event types',
-# combined_data: @event_type_distribution_withdrawn combined_data: @event_type_distribution_withdrawn
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Difficulty levels', = render 'donut_chart', title: 'Difficulty levels',
-# combined_data: @difficulty_levels_distribution_withdrawn combined_data: @difficulty_levels_distribution_withdrawn
-# .col-md-4 .col-md-4
-# = render 'donut_chart', title: 'Tracks', = render 'donut_chart', title: 'Tracks',
-# combined_data: @tracks_distribution_withdrawn combined_data: @tracks_distribution_withdrawn
.row .row
.col-md-8 .col-md-8

6
app/views/schedules/happening_now.haml
View file

@ -9,10 +9,12 @@
.col-md-12 .col-md-12
%h2 %h2
#{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes. #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
%br
%small %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 .row
/ TODO: Clean this up, merge with all events page. / TODO: Clean this up, merge with all events page.
@ -26,7 +28,7 @@
= inyourtz(event_schedule.start_time, @conference.timezone) do = inyourtz(event_schedule.start_time, @conference.timezone) do
= date = event_schedule.start_time.strftime('%Y-%m-%d') = date = event_schedule.start_time.strftime('%Y-%m-%d')
%a.pull-right{ title: 'Go up', href: '#program' } %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) - if event_schedule.start_time.strftime('%H:%M').eql?(time)
.col-xs-12.col-md-11.col-md-offset-1 .col-xs-12.col-md-11.col-md-offset-1
= render 'event', event: event_schedule.event, event_schedule: event_schedule = render 'event', event: event_schedule.event, event_schedule: event_schedule