Update gems, use d3 gem, initial bootstrap v3 port

This commit is contained in:
Henne Vogelsang 2014-03-17 16:36:32 +01:00
parent 24e40a5c90
commit 587126218d
71 changed files with 798 additions and 10411 deletions

View file

@ -1,15 +1,15 @@
.row
.span12
.col-md-12
%h3
Registration for
= @conference.title
- if @person.proposal_count(@conference) > 0
.row
.span12
.col-md-12
%i
Please note: Registration is not automatically performed for speakers. If you're scheduled to speak at the conference, you still need to register!
.row
.span12
.col-md-12
= f.inputs :name => "Your Details" do
%br
Your public name (required)
@ -75,4 +75,4 @@
onSelect: function(selected) {
$("#registration-arrival-datepicker").datepicker("option","maxDate", selected)
}
});
});

View file

@ -1,5 +1,5 @@
.row
.span12
.col-md-12
= f.input :volunteer, :label => "Click here if you want to become a volunteer at #{@conference.short_title}", :input_html => {:maxlength => 15, :size => 40}
= f.fields_for :person do |p|
= render :partial => 'devise/registrations/volunteerperson', :locals => {:p => p}

View file

@ -1,5 +1,5 @@
.row
.span12
.col-md-12
= semantic_form_for(@registration, :url => register_conference_path(@conference.short_title), :html => { :method => :put }) do |f|
.tabbable
%ul.nav.nav-tabs
@ -19,4 +19,4 @@
= link_to "Unregister", register_conference_path(@conference.short_title),:method => :delete, :class => "btn btn-danger",
:confirm => "Are you sure you want to unregister?"
- else
= f.action :submit, :button_html => { :value => "Register", :class => "btn btn-primary" }
= f.action :submit, :button_html => { :value => "Register", :class => "btn btn-primary" }