Merge 760dd06d31 into 17427c88fe

app/views/admin/conference/_photo_fields.html.erb

@@ -0,0 +1,7 @@
+<div class="nested-fields">
+    <%= f.inputs do %>
+        <%= f.input :picture %>
+        <%= f.input :description, :input_html => {:rows => 2 } %>
+        <%= remove_association_link :photo, f %>
+    <% end %>
+</div>

app/views/admin/conference/edit.html.haml

@@ -17,6 +17,8 @@
       = f.input :registration_description, hint: 'This description will appear in registration segment of the splash'
       = f.input :ticket_description, hint: 'This will appear in the Tickets segment of the splash'
 
+      = dynamic_association :photos, "Photos", f
+
       = f.inputs :name => "Media" do
         - if !@conference.logo.blank?
           = image_tag @conference.logo(:thumb)

app/views/conference/_carousel.html.haml

@@ -0,0 +1,19 @@
+%div#gallery-carousel.carousel.slide{"data-ride" => "carousel"}
+  / Indicators
+  %ol.carousel-indicators
+    - @conference.photos.each_with_index do |p,i|
+      %li{"data-slide-to" => "#{i}", "data-target" => "#gallery-carousel", class: i==0 ? "active": "" }
+  / Wrapper for slides
+  .carousel-inner
+    - @conference.photos.each_with_index do |p,i|
+      %div{ class: i==0 ? "active item": "item" }
+        = image_tag(p.picture(:original), class: 'img-responsive')
+        - unless p.description.blank?
+          %div.carousel-caption
+            %p.text-center
+              = p.description
+  / Controls
+  %a.left.carousel-control{"data-slide" => "prev", href: "#gallery-carousel"}
+    %span.glyphicon.glyphicon-chevron-left
+  %a.right.carousel-control{"data-slide" => "next", href: "#gallery-carousel"}
+    %span.glyphicon.glyphicon-chevron-right

app/views/conference/show.html.haml

@@ -1,5 +1,8 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
+- unless @conference.photos.blank?
+  %div
+    = render 'carousel'
 %div#program
   = render 'program'
 %div#registration