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

Almost ready to merge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/views/application/404.html.haml
+6 -7
View File
@@ -1,5 +1,3 @@
- page_title = _'error.404.page_title.This_Page_Does_Not_Exist'
- title page_title
- content_for :banner do
- image = image_url(@banner_image || 'empty-racks.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
@@ -7,8 +5,9 @@
= render 'application/banner_image.svg', {:image => image}
%h1=_(@page_title || 'page_titles.404.Page_Not_Found')
.row
%h1
=_'error.404.title','This page does not exist!'
%p
=_'error.404.description', :p
= row do
= columns(medium: 12) do
%h1
=_'error.404.title','This page does not exist!'
%p
=_'error.404.description', :p
app/views/application/_login_confirmation_sent.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= columns(medium: 12) do
%h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent'
= columns(medium: 6) do
%p=_'articles.permission_denied.paragraphs.confirmation_sent', :p
=paragraph _('articles.permission_denied.paragraphs.confirmation_sent', :p)
app/views/application/about.html.haml
+24 -12
View File
@@ -1,14 +1,26 @@
- content_for :banner do
- image = image_url('xconference.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_titles.About_BikeBike'
= render :partial => 'application/header', :locals => {:page_group => 'about', :page_key => 'About_BikeBike', :image_file => 'xconference.jpg'}
%article
%h2=_'articles.about_bikebike.headings.About_BikeBike', :t
%p=_'articles.about_bikebike.paragraphs.paragraph_1', :p
= row do
= columns(medium: 12) do
%h2=_'articles.about_bikebike.headings.What_is_BikeBike', :t
%p=_'articles.about_bikebike.paragraphs.What_is_BikeBike', :p
%h2=_'articles.about_bikebike.headings.About_BikeBike_2', :t
%figure{style: "background-image: url(#{image_url('columbus_people.jpg')})"}
%p=_'articles.about_bikebike.paragraphs.paragraph_2', :p
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.bicycle_project', :t
%p=_'articles.about_bikebike.paragraphs.bicycle_project_paragraph', :p
%ul
- [:non_profit, :no_money, :education, :volunteer_run, :export_bikes, :low_cost, :recycle_parts].each do |term|
%li=_"articles.about_bikebike.term.#{term.to_s}", :s, 2
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.Who_is_Invited', :t
%p=_'articles.about_bikebike.paragraphs.Who_is_Invited', :p
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.Types_of_Workshops', :t
%figure{style: "background-image: url(#{image_url('columbus_people.jpg')})"}
%p=_'articles.about_bikebike.paragraphs.Types_of_Workshops', :p
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.Amenities', :t
%p=_'articles.about_bikebike.paragraphs.Amenities', :p
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.Volunteer', :t
%p=_'articles.about_bikebike.paragraphs.Volunteer', :p
app/views/application/home.html.haml
+3 -5
View File
@@ -1,5 +1,3 @@
-# EmailConfirmation.create(user: User.find_by_email('goodgodwin@hotmail.com'), url: '/')
- this_is_the_front_page
- if @conference
= render 'conferences/header'
@@ -7,6 +5,6 @@
%h2=_!@conference.title
=@conference.info.html_safe
%article.supplementary
%h2=_'section_titles.bikebike.About_BikeBike'
%p=_'section_content.bikebike.about_bikebike', :p
- # %article.supplementary
- # %h2=_'section_titles.bikebike.About_BikeBike'
- # %p=_'section_content.bikebike.about_bikebike', :p
app/views/application/policy.html.haml
+4 -11
View File
@@ -1,12 +1,5 @@
- content_for :banner do
- image = image_url('columbus_group.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_titles.Safer_Spaces_Policy'
= render :partial => 'application/header', :locals => {:page_group => :policy, :page_key => 'Safer_Spaces_Policy', :image_file => 'columbus_group.jpg'}
%article
%h2=_'page_titles.Safer_Spaces_Policy'
%p=_'static_text.policy.paragraph_1', :p
-# UserMailer.activation_needed_email('goodgodwin@hotmail.com').deliver
= row do
= columns(medium: 12) do
= render 'application/policy'
app/views/conferences/_header.html.haml
+12 -59
View File
@@ -1,12 +1,16 @@
-#- small_banner = (params['controller'] == 'conferences' && params['action'] != 'show')
-#- if small_banner
-# - body_class('small-banner')
-#- page_style (params['controller'] == 'conferences' ? 'article' : 'emphasize-banner')
- content_for :banner do
#header-title{style: capable_of(:svg) ? nil : "background-image: url(#{@conference.cover_url})"}
- if capable_of(:svg)
= render 'conferences/banner_image.svg'
- 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})\"></div>"
- elsif capable_of(:svg)
- banner_image = 'conferences/banner_image.svg'
- else
- style = "background-image: url(#{@conference.cover_url})"
#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
@@ -15,54 +19,3 @@
= date_span(@conference.start_date.to_date, @conference.end_date.to_date)
%figure
%img{src: @conference.poster.full.url}
-# =columns({medium: 7}) do
-# - title = @conference.conference_type.slug == 'bikebike' ? 'Bike!Bike! '+@conference.start_date.year.to_s : @conference.title
-# %div
-# %h1
-# - if params['controller'] == 'conferences' && params['action'] == 'show'
-# = title
-# - else
-# %a{href: @conference.url}=title
-# %em
-# - if params['controller'] != 'conferences'
-# - info = nil
-# - if @conference.registration_open
-# - if @conference.registration_info
-# - info = @conference.registration_info
-# - elsif @conference.end_date < Time.now
-# - if @conference.preregistration_info
-# - info = @conference.postregistration_info
-# - elsif @conference.preregistration_info
-# - info = @conference.preregistration_info
-# - if info
-# = info.html_safe
-# - else
-# %p= ActionView::Base.full_sanitizer.sanitize(@conference.info).gsub(/^(.{300,350}\.)(.*)$/m, '\1...')
=#columns({medium: 5}) do
-# %div
-# - if params['controller'] != 'conferences'
-# %a.button.more{href: @conference.url}
-# =_'conference.More_Info'
-# - if @conference.registration_open && !small_banner
-# %a.button#register-now.register-now{href: @conference.url(:register)}
-# =_'conference.Register_Now'
-# #register-dlg
-# = form_tag (@conference.url + '/register/').gsub(/\/\/+/, '/'), :method => :post do
-# = hidden_field_tag :step, 'register'
-# = email_field_tag :email
-# = form_actions :register
-# - if !small_banner && @conference.registration_open
-# - content_for :dom_ready do
-# :plain
-# $('a.register-now').click(function(e) {
-# e.preventDefault();
-# if ($('#register-dlg').hasClass('open')) {
-# $('#register-dlg form').submit();
-# }
-# $('#register-dlg').toggleClass('open');
-# });
-# $('#register-dlg').click(function(e) {
-# if ($(e.target).attr('id') == 'register-dlg') {
-# $('#register-dlg').toggleClass('open');
-# }
-# });
app/views/conferences/_register.html.haml
+11 -2
View File
@@ -1,2 +1,11 @@
= email_field_tag :email, session[:registration][:email]
%article
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Enter_Your_Email','Enter your email address'
= columns(medium: 6, large: 7) do
%p=_'articles.conference_registration.paragraphs.confirm_email_address', :p
= columns(medium: 6, large: 5) do
= form_tag :do_confirm, :method => :post do
.email-field.input-field
= email_field_tag :email, nil, required: true
= label_tag :email
= button_tag :register, :value => :register
app/views/conferences/register.html.haml
+2 -153
View File
@@ -1,155 +1,4 @@
- title (_'conferences.register.page_title.Conference_Registration')
- content_for :banner do
- image = image_url(@conference.cover_url || '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.conferences.Conference_Registration')
= render :partial => 'page_header', :locals => {:page_key => 'Conference_Registration'}
%article
= row do
- case @register_template
- when :confirm_email
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Confirm_You_Email_Address','Confirm Email Address'
= columns(medium: 6, large: 5) do
= form_tag register_path(@this_conference.slug) do
= button_tag :continue, :value => :confirm_email
- when :payment
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Payment'
%p=_'articles.conference_registration.paragraphs.Payment', 'Thank you for completing your registration. We\'ll see you at Bike!Bike! Payment is by donation and can be done now or upon arrival but to help us fund the conference, we ask that you pay the registration donation as soon as you can.'
= columns(large: 9, push: 1) do
= form_tag register_path(@this_conference.slug), :class => :payment do
= hidden_field_tag :button, :payment
.three-options
= button_tag nil, :name => :amount, :value => '25.0' do
= number_to_currency(25, :unit => '$')
= button_tag nil, :name => :amount, :value => '50.0' do
= number_to_currency(50, :unit => '$')
= button_tag nil, :name => :amount, :value => '100.0' do
= number_to_currency(100, :unit => '$')
= form_tag register_path(@this_conference.slug), :class => :payment do
%span.currency='$'
= number_field_tag :amount, nil, :required => true, :step => 0.01, :min => 0.00
= button_tag :custom_amount, :value => :payment
%p=_'articles.conference_registration.paragraphs.currency','(amounts are in $USD)'
= columns(large: 2)
- when :policy
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Policy_Agreement'
%p=_'articles.conference_registration.paragraphs.Policy_Agreement', :s, 2
= columns(medium: 10, push: 1) do
%h3=_'articles.policy.headings.The_Agreement'
%ul
- [:commitment, :respect, :empowerment, :accessible, :peaceful, :spaces, :hearing, :intent, :open_minds, :learning].each do |term|
%li=_"articles.policy.term.#{term.to_s}", :s, 2
%h3=_'articles.policy.headings.Why','Why have a Safer Space Agreement?'
%p=_'articles.policy.paragraphs.Why', :p
%h3=_'articles.policy.headings.How','How is the policy enforced?'
%p=_'articles.policy.paragraphs.How', :p
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.Confirm_Agreement', :p
= form_tag register_path(@this_conference.slug) do
.checkbox-field.input-field
= label_tag :policy_confirm
= check_box_tag :policy_confirm, "1", false, required: true
= button_tag :agree, :value => :policy
- when :questions
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Registration_Info','Registration Info'
= columns(medium: 5, large: 4) do
%p=_'articles.conference_registration.paragraphs.Registration_Info', :p
= columns(medium: 7, large: 8) do
= form_tag register_path(@this_conference.slug) do
%h3=_'articles.conference_registration.headings.name','What is your name?'
.text-field.input-field
= label_tag :name
= text_field_tag :name, @name, required: true
%h3=_'articles.conference_registration.headings.location','Where are you coming from?'
.text-field.input-field
= label_tag :location
= text_field_tag :location, @registration.city, required: true
%h3=_'articles.conference_registration.headings.arrival_and_departure','How long do you plan to spend in the area?'
.date-span.input-field
.date-labels
= label_tag :arrival
= label_tag :departure
.date-field.input-field
= date_field_tag :arrival, @registration.arrival.strftime("%Y-%m-%d")
= date_field_tag :departure, @registration.departure.strftime("%Y-%m-%d")
%h3=_'articles.conference_registration.headings.housing','Do you need a place to stay?'
.radio-button-field.input-field
- [:none, :tent, :house].each do |option|
= radio_button_tag :housing, option, (@registration.housing || '').to_sym == option, required: true
= label_tag "housing_#{option}" do
- option_name = _"articles.conference_registration.questions.housing.#{option}"
= svg_sprite('icons', "bb-#{option}", option_name)
= option_name
%h3=_'articles.conference_registration.headings.bike','Do you need a bike?'
.radio-button-field.input-field
- [:none, :small, :medium, :large].each do |option|
= radio_button_tag :bike, option, (@registration.bike || '').to_sym == option, required: true
= label_tag "bike_#{option}" do
- option_name = _"articles.conference_registration.questions.bike.#{option}"
= svg_sprite('icons', "bb-#{option == :none ? :none : :bike}", option_name)
= option_name
%h3=_'articles.conference_registration.headings.other','Anything else we should know about your visit?'
.select-field.input-field
= label_tag :other
= text_area_tag :other, @registration.other
= button_tag :register, :value => :save
- when :workshops
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Workshops','Workshops'
= columns(medium: 6) do
%h3=_'articles.conference_registration.headings.Add_Workshop'
= form_tag register_path(@this_conference.slug) do
.text-field.input-field
= text_field_tag :title, nil, required: true
= label_tag :title
= text_area_tag :info, nil, required: true
= button_tag :add
= columns(medium: 6) do
%h3=_'articles.conference_registration.headings.Your_Workshops'
%ul.workshops.my-workshops
- @my_workshops.each do |workshop|
%li
%h4=workshop[:title]
.info
%h5{:contenteditable => true}=workshop[:title]
%p{:contenteditable => true}=workshop[:info]
= form_tag register_path(@this_conference.slug) do
= button_tag :save, :value => :save
= button_tag :delete, :value => :delete
= button_tag :cancel, :value => :cancel
= columns(medium: 12) do
= form_tag register_path(@this_conference.slug) do
= button_tag :previous, :value => :registration
= button_tag :next, :value => :workshops
:javascript
function makeWorkshopsClickable() {
var workshops = document.querySelectorAll('ul.workshops h4');
for (var i = 0; i < workshops.length; i++) {
workshops[i].addEventListener('click', function(e) {
var workshop = e.target.parentElement;
workshop.className = 'view';
workshop.querySelector('form').onsubmit = function() {
workshop.removeAttribute('class');
return false;
}
}, false);
}
}
makeWorkshopsClickable();
- else
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Enter_Your_Email','Enter your email address'
= columns(medium: 6, large: 7) do
%p=_'articles.conference_registration.paragraphs.confirm_email_address', :p
= columns(medium: 6, large: 5) do
= form_tag :do_confirm do
.email-field.input-field
= email_field_tag :email, nil, required: true
= label_tag :email
= button_tag :register, :value => :register
= render (@register_template || :register).to_s
app/views/layouts/application.html.haml
+6
View File
@@ -24,6 +24,12 @@
= content_tag :div, msg, :id => key
%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
app/views/layouts/user_mailer.html.haml
+54 -56
View File
@@ -1,8 +1,8 @@
!!! Strict
%html{xmlns: "http://www.w3.org/1999/xhtml"}
%html{:xmlns => "http://www.w3.org/1999/xhtml"}
%head
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
%meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
%meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
%title Your Message Subject or Title
:css
#outlook a {padding:0;}
@@ -12,65 +12,63 @@
#backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}
img {outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;}
a img {border:none;}
.image_fix {display:block;}
p {margin: 1em 0;text-align:left;font-size: 1.25em}
h1, h2, h3, h4, h5, h6 {color: black !important;margin-bottom: 1.5em;line-height:1.5em}
h2 {text-align:left;font-size:1.3em;}
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color: white !important;margin-bottom:1em}
h1 a:active, h2 a:active, h3 a:active, h4 a:active, h5 a:active, h6 a:active {color: white !important;}
h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {color: white !important;}
.image_fix {display:block;max-width:100%}
p {margin: 1em;color:#333 !important;}
h1, h2, h3, h4, h5, h6 {color:#333 !important;}
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color: #00ADEF !important;}
h1 a:active, h2 a:active, h3 a:active, h4 a:active, h5 a:active, h6 a:active { color: #D89E59 !important; }
h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited { color: #DD57EF !important; }
table td {border-collapse: collapse;}
table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }
table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; max-width:512px;min-width:280px;}
a {color: #00ADEF;}
a:link { color: #00ADEF; }
a:visited { color: #00ADEF; }
a:hover { color: #02CA9E; }
@media only screen and (max-device-width: 480px) {
a[href^="tel"], a[href^="sms"] {
text-decoration: none;
color: #00ADEF;
pointer-events: none;
cursor: default;
}
.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
text-decoration: default;
color: #00ADEF !important;
pointer-events: auto;
cursor: default;
}
a[href^="tel"], a[href^="sms"] {
text-decoration: none;
color: #333;
pointer-events: none;
cursor: default;
}
.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
text-decoration: default;
color: #00ADEF !important;
pointer-events: auto;
cursor: default;
}
}
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
a[href^="tel"], a[href^="sms"] {
text-decoration: none;
color: blue; /* or whatever your want */
pointer-events: none;
cursor: default;
}
.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
text-decoration: default;
color: #00ADEF !important;
pointer-events: auto;
cursor: default;
}
a[href^="tel"], a[href^="sms"] {
text-decoration: none;
color: #00ADEF;
pointer-events: none;
cursor: default;
}
.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
text-decoration: default;
color: #00ADEF !important;
pointer-events: auto;
cursor: default;
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {}
@media only screen and (-webkit-device-pixel-ratio:.75){}
@media only screen and (-webkit-device-pixel-ratio:1){}
@media only screen and (-webkit-device-pixel-ratio:1.5){}
/[if IEMobile 7]
<style type="text/css">
</style>
/[if gte mso 9]
<style>
\/* Target Outlook 2007 and 2010 */
</style>
%body
%table#backgroundTable{border: "0", cellpadding: "0", cellspacing: "0"}
%table#backgroundTable{:border => "0", :cellpadding => "0", :cellspacing => "0"}
%tr
%td
%div{style:'width:100%;background-color:#00ADEF;padding: 25px 0 200px;text-align: center;'}
%div{style:'max-width:600px;border:3px solid #00ADEF;margin:25px auto;background-color:#FFF;display:inline-block;width:75%;'}
= yield
%div{style: 'text-align:center;padding-bottom:25px'}
%a{href: "#{@url}"}
2014 Bike!Bike!
%table{:align => "center", :border => "0", :cellpadding => "0", :cellspacing => "0"}
- if @banner
%tr
%td{:valign => "top", :style => 'text-align: center', colspan: 2}
%img.image_fix{:src => @banner}
%tr
%td{:valign => "top", colspan: 2}= yield
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
%tr
%td{style: 'width: 50%; text-align: left'}
%img.image_fix{:src => (@host + image_url('bblogo-paypal'))}
%td{style: 'width: 50%; text-align: left'}
%a{href: @host}="&copy; Bike!Bike! #{Date.today.year}".html_safe
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
app/views/layouts/user_mailer.text.haml
+6 -4
View File
@@ -1,5 +1,7 @@
='========== Bike!Bike! =========='
= yield
="===== #{@url} ======"
=''
=''
='--------------------------------------------------'
=''
= "© Bike!Bike! #{Date.today.year}"
=UserMailer.default_url_options[:host]
app/views/shared/_footer.html.haml
+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
=(_!"&copy;#{Date.today.strftime("%Y")} Bike!Bike!").html_safe
=((_!"&copy;#{Date.today.strftime("%Y")} Bike!Bike!") || '').html_safe
app/views/shared/_navbar.html.haml
+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
app/views/translations/locale.html.haml
+2 -1
View File
@@ -2,5 +2,6 @@
- content_for :banner do
#header-title.no-image
%h1=_'translate.translation_pages.Locale_Translations', @locale[:name], :vars => {:language => @locale[:name]}
=render 'translations/translation_control'
.lingua-franca-translations
=render 'translations/translation_control'
%article=render 'translations/key_wrapper'
app/views/user_mailer/email_confirmation.html.haml
+4 -1
View File
@@ -1 +1,4 @@
%a{href: "#{@host}/confirm/#{@confirmation.token}"}=_'email.confirm.confirm_link'
%p=_'email.confirmation.paragraph.please_confirm','Hello! To gain access to registration and other features of Bike!Bike!, please confirm your email address by clicking on following link:'
- link = "#{@host}/confirm/#{@confirmation.token}"
%p
%a{href: link}=link
app/views/workshops/index.html.haml
+26 -35
View File
@@ -1,35 +1,26 @@
%h1 Listing workshops
%table
%tr
%th Title
%th Slug
%th Info
%th Conference
%th Workshop stream
%th Workshop presentation style
%th Min facilitators
%th Location
%th Start time
%th End time
%th
%th
- @workshops.each do |workshop|
%tr
%td= workshop.title
%td= workshop.slug
%td= workshop.info
%td= workshop.conference_id
%td= workshop.workshop_stream_id
%td= workshop.workshop_presentation_style
%td= workshop.min_facilitators
%td= workshop.location_id
%td= workshop.start_time
%td= workshop.end_time
%td= link_to 'Show', conference_workshop_path(@conference, workshop)
%td= link_to 'Edit', edit_conference_workshop_path(@conference, workshop)
%br
= link_to 'New Workshop', new_conference_workshop_path
= render 'conferences/page_header', :page_key => 'Workshops'
%article
= row do
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Workshops'
= columns(medium: 6) do
%p=_'articles.conference_registration.paragraphs.Workshops', :p
= columns(medium: 6) do
%h3=_'articles.conference_registration.headings.Your_Workshops'
%ul.workshop-previews
- @my_workshops.each do |w|
- if w.title
%li
=link_to view_workshop_path(@this_conference.slug, w.id) do
%h4=_!(w.title)
=paragraph _!(w.info)
= link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: :button
= row do
%ul.workshop-previews
- @workshops.each do |w|
- if w.title
%li
= columns(medium: 6) do
=link_to view_workshop_path(@this_conference.slug, w.id) do
%h4=_!(w.title)
=paragraph _!(w.info)
app/views/workshops/new.html.haml
+44 -5
View File
@@ -1,6 +1,45 @@
- page_style :form
= render 'conferences/page_header', :page_key => (@workshop ? 'Edit_Workshop' : 'Create_Workshop')
%article
= row do
= form_tag save_workshop_path(@this_conference.slug), class: 'composition' do
= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
= columns(medium: 12) do
%p=(_'articles.workshops.paragraphs.info','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown</a>.').html_safe
.text-field.input-field.big
= label_tag :title
= text_field_tag :title, @title, :required => true
.text-area-field.input-field
= label_tag :info
= text_area_tag :info, @info, :required => true
= columns(medium: 6) do
%h3=_'articles.workshops.headings.languages','Workshop Language'
.check-box-field.input-field
- [:en, :es, :fr].each do |language|
= check_box_tag "languages[#{language}]", 1, @languages.include?(language)
= label_tag "languages_#{language}" do
= _"languages.#{language}"
%h3=_'articles.workshops.headings.theme','Theme'
%p=_'articles.workshops.paragraphs.theme', :p
.check-box-field.input-field
- [:race_gender, :mechanics, :funding, :organization, :community, :other].each do |theme|
= radio_button_tag :theme, theme, @theme == theme
= label_tag "theme_#{theme}" do
= _"workshop.options.theme.#{theme}"
= columns(medium: 6) do
%h3=_'articles.workshops.headings.needs','What do you need?'
.check-box-field.input-field
- [:sound, :projector, :tools].each do |need|
= check_box_tag "needs[#{need}]", 1, @needs.include?(need)
= label_tag "needs_#{need}" do
= _"workshop.options.needs.#{need}"
%h3=_'articles.workshops.headings.space','Type of space'
%p=_'articles.workshops.paragraphs.space', :p
.check-box-field.input-field
- [:workshop, :meeting_room, :outdoor_meeting].each do |space|
= radio_button_tag :space, space, @space == space
= label_tag "space_#{space}" do
= _"workshop.options.space.#{space}"
= columns(medium: 12) do
.actions.right
= button_tag :save, :value => :save
= tabs!
.row
= render 'form'
app/views/workshops/show.html.haml
+16 -30
View File
@@ -1,30 +1,16 @@
%p#notice= notice
.row
.columns.medium-12
%h1= @workshop.title
= tabs!
.row
.columns.medium-4
%p
%b Workshop stream:
= @workshop.workshop_stream_id
%p
%b Workshop presentation style:
= @workshop.workshop_presentation_style
%p
%b Min facilitators:
= @workshop.min_facilitators
%p
%b Location:
= @workshop.location_id
%p
%b Start time:
= @workshop.start_time
%p
%b End time:
= @workshop.end_time
.columns.medium-8
=p @workshop, :info
= render 'conferences/page_header', :page_key => 'View_Workshop'
%article
= row do
= columns(medium: 12) do
%h2=_!@workshop.title
=paragraph _!(@workshop.info) || ''
%h3=_'articles.workshops.headings.facilitators'
.facilitators
- @workshop.workshop_facilitators.each do |f|
.facilitator
- u = User.find(f.user_id)
.name=_!(u.firstname || u.username || u.email)
.role=_"roles.workshops.facilitator.#{f.role}"
.actions
= (link_to (_'actions.workshops.Edit'), edit_workshop_path(@this_conference.slug, @workshop.id), :class => 'button modify') if @workshop.can_edit?(current_user)
= (link_to (_'actions.workshops.Delete'), delete_workshop_path(@this_conference.slug, @workshop.id), :class => 'button delete') if @workshop.can_delete?(current_user)