Almost ready to merge

This commit is contained in:
Godwin
2015-08-18 22:18:29 -07:00
parent 9da5f6a223
commit c3aec0b71e
500 changed files with 38042 additions and 5761 deletions
+3 -3
View File
@@ -2,7 +2,7 @@
=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}
=_'links.footer.text.Help_contribute'
.facebook
@@ -13,7 +13,7 @@
=_'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
=_!I18n.locale.upcase
.selector
%ul
-I18n.backend.available_locales.each do |locale|
@@ -24,4 +24,4 @@
.copy
=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
=link_to :humans_txt, {title: title} do
=(_!"©#{Date.today.strftime("%Y")} Bike!Bike!").html_safe
=((_!"©#{Date.today.strftime("%Y")} Bike!Bike!") || '').html_safe
+10 -10
View File
@@ -3,17 +3,17 @@
= svg_sprite('icons', "bb-icon-logo", "Logo")
= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
.nav
= nav_link '/', (@conference ? @conference.title : 'Bike!Bike!')
= nav_link '/about', (_'page_titles.About_BikeBike')
= nav_link '/policy', (_'page_titles.Safe_Space_Policy')
= 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
- if current_user
= form_tag :logout, class: :logout do
=hidden_field_tag :url, request.fullpath
=button_tag :Log_out
- elsif @conference.registration_open
- if params[:action] != 'register'
- if @conference.registration_open
- if params[:action] != 'register' && !@registration
= link_to register_path(@conference.slug), class: [:button, :register] do
=_'conference.actions.Register'
- else
= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)
= 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