Merge

app/views/admin/events/_events_stats.html.haml

@@ -1,45 +1,42 @@
-.row-fluid
-  .row
-    .span12
-    %h5{:style=>"text-align: right"}
-      = link_to "Events Stats", "#", :id => "events-stats-link",  :class => "btn btn-success"
-
-  #events-stats
-    .span12
-      %table.table.table-bordered.table-striped
-        %thead
-          %th
-          - @mystates.each do |state|
+.row
+  .col-md-12
+    = link_to "Show Events Stats", "#", :id => "events-stats-link",  :class => "btn btn-default pull-right"
+    .clearfix
+    #events-stats
+      .span12
+        %table.table.table-bordered.table-striped
+          %thead
+            %th
+            - @mystates.each do |state|
+              %th{:colspan => 2, :style => "text-align:center"}
+                State "#{state.name}"
             %th{:colspan => 2, :style => "text-align:center"}
-              State "#{state.name}"
-          %th{:colspan => 2, :style => "text-align:center"}
-            Total
-            %br
-            No & Time
-
-        %tr
-          %td
-            %b Total
-            - @mystates.each do |mystate|
-              %td
-                %b
-                  = @eventstats["#{mystate.name}"]["count"]
-              %td
-                %b
-                  #{@eventstats["#{mystate.name}"]["length"] / 60} h #{@eventstats["#{mystate.name}"]["length"] - @eventstats["#{mystate.name}"]["length"] / 60 * 60} m
-            %td
-              %b= @events.count
-            %td
-              %b= show_time(@eventstats["totallength"])
-
-        - @mytypes.each do |mytype|
+              Total
+              %br
+              No & Time
           %tr
-            %td= "#{mytype.title} (#{show_time(mytype.length)})"
-            - @mystates.each do |mystate|
-              %td= @eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_count"] unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
-              %td= show_time(@eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_length"]) unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
-            %td= @eventstats["#{mytype.title}"]["count"]
-            %td= show_time(@eventstats["#{mytype.title}"]["length"])
+            %td
+              %b Total
+              - @mystates.each do |mystate|
+                %td
+                  %b
+                    = @eventstats["#{mystate.name}"]["count"]
+                %td
+                  %b
+                    #{@eventstats["#{mystate.name}"]["length"] / 60} h #{@eventstats["#{mystate.name}"]["length"] - @eventstats["#{mystate.name}"]["length"] / 60 * 60} m
+              %td
+                %b= @events.count
+              %td
+                %b= show_time(@eventstats["totallength"])
+  
+          - @mytypes.each do |mytype|
+            %tr
+              %td= "#{mytype.title} (#{show_time(mytype.length)})"
+              - @mystates.each do |mystate|
+                %td= @eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_count"] unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
+                %td= show_time(@eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_length"]) unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
+              %td= @eventstats["#{mytype.title}"]["count"]
+              %td= show_time(@eventstats["#{mytype.title}"]["length"])
 
 
 :javascript  

app/views/admin/events/_proposal.html.haml

@@ -1,15 +1,14 @@
-.row-fluid
-  .span10
+.row
+  .col-md-12
     %h3
       = @event.title
       %br
-      %span.muted
+      %small
         = @event.subtitle
-  .span2
-    = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini  btn-primary"
+      = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-default pull-right"
 
-.row-fluid
-  .span12
+.row
+  .col-md-12
     %table.table
       %tr
         %td{:style => "width:15%"}
@@ -161,7 +160,7 @@
               = link_to "Delete", conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id),
                 :method => :delete, :confirm => "Are you sure you want to delete this attachment?  It's permanant!"
 
-.row-fluid
+.row
   = link_to "Comments (#{@comment_count})", "#", :id => "event-comment-link"
   #comments-div
     %hr

app/views/admin/events/edit.html.haml

@@ -1,2 +1 @@
-.container
-  = render 'proposal/form'
+= render 'proposal/form'

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

@@ -1,7 +1,7 @@
 = render :partial => "events_stats"
 
-.row-fluid
-  .span12
+.row
+  .col-md-12
     %h2
       Events
       - if @events
@@ -38,7 +38,7 @@
             - if @conference.call_for_papers.rating != 0
               %td{:style => "width:96px"}
                 - if event.average_rating.to_f > 0 
-                  %b #{event.average_rating}/#{@conference.call_for_papers.rating}
+                  #{event.average_rating}/#{@conference.call_for_papers.rating}
                   %br
                   #{pluralize(event.voters.length, 'voter')}
                   %br
@@ -49,7 +49,7 @@
                     - else
                       = label_tag "label_rating", "", :class => "avgrating"
                 - else
-                  Rating: 0/#{@conference.call_for_papers.rating}
+                  0/#{@conference.call_for_papers.rating}
                 %br
 
             - if event.submitter.registrations.count < 1 

app/views/admin/events/show.html.haml

@@ -8,7 +8,7 @@
     #proposal-content.tab-pane.active
       = render 'proposal'
     #history-content.tab-pane
-      .span12
+      .col-md-12
         %table.table
           %thead
             %th