A lot of updates so far today...

This commit is contained in:
Godwin
2014-07-06 19:02:23 -06:00
parent 546f1d4cbd
commit 1907122880
36 changed files with 4157 additions and 236 deletions
+20 -18
View File
@@ -3,23 +3,25 @@
- content_for :banner do
.row
.columns.small-12
.columns.small-12.banner
%figure
%img{src: @conference.poster_url}
.row.align-bottom
.columns.medium-6
%h1='Bike!Bike! '+@conference.start_date.year.to_s
%h2
- location = @conference.organizations.first.locations.first
= location.city + ', ' + (location.territory || location.country)
%em
= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
%p
= @conference.info
.columns.medium-6.centered
- if @conference.registration_open
%a.button{href: @conference.url(:register)}
=_'conference.Register_Now'
- if params['controller'] != 'conferences'
%a.button.more{href: @conference.url}
=_'conference.More_Info'
.columns.medium-6.align-bottom
%div
%h1='Bike!Bike! '+@conference.start_date.year.to_s
%h2
- location = @conference.organizations.first.locations.first
= location.city + ', ' + (location.territory || location.country)
%em
= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
- if params['controller'] != 'conferences'
%p= ActionView::Base.full_sanitizer.sanitize(@conference.info).gsub(/^(.{300,350}\.)(.*)$/m, '\1...')
.columns.medium-6.centered.align-bottom
%div
- if @conference.registration_open
%a.button{href: @conference.url(:register)}
=_'conference.Register_Now'
- if params['controller'] != 'conferences'
%a.button.more{href: @conference.url}
=_'conference.More_Info'
= banner_attribution
+5
View File
@@ -0,0 +1,5 @@
= link_to ('/conferences/' + conference.conference_type.slug + '/' + conference.slug) do
%h5
= conference.title
%figure.conference-preview.preview-tile{:style => (conference.cover? ? ('background-image: url(' + conference.cover.preview.url + ')') : nil)}
= image_tag conference.poster.preview.url
+10 -42
View File
@@ -1,43 +1,11 @@
%h1 Listing conferences
- page_style :list
- title _'page.Conferences'
- banner_image '/assets/conference.jpg'
- content_for :banner do
.row
.columns
%h1=_'page.Conferences'
%table
%tr
%th Title
%th Slug
%th Start date
%th End date
%th Info
%th Poster
%th Cover
%th Workshop schedule published
%th Registration open
%th Meals provided
%th Meal info
%th Travel info
%th Conference type
%th
%th
%th
- @conferences.each do |conference|
%tr
%td= conference.title
%td= conference.slug
%td= conference.start_date
%td= conference.end_date
%td= conference.info
%td= conference.poster
%td= conference.cover
%td= conference.workshop_schedule_published
%td= conference.registration_open
%td= conference.meals_provided
%td= conference.meal_info
%td= conference.travel_info
%td= conference.conference_type
%td= link_to 'Show', conference
%td= link_to 'Edit', edit_conference_path(conference)
%td= link_to 'Destroy', conference, :method => :delete, :data => { :confirm => 'Are you sure?' }
%br
= link_to 'New Conference', new_conference_path
%ul.small-block-grid-1.medium-block-grid-2.large-block-grid-3.conference-list.preview-list
- @conferences.each do |conference|
%li=render 'preview', :conference => conference
+2 -53
View File
@@ -3,56 +3,5 @@
= tabs!
%section
.row
.columns.medium-6
%h1=@conference.title
%p=@conference.info.gsub(/\s*\n+\s*/, '</p><p>').html_safe
.columns.medium-6
.row
%p#notice= notice
%p
%b Conference type:
= @conference.conference_type.title
%p
%b Title:
= @conference.title
%p
%b Slug:
= @conference.slug
%p
%b Start date:
= @conference.start_date
%p
%b End date:
= @conference.end_date
%p
%b Info:
= @conference.info
%p
%b Poster:
= @conference.poster
%p
%b Banner:
= @conference.cover
%p
%b Workshop schedule published:
= @conference.workshop_schedule_published
%p
%b Registration open:
= @conference.registration_open
%p
%b Meals provided:
= @conference.meals_provided
%p
%b Meal info:
= @conference.meal_info
%p
%b Travel info:
= @conference.travel_info
= link_to 'Edit', @conference.path(:edit) #edit_conference_path(@conference.conference_type.slug, @conference)
\|
= link_to 'Back', 'conferences'
%h2=('About '+@conference.title)
%p=@conference.info