Commit 0dcc65ea authored by Jon Richter's avatar Jon Richter
Browse files

Merge branch 'impl-239' into 'deployment' 

Implement working schedule and cosmetic changes, fixes #239

Closes #239 and #237

See merge request !20
parents 4ee43fb6 d7242278

app/controllers/events_controller.rb

+14 −0
Original line number Diff line number Diff line
@@ -342,6 +342,20 @@ class EventsController < ApplicationController 
        @prefiltered_events = @conference.events.special_sessions

      when 'individual_papers'

        @prefiltered_events = @conference.events.individual_papers

      when 'poster_presentations'

        @prefiltered_events = @conference.events.poster_presentations

      when 'participatory_sessions'

        @prefiltered_events = @conference.events.participatory_sessions

      when 'activist_sessions'

        @prefiltered_events = @conference.events.activist_sessions

      when 'artistic_sessions'

        @prefiltered_events = @conference.events.artistic_sessions

      when 'keynotes'

        @prefiltered_events = @conference.events.keynotes

      when 'plenary_sessions'

        @prefiltered_events = @conference.events.plenary_sessions

      when 'highlights'

        @prefiltered_events = @conference.events.highlights

      else

        @prefiltered_events = @conference.events

    end

app/views/cfp/sessions/new.html.haml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
      %p=t("cfp.login_existing_description")

      %p

        .alert-message.warning

          If you encounter any problems, please feel free to contact support@ecobytes.net for technical support.

          If you encounter any problems, please feel free to contact info@malmo.degrowth.org for technical support.

      = simple_form_for @user, url: cfp_session_path do |f|

        %fieldset.inputs

          = f.input :email

app/views/events/_bulk_state_change_table.html.haml

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
        %th

        %th= sort_link @search, :title, 'Title', :term => params[:term]

        %th= sort_link @search, :track_name, 'Theme', :term => params[:term]

        %th= sort_link @search, :subcategory_name, 'Subcategory', :term => params[:term]

        %th= sort_link @search, :event_type, :term => params[:term]

        - unless @current_user_is_reviewer

          %th= sort_link @search, :average_rating, :term => params[:term]

app/views/events/_bulk_state_change_table_cells.html.haml

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
    %p.small

      = by_speakers(event)

%td= event.track.try(:name)

%td= event.subcategory.try(:name)

%td= event.event_type

- unless @current_user_is_reviewer

  %td

app/views/events/_review_table.html.haml

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
      %th

      %th= sort_link @search, :title, 'Title', :term => params[:term]

      %th= sort_link @search, :track_name, 'Theme', :term => params[:term]

      %th= sort_link @search, :subcategory_name, 'Subcategory', :term => params[:term]

      %th= sort_link @search, :event_type, :term => params[:term]

      - unless @current_user_is_reviewer

        %th= sort_link @search, :average_rating, :term => params[:term]