2016 design

This commit is contained in:
Godwin
2016-05-09 21:45:23 -07:00
parent 48ed91e24c
commit 5d25e09bc4
190 changed files with 4665 additions and 1289 deletions
+3 -7
View File
@@ -1,13 +1,9 @@
- content_for :banner do
- image = image_path(@banner_image || 'empty-racks.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
- if capable_of(:svg)
= render 'application/banner_image.svg', {:image => image}
%h1=_(@page_title || 'page_titles.404.Page_Not_Found')
- @page_title = 'page_titles.404.Page_Not_Found' unless @page_title.present?
= render :partial => 'application/header', :locals => {:image_file => nil}
= row do
= columns(medium: 12) do
%h1
=_'error.404.title','This page does not exist!'
%p
=_'error.404.description', :p
=p(_'error.404.description', :p)
+3 -1
View File
@@ -12,4 +12,6 @@
#header-title.short{style: style}
= (render banner_image, {:image => image}) if banner_image
= cover.html_safe if cover
%h1=_(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}")
= row do
= columns do
%h1=_(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}")
+21 -20
View File
@@ -1,23 +1,24 @@
- this_is_the_front_page
- if @conference
= render 'conferences/header'
%article
%h2=_!@conference.title
=@conference.info.html_safe
- if @conference.workshops
- if @schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
- else
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
%ul.workshop-list
- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
%li
%h4=w.title
.workshop-interest
- if w.interested?(current_user)
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
- elsif w.interested_count > 0
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=markdown w.info
= row do
= columns(tag: :article) do
%h2=_!@conference.title
= @conference.info.html_safe
- if @conference.workshops
- if @schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
- elsif @conference.registration_open
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
%ul.workshop-list
- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
%li
%h4=w.title
.workshop-interest
- if w.interested?(current_user)
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
- elsif w.interested_count > 0
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=markdown w.info
@@ -1,15 +1,7 @@
- content_for :banner do
- image = image_path(@banner_image || '403.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
- if capable_of(:svg)
= render 'application/banner_image.svg', {:image => image}
%h1=_(@page_title || 'page_titles.403.Permission_Denied')
= render :partial => 'application/header', :locals => {:image_file => @banner_image || '403.jpg'}
%article
- if @template
=render @template
- else
%h2
=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
%p
=_'articles.permission_denied.paragraphs.main', :p
%h2=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
%p=_'articles.permission_denied.paragraphs.main', :p
+7 -20
View File
@@ -1,21 +1,8 @@
- content_for :banner do
- style = nil
- cover = nil
- figure = nil
- if capable_of(:css_mixblendmode) || ENV['RAILS_ENV'] == 'test'
- cover = "<div class=\"cover\" style=\"background-image: url(#{@conference.cover_url || image_path('default_cover.jpg')})\"></div>"
- elsif capable_of(:svg)
- banner_image = 'conferences/banner_image.svg'
- else
- style = "background-image: url(#{@conference.cover_url || image_path('default_cover.jpg')})"
#header-title{style: style}
= render banner_image if banner_image
= cover.html_safe if cover
.title
%h2.background=_!"#{@conference.start_date.year.to_s}!"
.details
%h3.primary=location(@conference.organizations.first.locations.first)
.secondary
= date_span(@conference.start_date.to_date, @conference.end_date.to_date)
%figure
%img{src: @conference.poster.full.url || image_path('default_poster.jpg')}
.title
%h1=_!@conference.title
.details
%h3.primary=location(@conference.organizations.first.locations.first)
.secondary
= date_span(@conference.start_date.to_date, @conference.end_date.to_date)
%img{src: @conference.poster.full.url || image_path('default_poster.jpg')}
+4 -5
View File
@@ -20,19 +20,18 @@
%body{ class: page_style }
= render 'shared/navbar'
%main#main
- if content_for?(:side_bar)
%nav#side-bar
= yield :side_bar
- flash.each do |key, msg|
= content_tag :div, msg, :id => key
%header#banner
= yield :banner
%header#banner=yield :banner
- if @submenu
=row do
= columns(medium: 12) do
%nav.sub-menu
- @submenu.each do |href,key|
%a{href: href, class: request.fullpath.start_with?(href) ? 'current' : nil}=_"menu.submenu.#{key}"
- if content_for?(:side_bar)
%aside#side-bar
= yield :side_bar
- if has_content?
#content=yield
- else
+1 -1
View File
@@ -5,4 +5,4 @@
%input{type: 'hidden', name: 'item_name', value: 'Bike!Bike!'}
%input{type: 'hidden', name: 'no_note', value: '0'}
%input{type: 'hidden', name: 'currency_code', value: 'USD'}
%button{type: 'submit', value: 'PP-DonationsBF:paypal_logo.png:NonHostedGuest'}=_'donate.button_label','Donate!'
%button{type: 'submit', value: 'PP-DonationsBF:paypal_logo.png:NonHostedGuest'}=_'donate.button_label','Donate'
+12 -17
View File
@@ -1,26 +1,21 @@
.facebook
=_'links.footer.help_text.facebook', 'Join our facebook group' do |title|
%a{href: 'https://www.facebook.com/groups/648758205249998/', target: :_blank, title: title}
=svg_sprite 'icons', 'bb-icon-fb', 'facebook logo'
.github
=svg_sprite 'icons', 'bb-icon-github', 'github logo'
%a{href: 'https://github.com/bikebike/BikeBike/issues', target: :_blank}
=_'links.footer.text.File_an_Issue'
=_!'|'
%a{href: 'https://github.com/bikebike/BikeBike/contributing.md', target: :_blank}
%a{href: 'https://github.com/bikebike/BikeBike', target: :_blank}
=_'links.footer.text.Help_contribute'
.facebook
=_'links.footer.help_text.facebook', 'Join our facebook group' do |title|
%a{href: 'https://www.facebook.com/groups/648758205249998/', target: :_blank, title: title}
=svg_sprite 'icons', 'bb-icon-fb', 'facebook logo'
.locale
=_'links.footer.help_text.select_language', 'Select your language' do |title|
%input{type: :checkbox, id: 'select-language'}
%label.launch{title: title, for: 'select-language'}
=_!I18n.locale.upcase
.selector
%ul
-I18n.backend.enabled_locales.each do |locale|
%li
%a{href: home_url(url_params(locale))}
=_! locale.upcase
%span=I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}"))
%ul.locales
-I18n.backend.enabled_locales.each do |locale|
- if locale.to_s != I18n.locale.to_s # don't show the current locale
%li
- locale_translation = I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}"))
%a{href: url_for(params.merge(url_params(locale)))}
=_'translate.content.change_locale', "Read in #{locale_translation}", vars: {locale: locale_translation}
.copy
=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
=link_to :humans_txt, {title: title} do
+10 -17
View File
@@ -1,21 +1,14 @@
%nav
#main-nav
.inner-nav
= link_to '/', :class => 'logo' do
= svg_sprite('icons', "bb-icon-logo", "Logo")
= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
.nav
= nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!')
= nav_link about_path, (_'page_titles.About_BikeBike')
= nav_link policy_path, (_'page_titles.Safe_Space_Policy')
.actions
= row(class: 'inner-nav') do
= columns(medium: 4, class: 'inner-nav') do
= link_to '/', :class => 'logo' do
= svg_sprite('icons', "bb-icon-logo", "Logo")
= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
= columns(medium: 8, class: 'nav') do
= nav_link about_path, (_'page_titles.About'), 'about'
= nav_link policy_path, (_'page_titles.Policy'), 'policy'
- if @conference && @conference.registration_open
- if params[:action] != 'register' && !@registration
= link_to register_path(@conference.slug), class: [:button, :register] do
=_'conference.actions.Register'
- elsif @conference
= nav_link register_path(@conference.slug), (_'page_titles.Register')
- else
= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)
- if current_user
= form_tag :logout, class: :logout do
=hidden_field_tag :url, request.fullpath
=button_tag :Log_out