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'