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

Hide stuff again on admin conf show

Browse source
This commit is contained in:
Michael Ball 2021-03-11 12:16:48 -08:00
parent e48dfb8880
commit 558e5efe35
2 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,9 +28,9 @@
.col-md-12 .col-md-12
= 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,14 @@
%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 -# %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-content
.tab-pane.active#distribution_all .tab-pane.active#distribution_all
.row .row
@ -63,28 +63,28 @@
.col-md-4 .col-md-4
= 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

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

@ -9,10 +9,10 @@
.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.
%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 .row
/ TODO: Clean this up, merge with all events page. / TODO: Clean this up, merge with all events page.
@ -27,7 +27,6 @@
= date = event_schedule.start_time.strftime('%Y-%m-%d') = 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.fa.fa-angle-double-up.fa-lg{ 'aria-hidden': true } %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) - if !event_schedule.start_time.strftime('%H:%M').eql?(time)
.col-xs-12.col-md-1 .col-xs-12.col-md-1
.start-time .start-time
@ -40,7 +39,6 @@
-# TODO: Add comment describing this condition. -# TODO: Add comment describing this condition.
.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
-# rubocop:enable Style/UnlessElse
:javascript :javascript
// Refresh the page every 5 minutes. // Refresh the page every 5 minutes.