Merge 200a701861 into a557f3750e

app/controllers/proposal_controller.rb

@@ -134,7 +134,7 @@ class ProposalController < ApplicationController
   end
 
   def show
-
+    @event = Event.find(params[:id])
   end
 
   def confirm

app/models/event.rb

@@ -143,6 +143,12 @@ class Event < ActiveRecord::Base
       self.abstract.split.size
     end
   end
+
+  def type
+    type = EventType.find(self.event_type_id)
+    type if type
+  end
+
   private
 
   def abstract_limit
@@ -171,4 +177,4 @@ class Event < ActiveRecord::Base
     self.guid = guid
   end
 
-end
+end

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

@@ -13,6 +13,12 @@
 .row-fluid
   .span12
     %table.table
+      %tr
+        %td
+          %b Type
+        %td
+          - if @event.type
+            = @event.type.title
       %tr
         %td
           %b State

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

@@ -1,5 +1,11 @@
-%table.table.table-striped.table-bordered.table-hover
+%h2 
+  People
+  - if @people
+    = "(#{@people.length})"
+%table.table.table-striped.table-bordered.table-hover#people
   %thead
+    %th
+      %b Email
     %th
       %b Last Name
     %th
@@ -11,8 +17,16 @@
     %th
   - @people.each do |person|
     %tr
+      %td= person.email
       %td= person.last_name
       %td= person.first_name
       %td= person.public_name
       %td= person.registrations.count
-      %td= link_to "View", admin_person_path(person)
+      %td= link_to "View", admin_person_path(person)
+
+:javascript
+  $(document).ready(function() {
+      $('#people').dataTable( {
+        sPaginationType: "full_numbers"
+      } );
+  } );

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

@@ -4,6 +4,10 @@
       = link_to "Export PDF", admin_conference_registrations_path(@conference.short_title, :format => :pdf), :class => "btn btn-success"
 .row-fluid
   .span12
+    %h2
+      Registrations
+      - if @registrations
+        = "(#{@registrations.length})"
     %table.table.table-striped.table-bordered.table-hover
       %thead
         %th
@@ -45,4 +49,4 @@
           %td
             = link_to "Edit", "#", :class => "btn btn-primary"
           %td
-            = link_to "Delete", "#", :class => "btn btn-danger", :confirm => "Really delete registration for #{registration.public_name}?"
+            = link_to "Delete", "#", :class => "btn btn-danger", :confirm => "Really delete registration for #{registration.public_name}?"

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

@@ -1,7 +1,11 @@
 .container-fluid
   .row-fluid
     .span12
-      %table.table.table-striped.table-bordered.table-hover
+      %h2
+        Users
+        - if @users
+          = "(#{@users.length})"
+      %table.table.table-striped.table-bordered.table-hover#users
         %thead
           %th
             %b Email
@@ -55,3 +59,9 @@
                 "data-content" => user.popup_details,
                 "data-original-title" => ""
 
+:javascript
+  $(document).ready(function() {
+      $('#users').dataTable( {
+        sPaginationType: "full_numbers"
+      } );
+  } );

app/views/proposal/index.html.haml

@@ -18,7 +18,7 @@
           - @events.each do |event|
             %tr
               %td
-                = event.title
+                = link_to event.title, conference_proposal_path(@conference.short_title, event.id)
               %td
                 = event.public_state
                 - if event.confirmed? && !@conference.user_registered?(current_user)

app/views/proposal/show.html.haml

@@ -0,0 +1,84 @@
+.row-fluid
+  .span10
+    %h3
+      = @event.title
+    %i= @event.subtitle
+
+  .span2
+    - if @event.transition_possible? :confirm
+      = link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, @event), :method => :put, :class => "btn btn-mini btn-success"
+    = link_to "Withdraw", conference_proposal_path(@conference.short_title, @event.id), :method => :delete,
+                            :confirm => "Are you sure you want to withdraw this proposal?", :class => "btn btn-mini btn-danger"
+
+.row-fluid
+  .span12
+    %table.table
+      %tr
+        %td
+          %b Type
+        %td
+          - if @event.type
+            = @event.type.title
+      - if !@event.track.nil?
+        %tr
+          %td
+            %b Track
+        %td
+          = @event.track.name
+      - if !@event.room.nil?
+        %tr
+          %td
+            %b Room
+          %td
+            = @event.room.name
+      - if !@event.start_time.nil?
+        %tr
+          %td
+            %b Scheduled time
+          %td
+            = @event.start_time
+      %tr
+        %td
+          %b Submitted on
+        %td= @event.created_at
+      %tr
+        %td
+          %b Last updated on
+        %td= @event.updated_at
+      %tr
+        %td
+          %b Abstract
+        %td= simple_format(@event.abstract)
+      %tr
+        %td
+          %b Description
+        %td= simple_format(@event.description)
+    - if @event.event_attachments.size > 0
+      %table.table
+        %thead
+          %th
+            %b Filename
+          %th
+            %b Title
+          %th
+            %b Size
+          %th
+            %b Public?
+          %th
+        %tbody
+        - @event.event_attachments.each do |a|
+          %tr
+            %td
+              = link_to a.attachment_file_name, conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id)
+            %td
+              = a.title
+            %td
+              = number_to_human_size a.attachment_file_size
+            %td
+              - if a.public?
+                Public
+              - else
+                Not Public
+            %td
+              = 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!"