Commit 0dcc65ea authored by jon richter's avatar jon richter

Merge branch 'impl-239' into 'deployment'

Implement working schedule and cosmetic changes, fixes #239

Closes #239 and #237

See merge request degrowth/scriptorium!20
parents 4ee43fb6 d7242278
......@@ -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
......
......@@ -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
......
......@@ -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]
......
......@@ -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
......
......@@ -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]
......
......@@ -5,7 +5,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
......
......@@ -42,7 +42,6 @@
-else
= link_to event.ticket.remote_ticket_id, get_ticket_view_url( event.ticket.remote_ticket_id ), :target => "_blank"
%td= event.track.try(:name)
%td= event.subcategory.try(:name)
%td= event.event_type
- if can? :crud, Event
%td= event.state
......
......@@ -39,9 +39,6 @@
%p
%b Theme:
= @event.track_name
%p
%b Subcategory:
= @event.subcategory.try(:name)
%p
%b Session type:
= @event.event_type
......
......@@ -84,41 +84,49 @@
= link_to 'Special Sessions', set_events_scope_path('special_sessions')
- else
= link_to 'Special Sessions', set_events_scope_path('special_sessions')
= surround '', ' | ' do
- if session[:events_filter] == 'activist_sessions'
%strong
= link_to 'Activist Sessions', set_events_scope_path('activist_sessions')
- else
= link_to 'Activist Sessions', set_events_scope_path('activist_sessions')
= surround '', ' | ' do
- if session[:events_filter] == 'artistic_sessions'
%strong
= link_to 'Artistic Sessions', set_events_scope_path('artistic_sessions')
- else
= link_to 'Artistic Sessions', set_events_scope_path('artistic_sessions')
= surround '', ' | ' do
- if session[:events_filter] == 'participatory_sessions'
%strong
= link_to 'Participatory Sessions', set_events_scope_path('participatory_sessions')
- else
= link_to 'Participatory Sessions', set_events_scope_path('participatory_sessions')
= surround '', ' | ' do
- if session[:events_filter] == 'plenary_sessions'
%strong
= link_to 'Plenary Sessions', set_events_scope_path('plenary_sessions')
- else
= link_to 'Plenary Sessions', set_events_scope_path('plenary_sessions')
= surround '', ' | ' do
- if session[:events_filter] == 'keynotes'
%strong
= link_to 'Keynotes', set_events_scope_path('keynotes')
- else
= link_to 'Keynotes', set_events_scope_path('keynotes')
= surround '', ' | ' do
- if session[:events_filter] == 'highlights'
%strong
= link_to 'Highlights of Degrowth Research', set_events_scope_path('highlights')
- else
= link_to 'Highlights of Degrowth Research', set_events_scope_path('highlights')
= surround '', ' | ' do
- if session[:events_filter] == 'individual_papers'
%strong
= link_to 'Individual Papers', set_events_scope_path('individual_papers')
- else
= link_to 'Individual Papers', set_events_scope_path('individual_papers')
= surround '', ' | ' do
- if session[:events_filter] == 'poster_presentations'
%strong
= link_to 'Poster Presentations', set_events_scope_path('poster_presentations')
......
- @unscheduled_events.each do |event|
%li.unscheduled-event{ :id => "event_#{event.id}",
:"data-update-url" => schedule_update_event_path(:id => event.id),
:"data-height" => (event.time_slots * 20 - 7) }
:"data-update-url" => schedule_update_event_path(:id => event.id) }
= link_to event.title, "#"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment