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

Updated style and layout

Browse Source
This commit is contained in:
Godwin
2015-03-17 20:29:17 -07:00
parent caac48c3c0
commit e476457ea3
356 changed files with 77766 additions and 4248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/conferences/_banner_image.svg.erb
+20
View File
@@ -0,0 +1,20 @@
<svg>
<defs>
<g id="rainbow">
<rect x="0%" y="0" width="<%= (100/5) %>%" height="100%" class="colour-2"/>
<rect x="<%= (100/5)*1 %>%" y="0" width="<%= (100/5) %>%" height="100%" class="colour-5"/>
<rect x="<%= (100/5)*2 %>%" y="0" width="<%= (100/5) %>%" height="100%" class="colour-4"/>
<rect x="<%= (100/5)*3 %>%" y="0" width="<%= (100/5) %>%" height="100%" class="colour-3"/>
<rect x="<%= (100/5)*4 %>%" y="0" width="<%= (100/5) %>%" height="100%" class="colour-1"/>
</g>
<image x="0" y="0" width="100%" height="100%" xlink:href="<%= @conference.cover_url %>" id="banner-image" preserveAspectRatio="xMidYMid slice"/>
<filter id="f1" x="0" y="0" width="1" height="1">
<feImage xlink:href="#rainbow" result="rainbow"/>
<feImage xlink:href="#banner-image" result="banner-image"/>
<feBlend mode="multiply" in="rainbow" in2="banner-image" />
</filter>
</defs>
<rect width="100%" height="100%" filter="url(#f1)"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1019 B

app/views/conferences/_header.html.haml
+66 -65
View File
@@ -1,67 +1,68 @@
- banner_image @conference.cover_url, id: @conference.cover_attribution_id, name: @conference.cover_attribution_name, user_id: @conference.cover_attribution_user_id, src: @conference.cover_attribution_src
- small_banner = (params['controller'] == 'conferences' && params['action'] != 'show')
- if small_banner
- body_class('small-banner')
- page_style (params['controller'] == 'conferences' ? 'article' : 'emphasize-banner')
-#- 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
.row
- if !small_banner
.columns.small-12.banner
%figure
%img{src: @conference.poster.full.url}
.columns.medium-7.align-bottom
- 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
%h2
- location = @conference.organizations.first.locations.first
= location.city + ', ' + (location.territory ? Carmen::Country.coded(location.country).subregions.coded(location.territory).name : location.country)
%em
= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
- 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.centered.align-bottom.buttons
%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');
}
});
#header-title{style: capable_of(:svg) ? nil : "background-image: url(#{@conference.cover_url})"}
- if capable_of(:svg)
= render 'conferences/banner_image.svg'
.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}
-# =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/layouts/application.html.haml
+5 -34
View File
@@ -4,15 +4,9 @@
%meta{ charset: 'utf-8' }
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0' }
%title= (yield :title) + (content_for?(:title) ? ' | ' : '') + 'Bike!Bike!'
%meta{ name: 'description', content: (yield_or_default :description, 'Bike!Bike! conferences for DIY bicycle collectives, co-ops, and advocacy groups') }
%meta{ name: 'description', content: (yield_or_default :description, I18n.t('page_descriptions.home')) }
= csrf_meta_tags
/[if lt IE 9]
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
= stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic', media: 'all'
=# stylesheet_link_tag 'application', media: 'all'
= inject_css!
=#:javascript
=# !function(){function e(e,n){try{if(localStorage[e])t(e);else{var a=new XMLHttpRequest;a.open("GET",n,!0),a.onload=function(){a.status>=200&&a.status<400&&(localStorage[e]=a.responseText,t())},a.send()}}catch(o){}}function t(e){var t=document.createElement("style");t.rel="stylesheet",document.head.appendChild(t),t.textContent=localStorage[e]}e("AlteHaasGroteskBold","/assets/AlteHaasGroteskBold")}();
%link{ href: asset_path('favicon.ico'), rel: 'shortcut icon', type: 'image/x-icon' }
%link{ href: asset_path('favicon.ico'), rel: 'icon', type: 'image/x-icon' }
%link{ href: asset_path('apple-touch-icon.png'), rel: 'apple-touch-icon' }
@@ -22,46 +16,23 @@
= yield :head
%body{ class: (yield_or_default :page_style) }
:javascript
document.getElementsByTagName('HTML')[0].className+=' '+(window.getComputedStyle(document.body).backgroundBlendMode?'':'no-')+'blend-modes'
-#= render 'shared/translation_control'
%main
= render 'shared/navbar'
= render 'shared/navbar'
%main#main
- 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
%header#banner
= yield :banner
- if content_for?(:side_bar)
%aside#side-bar
= yield :side_bar
%form{action: 'https://www.paypal.com/cgi-bin/webscr', method: 'post', target: '_top'}
%input{type: 'hidden', name: 'cmd', value: '_donations'}
%input{type: 'hidden', name: 'business', value: 'info@thirdhand.org'}
%input{type: 'hidden', name: 'lc', value: 'US'}
%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','Make a Donation!'
- if has_content?
#content=yield
- else
= yield
.row
.columns.medium-8
here is something to look at
.columns.medium-4
here is another thing
= yield :garbage
#footer
%footer
.container= render 'shared/footer'
= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'
:javascript
window.jQuery||document.write('<script src="/javascripts/jquery.min.js"><\/script>');(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;e=o.createElement(i);r=o.getElementsByTagName(i)[0];e.src='//www.google-analytics.com/analytics.js';r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));ga('create','UA-42449204-1');ga('send','pageview');!function(a,b,c,d){d&&a.addEventListener("DOMContentLoaded",function(){$.ajax({url:$("use").first().attr("xlink:href").replace(/^(.*)\#.*$/,"$1"),dataType:"text",success:function(a){$("body").append('<div class="hide">'+a+"</div>"),$("use").each(function(){$(this).attr("xlink:href",function(a,b){return b.replace(/^.*(#.*)$/,"$1")})})}})})}(document,navigator,{},/Trident\/[567]\b/.test(navigator.userAgent));
- if content_for?(:footer_scripts)
= yield :footer_scripts
- if content_for?(:scripts) || content_for?(:dom_ready)
app/views/pages/home.html.haml
+6 -3
View File
@@ -2,7 +2,10 @@
- this_is_the_front_page
- if @conference
= render 'conferences/header'
%article
%h2=@conference.title
=@conference.info.html_safe
- content_for :side_bar do
%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.
%article.supplementary
%h2=_'section_titles.bikebike.About_BikeBike'
%p=_'section_content.bikebike.about_bikebike', :p
app/views/shared/_donate_button.html.haml
+8
View File
@@ -0,0 +1,8 @@
%form{action: 'https://www.paypal.com/cgi-bin/webscr', method: 'post', target: '_top', class: 'paypal-button'}
%input{type: 'hidden', name: 'cmd', value: '_donations'}
%input{type: 'hidden', name: 'business', value: email_address}
%input{type: 'hidden', name: 'lc', value: 'US'}
%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!'
app/views/shared/_footer.html.haml
-10
View File
@@ -1,10 +0,0 @@
%footer.row
.columns.medium-8.medium-push-1.large-6.large-push-2.text-center
%a{href: '/conferences/'}='Conferences'
%i
%a{href: '/conferences/'}='Organizations'
%i
%a{href: '/resources/'}='Resources'
.columns.medium-3.large-3.copyright
&copy;2014 Bike!Bike!
app/views/shared/_navbar.html.haml
+9 -9
View File
@@ -1,10 +1,10 @@
%nav#main-nav
= link_to '/', :class => ['button', 'logo'] do
=# image_tag('logo.png', class: 'logo')
=# image_tag('logo-text.png', class: 'logo-text')
= icon('logo', {:class => 'logo'})
= icon('logo-text', {:class => 'logo-text'})
.buttons
= link_to (_'Conferences'), :conferences, {:class => ['button', 'conference']}
= link_to (_'Organizations'), {:controller => :organizations}, {:class => ['button', 'organization']}
= link_to (_'Resources'), '/resources/', :class => ['button', 'article']
= link_to '/', :class => 'logo' do
= 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')
.actions
= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)