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

New look

Browse Source
This commit is contained in:
Godwin
2014-07-05 10:27:49 -06:00
parent 930aa130d6
commit f66f456cc4
36 changed files with 901 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/conferences/_header.html.haml
+25
View File
@@ -0,0 +1,25 @@
- banner_image @conference.cover_url, id: 532693, name: 'phil', user_id: 1429589, src: 'panoramio'
- page_style 'emphasize-banner'
- content_for :banner do
.row
.columns.small-12
%figure
%img{src: @conference.poster_url}
.row.align-bottom
.columns.medium-6
%h1='Bike!Bike! '+@conference.start_date.year.to_s
%h2
- location = @conference.organizations.first.locations.first
= location.city + ', ' + (location.territory || location.country)
%em
= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
%p
= @conference.info
.columns.medium-6.centered
- if @conference.registration_open
%a.button{href: @conference.url(:register)}
=_'conference.Register_Now'
- if params['controller'] != 'conferences'
%a.button.more{href: @conference.url}
=_'conference.More_Info'
app/views/conferences/_registration_register.html.haml
+40 -3
View File
@@ -1,8 +1,45 @@
.columns.medium-8
= select_tag :is_attending, ConferenceRegistration::AttendingOptions, label: 'Are you attending?', value: @conference_registration.try(:is_attending)
.columns{:class => @host_privledges ? 'medium-8' : 'medium-12'}
= f.fields_for @user do |u|
.columns#step-1.registration-step= u.email_field :email
%button#submit-email.next=_'form.Next'
= f.fields_for @user do |u|
.columns#step-2.registration-step= u.text_field :username
-# .columns.medium-6
= select_tag :is_attending, options_for_select(ConferenceRegistration::AttendingOptions, @conference_registration.try(:is_attending)), :label => true
%ol
- @conference.registration_form_fields.each do |ff|
%li
- response = @conference_registration ? ConferenceRegistrationResponse.find_by(conference_registration_id: @conference_registration.id, registration_form_field_id: ff.id) : nil
= form_field ff, response
= form_actions :register
= f.actions :register
- content_for :scripts do
:plain
function updateForm(data, step) {
$('.registration-step').each(function() {
var $this = $(this);
var this_step = parseInt($this.attr('id').replace(/^step\-(\d+)$/, '$1'));
if (this_step > step) {
$this.find('input,select').each(function(){
var $input = $(this);
var params = $input.attr('name').match(/\[(.*?)\]/g);
var val = data.conference;
for (key in params) {
var k = params[key].replace(/\[(.*)\]/, '$1');
val = val[params[key].replace(/\[(.*)\]/, '$1')];
}
$input.val(val)
});
}
});
}
- dom_ready do
:plain
$('#submit-email').click(function(e){
e.preventDefault();
$.post('register/step/1', $('form.edit_conference').serialize(), function(data) {
//console.log(data.conference.user.username);
updateForm(data, 1);
});
});
app/views/conferences/permission_denied.html.haml
+8
View File
@@ -0,0 +1,8 @@
- title 'Bike!Bike!'
= render 'header'
.row
%h1
=_'error.title.Permission_Denied'
%p
=_'error.desc.permission_denied', :p
app/views/conferences/registration.html.haml
+7 -4
View File
@@ -1,11 +1,14 @@
= render 'header'
- page_style :form
= tabs!
.row
= form_for @conference do |f|
.columns.medium-4
=sub_tabs!
%h2=_'conference.hosts.help.title', :t
%p=_'conference.hosts.help', :p
- if @host_privledges
.columns.medium-4
=sub_tabs!
%h2=_'conference.hosts.help.title', :t
%p=_'conference.hosts.help', :p
= render @sub_action, :f => f
= yield_or_default(:after_form)
app/views/conferences/show.html.haml
+3 -21
View File
@@ -1,23 +1,5 @@
- title 'Bike!Bike!'
- banner_image @conference.cover_url
- page_style 'emphasize-banner'
- content_for :banner do
.row
.columns.medium-6
%figure
%img{src: @conference.poster_url}
.columns.medium-6.info
%h1='Bike!Bike!'
%h2
Columbus, Ohio
%em
= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
%p
= _ 'nola_2013.about', 'paragraph'
.centered
%a.button{href: '#'}
Register Now
= render 'header'
= tabs!
@@ -71,6 +53,6 @@
%b Travel info:
= @conference.travel_info
= link_to 'Edit', edit_conference_path(@conference)
= link_to 'Edit', @conference.path(:edit) #edit_conference_path(@conference.conference_type.slug, @conference)
\|
= link_to 'Back', conferences_path
= link_to 'Back', 'conferences'
app/views/layouts/application.html.haml
+3
View File
@@ -30,6 +30,8 @@
= javascript_include_tag 'nested_form'
%body{ class: (yield_or_default :page_style) }
:javascript
var b=document.getElementsByTagName('HTML')[0];b.className+=' '+(window.getComputedStyle(document.body).backgroundBlendMode?'':'no-')+'blend-modes';</script>
= render 'shared/translation_control'
= render 'shared/navbar'
@@ -39,6 +41,7 @@
- if has_banner?
%header#banner{banner_attrs(yield_or_default :banner_image)}
= yield :banner
= banner_attribution
= yield
#footer
.container= render 'shared/footer'
app/views/layouts/fields/_default.html.haml
+1 -1
View File
@@ -7,4 +7,4 @@
= @label_position == :before && @label ? @label : ''
- if @label_position != :inside
%div=@html
= @label_position == :after && @label ? '' : @label
= @label_position == :after && @label ? @label : ''
app/views/layouts/fields/_label_default.html.haml
+1 -1
View File
@@ -1,4 +1,4 @@
- label = @options[:label] || _('form.label.' + @name.to_s)
- label = !@options[:label] || @options[:label] == true ? _('form.label.' + @name.to_s) : @options[:label]
= label_tag @name do
- if @label_position == :inside
%div=@html
app/views/pages/404.html.haml
+1
View File
@@ -0,0 +1 @@
404!d
app/views/pages/home.html.haml
+9 -28
View File
@@ -1,30 +1,11 @@
- title 'Bike!Bike!'
- banner_image '/assets/columbus.jpg'
- page_style 'emphasize-banner'
= render 'conferences/header'
- content_for :banner do
.row
.columns.medium-6
%figure
%img{src: '/assets/poster.jpg'}
.columns.medium-6.info
%h1
Bike!Bike! 2014
%h2
Columbus, Ohio
%em
August 30 - September 1
%p
= _ 'nola_2013.about', 'paragraph'
.centered
%a.button{href: '#'}
Register Now
%section
.row
.columns.medium-6
%h1
Welcome to Bike!Bike!
%p
= _ 'home.its_awesome', 'paragraph'
.columns.medium-6
-#%section
-# .row
-# .columns.medium-6
-# %h1
-# Welcome to Bike!Bike!
-# %p
-# = _ 'home.its_awesome', 'paragraph'
-# .columns.medium-6
app/views/shared/_footer.html.haml
+5 -4
View File
@@ -1,5 +1,6 @@
%footer
%p
= link_to 'https://github.com/diowa/ruby2-rails4-bootstrap-heroku' do
%i.icon-github
diowa/ruby2-rails4-bootstrap-heroku
:javascript
#{yield :scripts}
$(function(){
#{yield :dom_ready}
});
app/views/shared/_navbar.html.haml
+23 -37
View File
@@ -1,37 +1,23 @@
%nav.top-bar.row{ data: { :topbar => '' } }
#nav-inner
%ul.title-area
/ Title Area
%li.name
%h1
%a{href: "/"} Bike!Bike!
/ Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone
%li.toggle-topbar.menu-icon
%a{href: "#"}
%span Menu
%section.top-bar-section
/ Left Nav Section
%ul.left
%li.active
= link_to (_'Conferences'), :controller => :conferences
%li
= link_to (_'Organizations'), :controller => :organizations
%li
= link_to (_'Resources'), '/resources'
/ Right Nav Section
%ul.right
- if current_user
%li.has-form.sign-out.hide-for-small
= link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
%li.user-profile.has-dropdown
= link_to current_user do
= image_tag(current_user.avatar_url(:icon))
%span
%span.show-for-small=current_user.username
%ul.dropdown
%li= link_to 'View Profile', current_user
%li= link_to 'Edit Profile', edit_user_path(current_user.id)
- else
%li.has-form.sign-in
= link_to (_"Sign_In"), :login, :class => 'button'
%nav#main-nav
= link_to '/resources', :class => ['button', 'logo'] do
= image_tag('logo.png', class: 'logo')
= image_tag('logo-text.png', class: 'logo-text')
= link_to (_'Conferences'), {:controller => :conferences}, {:class => ['button', 'conference']}
= link_to (_'Organizations'), {:controller => :organizations}, {:class => ['button', 'organization']}
= link_to (_'Zine'), 'http://zinezine.bikebike.org', :class => ['button', 'article']
%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.
-#- if current_user
-# %li.has-form.sign-out.hide-for-small
-# = link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
-# %li.user-profile.has-dropdown
-# = link_to current_user do
-# = image_tag(current_user.avatar_url(:icon))
-# %span
-# %span.show-for-small=current_user.username
-# %ul.dropdown
-# %li= link_to 'View Profile', current_user
-# %li= link_to 'Edit Profile', edit_user_path(current_user.id)
-#- else
-# %li.has-form.sign-in
-# = link_to (_"Sign_In"), :login, :class => 'button'