Merge pull request #960 from alexdor/proposal_page_formating

Groom proposal#show based on issue #731

app/assets/stylesheets/osem.css.scss

@@ -82,3 +82,7 @@ p.comment-body {
 .panel.panel-default .panel-body .notifications p {
   padding-bottom: 20px;
 }
+
+#proposal-info div dt, #proposal-info div dd {
+  display: inline-block;
+}

app/views/proposal/show.html.haml

@@ -13,33 +13,22 @@
           = link_to "Edit", edit_conference_program_proposal_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
   .row
     .col-md-3
-      %p
+      .speakerinfo
-        = simple_format(@event.abstract)
+        .col-md-12
-      %dl
+          = image_tag @speaker.gravatar_url(:size => 200), :class => "img-responsive img-rounded"
-        %dt Date:
+        .col-md-12
-        %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
+          %h3
-        %dt Duration:
+            by
-        %dd= show_time(@event.event_type.length)
+            = link_to @speaker.name, user_path(@speaker.id)
-        %dt Room:
+            = "(#{@speaker.email})"
-        %dd
+            - if @speaker.affiliation?
-          - if @event.room_id
+              %br
-            = @event.room.name
+              %span.muted
-        %dt Conference:
+                from
-        %dd= @event.program.conference.title
+                = @speaker.affiliation
-        %dt Language:
+          -if @speaker.biography?
-        %dd= @event.language if @event.language
+            = simple_format(@speaker.biography)
-        %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
@@ -54,18 +43,38 @@
             %p
             = render partial: 'shared/media_items', locals: { commercials: @event.commercials }
       .row
-        .speakerinfo
+        .col-md-12
-          .col-md-8
+          %p
-            %h3
+            = simple_format(@event.abstract)
-              by
+        %dl#proposal-info
-              = link_to @speaker.name, user_path(@speaker.id)
+          .col-md-12
-              = "(#{@speaker.email})"
+            %dt Date:
-              - if @speaker.affiliation?
+            %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
-                %br
+          .col-md-12
-                %span.muted
+            %dt Duration:
-                  from
+            %dd= show_time(@event.event_type.length)
-                  = @speaker.affiliation
+          .col-md-12
-            -if @speaker.biography?
+            %dt Room:
-              = simple_format(@speaker.biography)
+            %dd
-          .col-md-4
+              - if @event.room_id
-            = image_tag @speaker.gravatar_url(:size => 200), :class => "img-responsive img-rounded"
+                = @event.room.name
+          .col-md-12
+            %dt Conference:
+            %dd= @event.program.conference.title
+          .col-md-12
+            %dt Language:
+            %dd= @event.language if @event.language
+          .col-md-12
+            %dt Track:
+            %dd
+              - if @event.track_id
+                %span.label{:style =>"background-color: #{@event.track.color};"}
+                  = @event.track.name
+          .col-md-12
+            %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"