Moved to the bootstrap-sass gem, lot's of styling issues fixed

app/views/proposal/_form.html.haml

@@ -1,35 +1,36 @@
-.tabbable
-  %ul.nav.nav-tabs
-    %li.active
-      = link_to "Proposal", "#proposal-content", "data-toggle"=>"tab"
-    %li
-      = link_to "Attachments", "#attachment-content", "data-toggle"=>"tab"
-  .tab-content
-    #proposal-content.tab-pane.active
-      = render 'proposal/proposal_form'
-    #attachment-content.tab-pane
-      .span12
-        = form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event),
-                                        :html => { :multipart => true, :id => "fileupload"  } do |f|
-          %table.table.table-striped
-            %thead
-              %th
-              %th
-                %b Filename
-              %th
-                %b Title
-              %th
-                %b Size
-              %th
-                %b Public
-              %th
-            %tbody.files
-          .row-fluid.fileupload-buttonbar
-            .btn.btn-success.fileinput-button
-              %i.icon-plus.icon-white
-              Add files...
-              = f.file_field :attachment
-              = f.hidden_field :event_id, :value => @event.id
+.row
+  .span12
+    .tabbable
+      %ul.nav.nav-tabs
+        %li.active
+          = link_to "Proposal", "#proposal-content", "data-toggle"=>"tab"
+        %li
+          = link_to "Attachments", "#attachment-content", "data-toggle"=>"tab"
+      .tab-content
+        #proposal-content.tab-pane.active
+          = render 'proposal/proposal_form'
+        #attachment-content.tab-pane
+          .span12
+            = form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event), :html => { :multipart => true, :id => "fileupload"  } do |f|
+              %table.table.table-striped
+                %thead
+                  %th
+                  %th
+                    %b Filename
+                  %th
+                    %b Title
+                  %th
+                    %b Size
+                  %th
+                    %b Public
+                  %th
+                %tbody.files
+              .row-fluid.fileupload-buttonbar
+                .btn.btn-success.fileinput-button
+                  %i.icon-plus.icon-white
+                  Add files...
+                  = f.file_field :attachment
+                  = f.hidden_field :event_id, :value => @event.id
 
 :javascript
   $(document).ready( function() {

app/views/proposal/new.html.haml

@@ -1,5 +1,6 @@
-.container
-  .row
-    .span12
-      = simple_format(@conference.call_for_papers.description)
-  = render 'proposal_form'
+.row
+  .span12
+    = simple_format(@conference.call_for_papers.description)
+.row
+  .span12
+    = render 'proposal_form'

app/views/proposal/show.html.haml

@@ -1,44 +1,51 @@
+.row
+  .span12
+    %h2
+      = @event.title
+      - if @event.subtitle
+        %br
+        %span.muted
+          = @event.subtitle
 .row-fluid
   .span3
-    = image_tag @event.submitter.gravatar_url(:size => 200), :class => "img-rounded"
-    %h3
-      = @event.submitter.public_name
-      - if @event.submitter.company
-        %br
-        %span.muted= @event.submitter.company
-    -if @event.submitter.biography
-      %p= @event.submitter.biography
+    %p
+      = simple_format(@event.abstract)
+    %dl
+      %dt Date:
+      %dd= @event.start_time.strftime("%Y %B %e")
+      %dt Conference:
+      %dd= @event.conference.title
+      - if @event.language
+        %dt Language:
+        %dd= @event.language
+      - if @event.track_id
+        %dt Track:
+        %dd
+          %span.label
+            = @event.track.name
   .span9
     .row-fluid
       .span12
-        %h3.muted
-          Video coming soon! Meanwhile...
+        -unless @event.video_id
+          %h5.text-error
+            No video of the event yet, sorry! Meanwhile...
     .row-fluid
       .span12.flexvideo
-        %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/Eiv4e5ZxTmg"}
+        -if @event.video_id
+          %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/#{@event.video_id}?rel=0"}
+        -else
+          %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/Eiv4e5ZxTmg?rel=0"}
     .row-fluid
-      .span8
-        %h2
-          = @event.title
-          - if @event.subtitle
+      .span12
+        = image_tag @event.submitter.gravatar_url(:size => 200), :class => "img-rounded pull-right"
+        %h3
+          by
+          = @event.submitter.public_name
+          - if @event.submitter.company
             %br
             %span.muted
-              = @event.subtitle
-        %p
-          = simple_format(@event.abstract)
-      .span4
-        %dl
-          %dt Speaker:
-          %dd= @event.submitter.public_name
-          %dt Date:
-          %dd= @event.start_time.strftime("%Y %B %e")
-          - if @event.language
-            %dt Language:
-            %dd= @event.language
-          %dt Conference:
-          %dd= @event.conference.title
-          - if @event.track_id
-            %dt Track:
-            %dd
-              %span.label
-                = @event.track.name
+              from
+              = @event.submitter.company
+        -if @event.submitter.biography
+          = simple_format(@event.submitter.biography)
+