bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Minor fixes for show schedule page

Browse Source
This commit is contained in:
Godwin 2015-09-27 08:07:14 -07:00
parent bec2e73fa7
commit 851ac53f09
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/stylesheets/_application.scss
View File

@ -2060,6 +2060,32 @@ html[data-lingua-franca-example="html"] {
} }
} }
.conferences-schedule {
.actions {
margin: 2em;
}
ul.events, ul.locations {
list-style: none;
.button {
float: left;
font-size: 1em;
margin-bottom: 0.5em;
margin-right: 0.5em;
}
h3 {
display: inline-block;
margin: 0.25em 0 0;
}
li {
clear: both;
}
}
}
.programme { .programme {
.schedule { .schedule {

13
app/views/schedule/show.html.haml
View File

@ -3,26 +3,27 @@
- if @this_conference.host?(current_user) - if @this_conference.host?(current_user)
= row do = row do
= columns(medium: 12) do = columns(medium: 12) do
.actions.left - if @locations.present? && @events.present?
= link_to (_'actions.schedule.edit','Edit Schedule'), edit_schedule_path(@this_conference.slug), class: [:button] .actions.left
= link_to (_'actions.schedule.edit','Edit Schedule'), edit_schedule_path(@this_conference.slug), class: [:button]
= row do = row do
= columns(medium: 6) do = columns(medium: 6) do
%h2=_'articles.schedule.headings.Events' %h2=_'articles.schedule.headings.Events'
- if @events - if @events
%ul %ul.events
- @events.each do |event| - @events.each do |event|
%li %li
%h3=_!event.title %h3=_!event.title
= link_to (_'actions.events.edit','Edit'), edit_event_path(@this_conference.slug, event.id), class: [:button, :modify] = link_to (_'actions.events.edit','Edit'), edit_event_path(@this_conference.slug, event.id), class: [:button, :modify]
.actions.left .actions.left
= link_to (_'actions.events.create','Add Event'), add_event_path(@this_conference.slug), class: [:button, :modify] = link_to (_'actions.events.create','Add Event'), add_event_path(@this_conference.slug), class: [:button]
= columns(medium: 6) do = columns(medium: 6) do
%h2=_'articles.schedule.headings.Locations' %h2=_'articles.schedule.headings.Locations'
- if @locations - if @locations
%ul %ul.locations
- @locations.each do |location| - @locations.each do |location|
%li %li
%h3=_!location.title %h3=_!location.title
= link_to (_'actions.locations.edit','Edit'), edit_location_path(@this_conference.slug, location.id), class: [:button, :modify] = link_to (_'actions.locations.edit','Edit'), edit_location_path(@this_conference.slug, location.id), class: [:button, :modify]
.actions.left .actions.left
= link_to (_'actions.schedule.edit','Add Location'), add_location_path(@this_conference.slug), class: [:button, :modify] = link_to (_'actions.schedule.edit','Add Location'), add_location_path(@this_conference.slug), class: [:button]