diff --git a/Gemfile.next b/Gemfile.next deleted file mode 120000 index 6ab79009..00000000 --- a/Gemfile.next +++ /dev/null @@ -1 +0,0 @@ -Gemfile \ No newline at end of file diff --git a/Gemfile.next b/Gemfile.next new file mode 100644 index 00000000..6ab79009 --- /dev/null +++ b/Gemfile.next @@ -0,0 +1 @@ +Gemfile \ No newline at end of file diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index 5ed1f0bf..feeecb29 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -1,4 +1,4 @@ -$navbar-default-bg: #005cb3; +$navbar-default-bg: #299a0b; $navbar-default-link-active-bg: #DFE0DF; $navbar-default-border: 1px solid #d4d4d4; $navbar-default-color: #ffffff; diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index f685ed89..2ebeba84 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -45,7 +45,7 @@ module ConferenceHelper location += "#{v.country_name}, " if v.country_name e.location = location end - e.categories = conference.title, "Difficulty: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}" + e.categories = conference.title, "Audience: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}" end end calendar diff --git a/app/views/admin/difficulty_levels/edit.html.haml b/app/views/admin/difficulty_levels/edit.html.haml index baec7d47..5986918b 100644 --- a/app/views/admin/difficulty_levels/edit.html.haml +++ b/app/views/admin/difficulty_levels/edit.html.haml @@ -2,7 +2,7 @@ .col-md-12 .page-header %h1 - Edit Difficulty Level + Edit Audience = @difficulty_level.title .row .col-md-8 diff --git a/app/views/admin/difficulty_levels/index.html.haml b/app/views/admin/difficulty_levels/index.html.haml index 282fdfae..0ab6f53d 100644 --- a/app/views/admin/difficulty_levels/index.html.haml +++ b/app/views/admin/difficulty_levels/index.html.haml @@ -1,7 +1,7 @@ .row .col-md-12 .page-header - %h1 Difficulty Levels + %h1 Audiences %p.text-muted Classify your conference.program.events by difficulty .row @@ -32,4 +32,4 @@ data: { confirm: "Do you really want to delete #{difficulty_level.title}? Attention: This difficulty level will be removed from all Events that have it set" } .row .col-md-12.text-right - = link_to 'Add Difficulty Level', new_admin_conference_program_difficulty_level_path(@conference.short_title), class: 'btn btn-primary' + = link_to 'Add Audience', new_admin_conference_program_difficulty_level_path(@conference.short_title), class: 'btn btn-primary' diff --git a/app/views/admin/difficulty_levels/new.html.haml b/app/views/admin/difficulty_levels/new.html.haml index 6d8fc4de..55bacb47 100644 --- a/app/views/admin/difficulty_levels/new.html.haml +++ b/app/views/admin/difficulty_levels/new.html.haml @@ -2,7 +2,7 @@ .col-md-12 .page-header %h1 - Create Difficulty Level + Create Audience .row .col-md-8 = render partial: 'form' diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index bb6db751..f3efb5b8 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -82,7 +82,7 @@ %th %b Track %th - %b Difficulty + %b Audience %th %b State %th diff --git a/app/views/admin/events/show.html.haml b/app/views/admin/events/show.html.haml index d19d056a..2166fc38 100644 --- a/app/views/admin/events/show.html.haml +++ b/app/views/admin/events/show.html.haml @@ -92,7 +92,7 @@ %td{ 'class' => class_for_todo(progress_status['track']) } %span{ 'class' => [icon_for_todo(progress_status['track']), 'fa-lg'] } %tr - %td= link_to 'Add a difficulty level', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event) + %td= link_to 'Add an Audience level', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event) %td{ 'class' => class_for_todo(progress_status['difficulty_level']) } %span{ 'class' => [icon_for_todo(progress_status['difficulty_level']), 'fa-lg'] } #proposal-commercials.tab-pane diff --git a/app/views/admin/programs/show.html.haml b/app/views/admin/programs/show.html.haml index db1e91ff..af8d6c1d 100644 --- a/app/views/admin/programs/show.html.haml +++ b/app/views/admin/programs/show.html.haml @@ -28,7 +28,7 @@ %dd = tracks(@conference) %dt - Difficulty Levels: + Audiences: %dd = difficulty_levels(@conference) %dt diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index f4c20006..b7fa4791 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -80,7 +80,7 @@ = link_to 'Event Types', admin_conference_program_event_types_path(@conference.short_title) - if can? :update, @conference.program.difficulty_levels.build, conference_id: @conference.id %li{class: active_nav_li(admin_conference_program_difficulty_levels_path(@conference.short_title))} - = link_to 'Difficulty Levels', admin_conference_program_difficulty_levels_path(@conference.short_title) + = link_to 'Audience', admin_conference_program_difficulty_levels_path(@conference.short_title) - if can? :update, @conference.program.schedules.build %li{class: active_nav_li(admin_conference_schedules_path(@conference.short_title))} = link_to 'Schedules', admin_conference_schedules_path(@conference.short_title) diff --git a/app/views/proposals/_form.html.haml b/app/views/proposals/_form.html.haml index 71feac07..8082dee8 100644 --- a/app/views/proposals/_form.html.haml +++ b/app/views/proposals/_form.html.haml @@ -37,7 +37,7 @@ = f.select :language, @program.languages_list, { include_blank: false}, { class: 'select-help-toggle form-control' } - if display_details - if @conference.program.difficulty_levels.any? - = f.label :difficulty_level + = f.label :difficulty_level, 'Audience' = f.select :difficulty_level_id, @conference.program.difficulty_levels.map{|level| [level.title, level.id ] }, {include_blank: false}, { class: 'select-help-toggle form-control' } = render 'shared/select_help_text', f: f, for: :difficulty_level_id, options: @conference.program.difficulty_levels do |difficulty_level| = difficulty_level.description diff --git a/app/views/proposals/_tooltip.html.haml b/app/views/proposals/_tooltip.html.haml index 13f3155c..d5139ea1 100644 --- a/app/views/proposals/_tooltip.html.haml +++ b/app/views/proposals/_tooltip.html.haml @@ -27,4 +27,4 @@ = link_to 'Add a track', edit_conference_program_proposal_path(event.program.conference.short_title, event) %li{'class'=>class_for_todo(progress_status['difficulty_level'])} %span{'class'=>icon_for_todo(progress_status['difficulty_level'])} - = link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event) + = link_to 'Add an Audience', edit_conference_program_proposal_path(event.program.conference.short_title, event) diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml index fa2e2f10..2944adb1 100644 --- a/app/views/proposals/show.html.haml +++ b/app/views/proposals/show.html.haml @@ -73,7 +73,7 @@ %dl#proposal-info .col-md-12 %dt Date: - %dd= @event_schedule.start_time.strftime("%Y %B %e - %H:%M") if @event_schedule + %dd= @event_schedule.start_time.strftime("%Y %B %e - %-I:%M %p") if @event_schedule .col-md-12 %dt Duration: %dd= show_time(@event.event_type.length) @@ -95,7 +95,7 @@ %span.label{style: "background-color: #{@event.track.color}; color: #{ contrast_color(@event.track.color) }"} = @event.track.name .col-md-12 - %dt Difficulty: + %dt Audience: %dd - if @event.difficulty_level %span.label{style: "background-color: #{@event.difficulty_level.color}; color: #{ contrast_color(@event.difficulty_level.color) };"} @@ -118,7 +118,7 @@ %dl %dt Start Time: %dd - = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %H:%M") + = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %-I:%M %p") %br %dt Room: %dd diff --git a/app/views/schedules/_carousel.html.haml b/app/views/schedules/_carousel.html.haml index 785a0681..0df40a41 100644 --- a/app/views/schedules/_carousel.html.haml +++ b/app/views/schedules/_carousel.html.haml @@ -17,9 +17,7 @@ - interval_count.times do %th.date %span - = (td_start_time).strftime("%H:") - %span - = (td_start_time).strftime("%M") + = (td_start_time).strftime("%-I:%M %p") - td_start_time += @step_minutes - start_room_time = start_time - @rooms.each do |room| diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 25f4e1a0..41f9548a 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -24,9 +24,9 @@ %span.track %span.fa-solid.fa-clock %span.label{ style: "background-color: grey" } - = event_schedule.start_time.strftime('%H:%M') + = event_schedule.start_time.strftime('%-I:%M %p') \- - = event_schedule.end_time.strftime('%H:%M') + = event_schedule.end_time.strftime('%-I:%M %p') %span.track %span.fa-solid.fa-location-dot %span.label{ style: "background-color: grey" } diff --git a/app/views/schedules/events.html.haml b/app/views/schedules/events.html.haml index b6e87e31..7b16a99f 100644 --- a/app/views/schedules/events.html.haml +++ b/app/views/schedules/events.html.haml @@ -21,7 +21,6 @@ / 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 @@ -30,15 +29,11 @@ = date = event_schedule.start_time.strftime('%Y-%m-%d') %a{ title: "Go up", class: "pull-right", href: "#program" } %i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true } - - unless event_schedule.start_time.strftime('%H:%M').eql?(time) - .col-xs-12.col-md-1 - .start-time - = time = event_schedule.start_time.strftime('%H:%M') - .col-xs-12.col-md-11 - .new-time-event - = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule } - - else - .col-xs-12.col-md-11.col-md-offset-1 + .col-xs-12.col-md-1 + .start-time + = event_schedule.start_time.strftime('%-I:%M %p') + .col-xs-12.col-md-11 + .new-time-event = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule } / confirmed events that are not scheduled diff --git a/bin/bundle b/bin/bundle old mode 100755 new mode 100644 diff --git a/bin/bundle_report b/bin/bundle_report old mode 100755 new mode 100644 diff --git a/bin/delayed_job b/bin/delayed_job old mode 100755 new mode 100644 diff --git a/bin/deprecations b/bin/deprecations old mode 100755 new mode 100644 diff --git a/bin/gem-next-diff b/bin/gem-next-diff old mode 100755 new mode 100644 diff --git a/bin/next b/bin/next old mode 100755 new mode 100644 diff --git a/bin/rails b/bin/rails old mode 100755 new mode 100644 diff --git a/bin/rake b/bin/rake old mode 100755 new mode 100644 diff --git a/bin/rspec b/bin/rspec old mode 100755 new mode 100644 diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index 575b44ae..41eeb416 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -1 +1 @@ -Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %l:%M %p' +Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %H:%M' diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb old mode 100755 new mode 100644