Fix splash layouts, other ui fixes

app/views/admin/tracks/_track_fields.html.erb

@@ -6,4 +6,4 @@
         <%= remove_association_link :track, f %>
     <% end %>
 </div>
-data: { provide: "markdown-editable" }
+

app/views/conference/_call_for_papers.html.haml

@@ -8,32 +8,32 @@
       %h1
         Call For Papers
       - if !@conference.call_for_papers.description.blank?
-        %p
+        .lead
           = markdown(@conference.call_for_papers.description)
       - if !@conference.call_for_papers.start_date.blank? && !@conference.call_for_papers.end_date.blank?
-        %p.lead Proposals will be accepted between
+        .lead Proposals will be accepted between
         #cfp-date
           = date_string(@conference.call_for_papers.start_date, @conference.call_for_papers.end_date)
     - if @conference.cfp_open?
       - if @conference.call_for_papers.end_date.to_time < Time.now
-        %p Today is the last day. Hurry Up!
+        .lead Today is the last day. Hurry Up!
       - else
         .row
           .col-md-8.col-md-offset-3
             %div.col-md-2.timer-box
               %h2#days
-              %p Days
+              .lead Days
             %div.col-md-2.timer-box
               %h2#hours
-              %p Hours
+              .lead Hours
             %div.col-md-2.timer-box
               %h2#minutes
-              %p Minutes
+              .lead Minutes
             %div.col-md-2.timer-box
               %h2#seconds
-              %p Seconds
+              .lead Seconds
       .row
-        %p
+        .lead
           = link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank'
     -else
       %h3 Deadline has ended

app/views/conference/_gallery_photo.html.haml

@@ -3,5 +3,5 @@
     = image_tag(photo.picture(:banner))
     - unless photo.description.blank?
       %div.carousel-caption
-        %p.lead
+        .lead
           = photo.description

app/views/conference/_location.html.haml

@@ -13,7 +13,7 @@
         %h2
           %strong #{ @conference.venue.address }
       - unless @conference.venue.description.blank?
-        %p
+        .lead
           = markdown(@conference.venue.description)
       %ul.location-links
         - unless @conference.venue.address.blank?

app/views/conference/_lodging.html.haml

@@ -1,7 +1,7 @@
 %div.container.text-center
   %h2 Lodgings
   -unless @conference.lodging_description.blank?
-    %p.lead
+    .lead
       = markdown(@conference.lodging_description)
 
   %div.row.text-center
@@ -13,7 +13,7 @@
           -unless r.name.blank?
             %h4.text-center #{ r.name }
           -unless r.description.blank?
-            %p.text-left #{ markdown(r.description) }
+            .lead.text-left #{ markdown(r.description) }
           - unless r.website_link.blank?
             .text-center
               = link_to 'Go to Website', r.website_link

app/views/conference/_registration.html.haml

@@ -5,7 +5,7 @@
   %div.row
     %h1 Registration
   - if !@conference.registration_description.blank?
-    %p
+    .lead
       = markdown(@conference.registration_description)
   - if @conference.registration_dates_given?
     -if @conference.registration_end_date >= Date.today

app/views/conference/_sponsor.html.haml

@@ -6,7 +6,7 @@
     %div.col-md-12
       %h2 Sponsors
       -if !@conference.sponsor_description.blank?
-        %p
+        .lead
         = markdown(@conference.sponsor_description)
       -if !@conference.sponsor_email.blank?
         %h3= mail_to "#{ @conference.sponsor_email }", 'Become a Sponsor'

app/views/conference/_tickets.html.haml

@@ -1,14 +1,14 @@
 %div.row
   %h3 Tickets
   -if !@conference.ticket_description.blank?
-    %p
+    .lead
       = markdown(@conference.ticket_description)
     - @conference.supporter_levels.each do |s|
       %div.col-md-6
         - if !s.title.blank?
           %h4 #{ s.title }
         -if !s.description.blank?
-          %p #{ s.description }
+          .lead #{ s.description }
         - if !s.url.blank?
           %div.btn-group
             = link_to "Buy Ticket", s.url, class: 'btn btn-success', target: '_blank'

app/views/conference/show.html.haml

@@ -1,61 +1,61 @@
 = content_for :brand do
-  = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
+  = link_to @conference.short_title, conference_url(@conference.short_title), class: 'navbar-brand'
 = content_for :splash do
-  - if @conference.include_banner_in_splash?
-    %section{ id: 'splash-banner' }
-      %div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-background' unless @conference.banner_photo.blank?) }
-        %div.container.text-center.banner-text
-          .row
-            %h1
-              = @conference.short_title
-          - if @conference.start_date && @conference.end_date
+  .splash
+    - if @conference.include_banner_in_splash?
+      %section{ id: 'splash-banner' }
+        %div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-background' unless @conference.banner_photo.blank?) }
+          %div.container.text-center.banner-text
             .row
-              %h3
-                = date_string(@conference.start_date, @conference.end_date)
+              %h1
+                = @conference.title
+            - if @conference.start_date && @conference.end_date
+              .row
+                %h3
+                  = date_string(@conference.start_date, @conference.end_date)
 
-          - unless @conference.description.blank?
-            .row-fluid
-              .col-md-12.lead
-                %p
-                  = markdown(@conference.description)
-          -unless @conference.photos.blank?
-            = link_to 'Gallery', gallery_photos_conference_path(@conference.short_title), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
-            = render 'gallery'
-  - if @conference.include_program_in_splash?
-    %section{ id: 'program' }
-      .pad
-        = render 'program'
-
-  - if @conference.include_registrations_in_splash?
-    %section{ id: 'registration' }
-      .pad
-        = render 'registration'
-
-
-  -unless @conference.call_for_papers.blank?
-    - if @conference.call_for_papers.include_cfp_in_splash?
-      %section{ id:'callforpapers' }
+            - unless @conference.description.blank?
+              .row-fluid
+                .col-md-12.lead
+                  .lead
+                    = markdown(@conference.description)
+            -unless @conference.photos.blank?
+              = link_to 'Gallery', gallery_photos_conference_path(@conference.short_title), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
+              = render 'gallery'
+    - if @conference.include_program_in_splash?
+      %section{ id: 'program' }
         .pad
-          = render 'call_for_papers'
+          = render 'program'
 
-  -unless @conference.venue.blank?
-    - if @conference.venue.include_venue_in_splash?
-      %section{ id: 'location' }
+    - if @conference.include_registrations_in_splash?
+      %section{ id: 'registration' }
         .pad
-          = render 'location'
-      - unless @conference.venue.lodgings.empty?
-        - if @conference.venue.include_lodgings_in_splash?
-          = render 'lodging'
+          = render 'registration'
 
-  - if @conference.include_sponsors_in_splash?
-    %section{ id: 'sponsors' }
-      .pad
-        = render 'sponsor'
 
-  - if @conference.contact.public?
-    %section{ id: 'social-media' }
-      .pad
-        = render 'social_media'
+    -unless @conference.call_for_papers.blank?
+      - if @conference.call_for_papers.include_cfp_in_splash?
+        %section{ id:'callforpapers' }
+          .pad
+            = render 'call_for_papers'
 
-  = render 'footer'
+    -unless @conference.venue.blank?
+      - if @conference.venue.include_venue_in_splash?
+        %section{ id: 'location' }
+          .pad
+            = render 'location'
+        - unless @conference.venue.lodgings.empty?
+          - if @conference.venue.include_lodgings_in_splash?
+            = render 'lodging'
 
+    - if @conference.include_sponsors_in_splash?
+      %section{ id: 'sponsors' }
+        .pad
+          = render 'sponsor'
+
+    - if @conference.contact.public?
+      %section{ id: 'social-media' }
+        .pad
+          = render 'social_media'
+
+    = render 'footer'