A lot of updates so far today...
This commit is contained in:
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -32,16 +32,18 @@
|
||||
%body{ class: (yield_or_default :page_style) }
|
||||
:javascript
|
||||
var b=document.getElementsByTagName('HTML')[0];b.className+=' '+(window.getComputedStyle(document.body).backgroundBlendMode?'':'no-')+'blend-modes';</script>
|
||||
= render 'shared/translation_control'
|
||||
= render 'shared/navbar'
|
||||
-#= render 'shared/translation_control'
|
||||
|
||||
%main
|
||||
= render 'shared/navbar'
|
||||
- flash.each do |key, msg|
|
||||
= content_tag :div, msg, :id => key
|
||||
- if has_banner?
|
||||
%header#banner{banner_attrs(yield_or_default :banner_image)}
|
||||
= yield :banner
|
||||
= banner_attribution
|
||||
= yield
|
||||
- if has_content?
|
||||
#content=yield
|
||||
- else
|
||||
= yield
|
||||
#footer
|
||||
.container= render 'shared/footer'
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
= link_to organization do
|
||||
%h5
|
||||
= organization.name
|
||||
%figure.org-preview.preview-tile{:style => (organization.cover? ? ('background-image: url(' + organization.cover.preview.url + ')') : nil)}
|
||||
= image_tag organization.avatar.preview.url
|
||||
@@ -1,41 +1,21 @@
|
||||
%h1 Listing organizations
|
||||
- page_style :list
|
||||
- title _'page.Organizations'
|
||||
- banner_image '/assets/orgs.jpg'
|
||||
- content_for :banner do
|
||||
.row
|
||||
.columns
|
||||
%h1=_'page.Organizations'
|
||||
|
||||
%table
|
||||
%tr
|
||||
%th Name
|
||||
%th Slug
|
||||
%th Email address
|
||||
%th Url
|
||||
%th Year founded
|
||||
%th Info
|
||||
%th Logo
|
||||
%th Avatar
|
||||
%th Requires approval
|
||||
%th Secret question
|
||||
%th Secret answer
|
||||
%th User organization replationship
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
|
||||
- @organizations.each do |organization|
|
||||
%tr
|
||||
%td= organization.name
|
||||
%td= organization.slug
|
||||
%td= organization.email_address
|
||||
%td= organization.url
|
||||
%td= organization.year_founded
|
||||
%td= organization.info
|
||||
%td= organization.logo
|
||||
%td= organization.avatar
|
||||
%td= organization.requires_approval
|
||||
%td= organization.secret_question
|
||||
%td= organization.secret_answer
|
||||
%td= organization.user_organization_replationship_id
|
||||
%td= link_to 'Show', organization
|
||||
%td= link_to 'Edit', edit_organization_path(organization)
|
||||
%td= link_to 'Destroy', organization, :method => :delete, :data => { :confirm => 'Are you sure?' }
|
||||
|
||||
%br
|
||||
|
||||
= link_to 'New Organization', new_organization_path
|
||||
- @organizations.sort_by{|k,v|k}.each do |country,territories|
|
||||
%h2=country
|
||||
- territories.sort_by{|k,v|k}.each do |territory,cities|
|
||||
- if territory != 0
|
||||
%h3=territory
|
||||
- cities.sort_by{|k,v|k}.each do |city,organizations|
|
||||
%ul.small-block-grid-1.medium-block-grid-2.large-block-grid-3.org-list.preview-list
|
||||
- uri = CGI::escape(city+' '+country)
|
||||
%li.city
|
||||
%figure{:style => "background-image: url('http://maps.googleapis.com/maps/api/staticmap?center=#{uri}&zoom=4&size=600x300&maptype=roadmap&markers=size:small%7C#{uri}&key=AIzaSyDhfT68lGTwJHoUfC02fmA1SYNexO19J3M');"}
|
||||
%h4=city
|
||||
- organizations.each do |organization|
|
||||
%li=render 'preview', :organization => organization
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
- page_style 'organization'
|
||||
- banner_image @organization.cover_url
|
||||
- content_for :banner do
|
||||
.row
|
||||
.columns.medium-6.info
|
||||
.row{:class => (@organization.avatar.is_landscape? ? 'landscape' : 'portrait')}
|
||||
.columns{:class => (@organization.avatar.is_landscape? ? nil : ['medium-6', 'medium-push-6'])}
|
||||
%figure
|
||||
= image_tag(@organization.avatar.url)
|
||||
.columns.info{:class => (@organization.avatar.is_landscape? ? nil : ['medium-6', 'medium-pull-6'])}
|
||||
%h1=@organization.name
|
||||
%h2=@organization.locations[0].city + (@organization.locations[0].territory ? ' ' + @organization.locations[0].territory : '') + ', ' + Carmen::Country.coded(@organization.locations[0].country).name
|
||||
.columns.medium-6
|
||||
%figure
|
||||
= image_tag(@organization.avatar_url)
|
||||
|
||||
%p#notice= notice
|
||||
|
||||
@@ -15,4 +15,5 @@
|
||||
|
||||
.row
|
||||
.columns
|
||||
%h2=('About '+@organization.name)
|
||||
=p @organization, :info
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
- title 'Bike!Bike!'
|
||||
- has_no_content
|
||||
- this_is_the_front_page
|
||||
- if @conference
|
||||
-#= render 'conferences/header'
|
||||
= render 'conferences/header'
|
||||
|
||||
-#%section
|
||||
-# .row
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
- page_style :form
|
||||
|
||||
.row
|
||||
%h1
|
||||
= _ 'language_translations', vars: {:language => (_ ('languages.' + @lang))}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
%nav#main-nav
|
||||
= link_to '/resources', :class => ['button', 'logo'] do
|
||||
= link_to '/', :class => ['button', 'logo'] do
|
||||
= image_tag('logo.png', class: 'logo')
|
||||
= image_tag('logo-text.png', class: 'logo-text')
|
||||
= link_to (_'Conferences'), {:controller => :conferences}, {:class => ['button', 'conference']}
|
||||
= link_to (_'Conferences'), :conferences, {:class => ['button', 'conference']}
|
||||
= link_to (_'Organizations'), {:controller => :organizations}, {:class => ['button', 'organization']}
|
||||
= link_to (_'Zine'), 'http://zinezine.bikebike.org', :class => ['button', 'article']
|
||||
%p
|
||||
Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.
|
||||
- if is_this_the_front_page?
|
||||
%p
|
||||
Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.
|
||||
-#%iframe{:src => "//player.vimeo.com/video/76149097", :width => "500", :height => "281", :frameborder => "0", :webkitallowfullscreen => true, :mozallowfullscreen => true, :allowfullscreen => true}
|
||||
-#- if current_user
|
||||
-# %li.has-form.sign-out.hide-for-small
|
||||
-# = link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
|
||||
|
||||
Reference in New Issue
Block a user