Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page

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

@@ -16,7 +16,7 @@
       = semantic_form_for(@commercial, url: admin_conference_commercials_path(conference_id: @conference.short_title)) do |f|
         = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', autofocus: true },
         hint: 'Just paste the url of your video/photo provider. YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
-        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }
+        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }, label: 'Save Materials'
   %hr
 
 - @commercials.each_slice(3) do |slice|
@@ -24,10 +24,10 @@
     - slice.each do |commercial|
       - if commercial.persisted?
         .col-md-4
-          .thumbnail
-            .flexvideo{ id: "resource-content-#{commercial.id}" }
+          .panel
+            %div{ id: "resource-content-#{commercial.id}" }
               = render partial: 'shared/media_item', locals: { commercial: commercial }
-            .caption
+            .caption.panel-footer
               - if can? :update, commercial
                 = semantic_form_for commercial, url: admin_conference_commercial_path(conference_id: @conference.short_title, id: commercial) do |f|
                   = f.input :url, label: 'URL', as: :string, input_html: { id: "commercial_url_#{commercial.id}", required: 'required' }, hint: 'Just paste the url of your video/photo provider'

app/views/admin/schedules/_day_tab.html.haml

@@ -3,11 +3,13 @@
 / use smaller cell heights for more compact grids
 - cell_height = compact_grid ? 32 : 58
 - date_event_schedules = @event_schedules.select{ |e| e.start_time.to_date.eql? date }
+/ Dynamically set the column width, but no narrower than 2 (on a BS grid of 12)
+- col_size = [2, (12 / @rooms.count).to_i ].max
 .row
   - @rooms.each do |room|
     - non_schedulable = room.tracks.self_organized.confirmed.any? do |track|
       - !track.schedules.include?(@schedule) && (track.start_date..track.end_date).include?(date)
-    .col-md-2.col-xs-6{ class: ('non_schedulable' if non_schedulable) }
+    .col-xs-6{ class: "#{('non_schedulable' if non_schedulable)} col-md-#{col_size}" }
       .room-name
         - room_date_event_schedules = date_event_schedules.select{ |e| e.room == room }
         = room.name