merged from upstream

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

@@ -9,6 +9,7 @@
     %table.table.table-hover#event_types
       %thead
         %th Title
+        %th Description
         %th Length
         %th Abstract Length
         %th Color
@@ -18,6 +19,8 @@
           %tr
             %td
               = event_type.title
+            %td
+              = event_type.description
             %td
               = event_type.length
               Minutes

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

@@ -54,6 +54,14 @@
                     = javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
                   - else
                     = label_tag "label_rating", "", :class => "avgrating"
+                %br
+                - voted = event.voted?(event, current_user)
+                - if voted
+                  %span.label.label-success
+                    Your rating: #{voted.rating}
+                - else
+                  %span.label.label-danger
+                    Not rated
               - else
                 0/#{@conference.call_for_paper.rating}
               %br

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

@@ -4,6 +4,6 @@
   = q.title
 
   %b A:
-  - registration.qanswers.where(:question_id => q.id).each do |qa|
+  - registration.qanswers.where(question_id: q.id).each do |qa|
     = qa.answer.title
-  %br
+  %br

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

@@ -2,25 +2,17 @@
   .col-md-12
     .page-header
       %h1
-      Edit registration of #{@user.username} for #{@conference.short_title}
+        Registration for #{@user.username}
 .row
-  .col-md-8
-    = semantic_form_for(@registration, :url => admin_conference_registration_path(@conference.short_title, @registration)) do |f|
+  .col-md-6
+    = semantic_form_for(@registration, url: admin_conference_registration_path(@conference.short_title, @registration)) do |f|
       = f.inputs 'Personal Information' do
         = f.fields_for :user do |u|
           = u.input :name, as: :string
           = u.input :nickname, as: :string
           = u.input :affiliation, placeholder: 'Company/User Group/nothing', as: :string
       = f.inputs 'Registration Information' do
-        - @conference.questions.each do |q|
-          %h5
-            = "Q: #{q.title}"
-          - if q.question_type.id == 1  || q.question_type.id == 2 # yes/no or single choice
-            = f.input :qanswers, :collection => q.qanswers, :as => :select, :input_html => { :multiple => false }, :label => false, :include_blank => "Please make your choice",
-                      :member_label => Proc.new {|a| a.answer.title}
-          - if q.question_type.id == 3  # multiple choice
-            = f.input :qanswers, :collection => q.qanswers, :as => :check_boxes, :label => false,
-                      :member_label => Proc.new {|a| a.answer.title}
+        = render partial: 'conference_registrations/registration_info', locals: { f: f }
 
       -# Not necessary
       - if @conference.social_events.count > 0
@@ -28,4 +20,4 @@
           %br Yes, I'll be attending...
           %br
           = f.input :social_events, as: :check_boxes, label: false, collection: @conference.social_events
-      = f.action :submit, button_html: { value: 'Edit Registration', class: 'btn btn-primary' }
+      = f.action :submit, button_html: { class: 'btn btn-primary' }

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

@@ -6,8 +6,8 @@
         = "(#{@registrations.length})" if @registrations
         .btn-group.pull-right
           - if can? :read, Registration
-            = link_to "Export PDF", admin_conference_registrations_path(@conference.short_title, :format => :pdf), :class => "btn btn-default"
-            = link_to "Export XLS", {:format => :xlsx}, :class => "btn btn-default"
+            = link_to 'Export PDF', admin_conference_registrations_path(@conference.short_title, format: :pdf), class: 'btn btn-success'
+            = link_to 'Export XLS', {format: :xlsx}, class: 'btn btn-success'
       %p.text-muted
         All the people who registered to your event
     %table.table.table-hover.datatable#registrations
@@ -32,12 +32,12 @@
               = registration.email
             %td
               - if registration.arrival
-                = registration.arrival.strftime("%d %b %H:%M")
+                = registration.arrival.strftime('%d %b %H:%M')
               - else
                 n/a
             %td
               - if registration.departure
-                = registration.departure.strftime("%d %b %H:%M")
+                = registration.departure.strftime('%d %b %H:%M')
               - else
                 n/a
             -if @conference.questions.any?
@@ -47,7 +47,7 @@
               = check_box_tag "#{@conference.short_title}_#{registration.id}", registration.id, registration.attended,
                 class: 'switch-checkbox', method: :patch,
                 url: toggle_attendance_admin_conference_registration_path(@conference.short_title, id: registration.id)+"?attended=",
-                data: { size: "small",
+                data: { size: 'small',
                         on_color: 'success',
                         off_color: 'warning',
                         on_text: 'Present',
@@ -61,7 +61,7 @@
     .questions{class: "question#{index}", style: 'display:none;'}
       = render partial: 'questions', locals: { registration: registration }
 
-.modal.fade{ id: "questions", 'role' => 'dialog', 'aria-hidden' => 'true' }
+.modal.fade{ id: 'questions', 'role' => 'dialog', 'aria-hidden' => 'true' }
   .modal-dialog
     .modal-content
       .modal-header