Merge branch 'snap-cloud-master'

app/views/proposals/_proposal_form.html.haml

@@ -27,6 +27,20 @@
 
     = render 'proposals/submission_type_content_form', f: f, program: @program
 
+    -# TODO-SNAPCON: Extract this to be a `conference_committee_role?`
+    - if current_user.has_any_role?(:admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference })
+      %br
+      = f.input :committee_review,
+                input_html: { rows: 5, data: { provide: 'markdown' } },
+                hint: markdown_hint('This field is shared with the submission authors.')
+    - elsif @event.committee_review.present?
+      %br
+      %strong.control-label Committee Review
+      %small
+        Use this feedback to improve your submission.
+      .well
+        = markdown(@event.committee_review)
+
     - if @program.cfp&.enable_registrations?
       = f.inputs 'Enable pre-registration' do
         = f.input :require_registration, label: 'Require participants to register to your event'

app/views/proposals/index.html.haml

@@ -33,10 +33,10 @@
 
     .row
       .col-md-12
-        %p.text-right
-          = link_to '#status-help', class: 'btn btn-default',  "data-toggle"=>"collapse" do
+        -# %p.text-right
+          = link_to '#status-help', class: 'btn btn-default',  "data-toggle": "collapse" do
             Help?
-        .collapse#status-help
+        -# .collapse#status-help
           %p
             %strong
               What happens next with my proposal?
@@ -80,8 +80,11 @@
                     %br
                     = link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger'
 
-              %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
-                = link_to 'Complete your proposal', 'javascript: void(0)', "type"=>"button", "data-trigger"=>"focus", "data-toggle"=>"popover", "title"=>"Your todo list", "data-content"=>"#{render partial: 'tooltip', locals: { event: event} }"
+              -# %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
+                %a{href: '#', type: "button", "data-trigger": "click focus", "data-toggle": "popover",
+                    title: "Your todo list",
+                    "data-content": "#{render 'tooltip', event: event}" }
+                  Complete your proposal
                 - if can? :create, @conference.registrations.new
                   - progress_percentage = event.calculate_progress
                   .progress

app/views/proposals/show.html.haml

@@ -147,3 +147,21 @@
           events_schedules_limit: @events_schedules_limit,
           is_happening_next: @is_happening_next
 
+  - if @event.committee_review.present? || @event.submission_text.present? && can?(:edit, @event)
+    %hr
+    %p Information for event authors only:
+    .panel.panel-info
+      .panel-heading
+        Committee Review
+        %button.btn.btn-primary.btn-xs{ type: "button", 'data-toggle': "collapse", 'data-target': "#committee-panel", 'aria-expanded': "false", 'aria-controls': "committee-panel" }
+          Toggle
+      .panel-body.collapse#committee-panel
+        = markdown(@event.committee_review)
+
+    .panel.panel-info
+      .panel-heading
+        Submission Details
+        %button.btn.btn-primary.btn-xs{ type: "button", 'data-toggle': "collapse", 'data-target': "#submission-panel", 'aria-expanded': "false", 'aria-controls': "submission-panel" }
+          Toggle
+      .panel-body.collapse#submission-panel
+        = markdown(@event.submission_text)