Merge

app/views/admin/volunteers/_vday_fields.html.erb

@@ -1,7 +1,7 @@
 <div class="nested-fields">
-    <%= f.inputs do %>
-        <%= f.date_select :day %>
-        <%= f.input :description, :input_html => {:rows => "2", :class => "span8"} %>
-        <%= remove_association_link :vday, f %>
-    <% end %>
+  <%= f.inputs do %>
+      <%= f.date_select :day %>
+      <%= f.input :description, :input_html => {:rows => "2", :class => "col-md-8"} %>
+      <%= remove_association_link :vday, f %>
+  <% end %>
 </div>

app/views/admin/volunteers/_volunteers_table.html.haml

@@ -1,19 +1,27 @@
-%table.table.table-striped.table-bordered.table-hover#speakertable
-  %thead
-    %th First Name
-    %th Last Name
-    %th Email
-    %th Mobile
-    %th Languages
-    %th Experience
-    %th Tshirt Size
-  %tbody
-    - @volunteers.each do |volunteer|
-      %tr
-        %td= volunteer.first_name
-        %td= volunteer.last_name
-        %td= volunteer.email
-        %td= volunteer.mobile
-        %td= volunteer.languages
-        %td= volunteer.volunteer_experience
-        %td= volunteer.tshirt
+.well
+  %table.table.table-striped.table-bordered.table-hover#volunteerstable
+    %thead
+      %th First Name
+      %th Last Name
+      %th Email
+      %th Mobile
+      %th Languages
+      %th Experience
+      %th Tshirt Size
+    %tbody
+      - @volunteers.each do |volunteer|
+        %tr
+          %td= volunteer.first_name
+          %td= volunteer.last_name
+          %td= volunteer.email
+          %td= volunteer.mobile
+          %td= volunteer.languages
+          %td= volunteer.volunteer_experience
+          %td= volunteer.tshirt
+
+:javascript
+  $(document).ready(function(){
+      $('#volunteerstable').dataTable({
+        "bPaginate": false
+      });
+  });           

app/views/admin/volunteers/_vposition_fields.html.erb

@@ -1,8 +1,8 @@
 <div class="nested-fields">
-    <%= f.inputs do %>
-        <%= f.input :title %>
-        <%= f.input :description, :input_html => {:rows => "2", :class => "span8"}%>
-        <%= f.input :vdays, :collection => @conference.vdays.map {|x| [x.day, x.id]}, :label => "Position is required for the following days:"%>
-        <%= remove_association_link :vposition, f %>
-    <% end %>
+  <%= f.inputs do %>
+      <%= f.input :title %>
+      <%= f.input :description, :input_html => {:rows => "2", :class => "col-md-8"} %>
+      <%= f.input :vdays, :collection => @conference.vdays.map { |x| [x.day, x.id] }, :label => "Position is required for the following days:" %>
+      <%= remove_association_link :vposition, f %>
+  <% end %>
 </div>

app/views/admin/volunteers/index.html.haml

@@ -1,15 +1,16 @@
-.container-fluid
-  .row-fluid
-    .span3
-      = render 'admin/conference/sidebar'
-    .span9
-      = semantic_form_for(@conference, :url => admin_conference_volunteers_update_path(@conference.short_title)) do |f|
-        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
-        %br
-        %br
-        .span5
+.row
+  .col-md-3
+    = render 'admin/conference/sidebar'
+  .col-md-9
+    = semantic_form_for(@conference, :url => admin_conference_volunteers_update_path(@conference.short_title)) do |f|
+      = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
+      %br
+      %br
+      = f.input :use_volunteers, :label => "Enable Volunteering"
+      .row
+        .col-md-6
           = f.input :use_vdays, :label => false  
           = dynamic_association :vdays, "Volunteer Days", f
-        .span5
+        .col-md-6
           = f.input :use_vpositions, :label => false  
           = dynamic_association :vpositions, "Volunteer positions", f