Integrate the splash page into the general layout

* Cleanup the CSS * Fix more views then you have fingers and toes * Introduce position(weight) for sponsor levels * Fix bootstrap/datatable integration
2014-11-14 11:58:36 +01:00 · 2014-11-14 11:58:36 +01:00 · f2cdea4f1a
commit f2cdea4f1a
parent 7acd16f923
56 changed files with 1191 additions and 1266 deletions
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@ -1,71 +1,72 @@
-.row
-  .col-md-12.page-header
-    %h2
-      = @event.title
-      - if @event.subtitle
-        %br
-        %small
-          = @event.subtitle
-      = link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success pull-right"
-      - if can? :edit, @event
-        = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
-.row
-  .col-md-3
-    %p
-      = simple_format(@event.abstract)
-    %dl
-      %dt Date:
-      %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
-      %dt Duration:
-      %dd= show_time(@event.event_type.length)
-      %dt Room:
-      %dd
-        - if @event.room_id
-          = @event.room.name
-      %dt Conference:
-      %dd= @event.conference.title
-      %dt Language:
-      %dd= @event.language if @event.language
-      %dt Track:
-      %dd
-        - if @event.track_id
-          %span.label{:style =>"background-color: #{@event.track.color};"}
-            = @event.track.name
-      %dt Difficulty:
-      %dd
-        - if @event.difficulty_level_id
-          %span.label{:style =>"background-color: #{@event.difficulty_level.color};"}
-            = @event.difficulty_level.title
-    - if @event.require_registration
-      = link_to "Registration required!", new_conference_conference_registrations_path(@conference.short_title), :class => "btn btn-xs btn-warning"
-  .col-md-9
-    .row
-      .col-md-12
-        - if @event.commercials.empty?
-          %h5.text-warning
-            No video of the event yet, sorry!
+.container
+  .row
+    .col-md-12.page-header
+      %h2
+        = @event.title
+        - if @event.subtitle
+          %br
+          %small
+            = @event.subtitle
+        = link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success pull-right"
+        - if can? :edit, @event
+          = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
+  .row
+    .col-md-3
+      %p
+        = simple_format(@event.abstract)
+      %dl
+        %dt Date:
+        %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
+        %dt Duration:
+        %dd= show_time(@event.event_type.length)
+        %dt Room:
+        %dd
+          - if @event.room_id
+            = @event.room.name
+        %dt Conference:
+        %dd= @event.conference.title
+        %dt Language:
+        %dd= @event.language if @event.language
+        %dt Track:
+        %dd
+          - if @event.track_id
+            %span.label{:style =>"background-color: #{@event.track.color};"}
+              = @event.track.name
+        %dt Difficulty:
+        %dd
+          - if @event.difficulty_level_id
+            %span.label{:style =>"background-color: #{@event.difficulty_level.color};"}
+              = @event.difficulty_level.title
+      - if @event.require_registration
+        = link_to "Registration required!", new_conference_conference_registrations_path(@conference.short_title), :class => "btn btn-xs btn-warning"
+    .col-md-9
+      .row
+        .col-md-12
+          - if @event.commercials.empty?
+            %h5.text-warning
+              No video of the event yet, sorry!
+              - unless @conference.commercials.empty?
+                Meanwhile...
            - unless @conference.commercials.empty?
-              Meanwhile...
-          - unless @conference.commercials.empty?
-            = render partial: 'shared/media_items', locals: { commercials: @conference.commercials }
-        - else
-          %p
-          = render partial: 'shared/media_items', locals: { commercials: @event.commercials }
-    .row
-      .speakerinfo
-        .col-md-8
-          %h3
-            by
-            = @speaker.name
-            (
-            = @speaker.email
-            )
-            - if @speaker.affiliation?
-              %br
-              %span.muted
-                from
-                = @speaker.affiliation
-          -if @speaker.biography?
-            = simple_format(@speaker.biography)
-        .col-md-4
-          = image_tag @speaker.gravatar_url(:size => 200), :class => "img-responsive img-rounded"
+              = render partial: 'shared/media_items', locals: { commercials: @conference.commercials }
+          - else
+            %p
+            = render partial: 'shared/media_items', locals: { commercials: @event.commercials }
+      .row
+        .speakerinfo
+          .col-md-8
+            %h3
+              by
+              = @speaker.name
+              (
+              = @speaker.email
+              )
+              - if @speaker.affiliation?
+                %br
+                %span.muted
+                  from
+                  = @speaker.affiliation
+            -if @speaker.biography?
+              = simple_format(@speaker.biography)
+          .col-md-4
+            = image_tag @speaker.gravatar_url(:size => 200), :class => "img-responsive img-rounded"