i3426: incorporate feedback from IRMWG (#3436)

app/views/catalog/_report_harmful_language_form.html.erb

@@ -1,7 +1,7 @@
 <div class="modal-body">
   <%= render :partial=>'shared/flash_msg' %>
   <div>
-    <p>Princeton University Library aims to describe materials in a manner that is respectful to all individuals and communities. However, for a variety of reasons, users may encounter offensive or harmful language—for example, language that is racist, sexist, or homophobic–in our catalog.</p>
+    <p>Princeton University Library aims to describe materials in a manner that is respectful to all individuals and communities. However, for a variety of reasons, users may encounter offensive or harmful language—for example, language that is racist, sexist, or homophobic—in our catalog.</p>
 
     <p>Staff are currently implementing practices to address offensive or harmful language, particularly in subject headings. We recognize that terminology evolves over time and that efforts to create respectful and inclusive descriptions and subject headings must be ongoing. You can help us address this issue by reporting any <a href="https://library.princeton.edu/about/languagestatement">harmful or offensive language</a> you encounter on this site by using the form below. If you would prefer to report anonymously, you may leave the name and email fields blank.</p>
   </div>
@@ -12,17 +12,23 @@
         html: { class: "modal_form" }
       ) do |f| 
   %>
-    <%= f.label :name, style: "width: 100%" %><br>
-    <%= f.input_field :name, style: "width: 100%" %><br>
-    <%= f.label :email %><br>
-    <%= f.input_field :email, style: "width: 100%" %><br>
     <%= f.label :message %><br>
     <%= f.input_field :message, as: :text, style: "width: 100%" %><br>
+    <%= f.label :name, style: "width: 100%", label: 'Name (optional)' %><br>
+    <%= f.input_field :name, style: "width: 100%" %><br>
+    <%= f.label :email, label: 'Email (optional)' %><br>
+    <%= f.input_field :email, style: "width: 100%" %><br>
     <h4>You are reporting the use of harmful language in this catalog record:</h4>
-    <%= f.label :title %><br>
-    <%= f.input_field :title, as: :text, readonly: true, style: "width: 100%" %><br>
-    <%= f.label :context %><br>
-    <%= f.input_field :context, readonly: true, style: "width: 100%" %><br>
+    <div class="card">
+      <dl class="card-body dl-horizontal  dl-invert document-details">
+        <dt class="col-md-3">Title</dt>
+        <dd class="col-md-9"><%= f&.object&.title %></dd>
+        <dt class="col-md-3">Context</dt>
+        <dd class="col-md-9"><%= f&.object&.context %></dd>
+      </dl>
+    </div>
+    <%= f.input_field :title, hidden: true %><br>
+    <%= f.input_field :context, hidden: true %><br>
     <%= f.input :feedback_desc, as: :hidden %>
     <div class="modal-footer">
       <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>

spec/system/catalog_show_spec.rb

@@ -135,9 +135,9 @@
       fill_in('Email', with: 'testuser@test-domain.org')
       expect(page).to have_field('Message')
       fill_in('Message', with: 'I am concerned about this subject heading')
-      context_field = page.find_field("report_harmful_language_form[context]", readonly: true)
+      context_field = page.find_field("report_harmful_language_form[context]", visible: :hidden)
       expect(context_field.value).to include("/catalog/#{document_id}")
-      title_field = page.find_field("report_harmful_language_form[title]", readonly: true)
+      title_field = page.find_field("report_harmful_language_form[title]", visible: :hidden)
       expect(title_field.value).to eq("Bible, Latin.")
     end
   end