From 0e74c2e2962b274ff8c7b614fd46db88f8d6eb72 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Thu, 15 Apr 2021 22:31:46 -0700
Subject: [PATCH] Minor tidying up

---
 app/views/admin/events/_proposal.html.haml   | 9 +++------
 app/views/proposals/_proposal_form.html.haml | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml
index 7f6141ef..7fe086b1 100644
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@@ -73,9 +73,7 @@
           %td
             = link_to @event.submitter.name, admin_user_path(@event.submitter)
             - if @event.submitter.email_public
-              (
-              = link_to @event.submitter.email, "mailto: #{@event.submitter.email}"
-              )
+              = "(#{mail_to(@event.submitter.email)})"
         %tr
           %td
             %b Speakers
@@ -84,9 +82,7 @@
               %div
                 = link_to speaker.name, admin_user_path(speaker)
                 - if speaker.email_public
-                  (
-                  = link_to speaker.email, "mailto: #{speaker.email}"
-                  )
+                  = "(#{mail_to(speaker.email)})"
         %tr
           %td
             %b Volunteers
@@ -117,6 +113,7 @@
           %td
             %b Submission Description
           %td= markdown(@event.submission_text)
+
         %tr
           %td
             %b Requirements
diff --git a/app/views/proposals/_proposal_form.html.haml b/app/views/proposals/_proposal_form.html.haml
index eb03e9fa..f5ef752f 100644
--- a/app/views/proposals/_proposal_form.html.haml
+++ b/app/views/proposals/_proposal_form.html.haml
@@ -28,9 +28,10 @@
     = 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 }
+    - read_only = !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' } },
+      = f.input :committee_review,
+                input_html: { rows: 5, data: { provide: 'markdown' }, readonly: read_only },
                 hint: markdown_hint('This field is shared with the submission authors.')
 
     - if @program.cfp&.enable_registrations?