Upstream sync

app/views/contract_templates/_form.html.erb

@@ -15,11 +15,6 @@
     <%= render "shared/exploitable_rights_fields", form: form %>
     <hr>
   <% end %>
-  
-  <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
-    <%= render "shared/custom_fields", form: form %>
-    <hr>
-  <% end %>
 
   <%= field_set_tag content_tag(:span, t(".legal.heading"), class: "h6 text-muted text-uppercase") do %>
     <%= form.form_group do %>
@@ -31,6 +26,12 @@
       <% end %>
     </div>
   <% end %>
+  
+  <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
+    <p class="alert alert-info"><%= fa_icon("info-circle", text: t(".custom_fields.instructions")) %></p>
+    <%= render "shared/custom_fields", form: form %>
+    <hr>
+  <% end %>
 
   <div class="row align-items-center text-center mt-4">
     <%= link_to t("shared.cancel"), [project, :contract_templates], class: "col-3 text-reset" %>

app/views/public/medical_releases/new.html.erb

@@ -49,7 +49,7 @@
       <% end %>
 
       <div class="mt-5">
-        <%= form.button t("shared.submit_release_long"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
+        <%= form.button t("shared.submit_release_short"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
       </div>
     <% end %>
   </div>

config/locales/en.yml

@@ -213,7 +213,8 @@ en:
       archived_notice: The release template has been archived
     form:
       custom_fields:
-        heading: Custom Fields
+        heading: Medical Questionnaire
+        instructions: Please list the questions you wish the signer to answer. Any unused question fields will be hidden.
       exploitable_rights:
         heading: Exploitable Rights
       legal:
@@ -326,7 +327,10 @@ en:
       appearance_release:
         minor: Is the person a minor?
         person_address: Address
+        person_date_of_birth: Date of birth
         person_email: Email address
+        person_first_name: First name
+        person_last_name: Last name
         person_name: Name
         person_phone: Phone number
       location_release:
@@ -791,17 +795,17 @@ en:
           instructions: >
             Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese!
         instructions_html: >
-          Congrats in appearing on <em>%{name}</em>. Below is the appearance release form. After scrolling down and reading the appearance release form, please enter your personal information, take a selfie photo, and press the "Submit Release" button.
+          Congrats on appearing in <em>%{name}</em>. After scrolling down and reading the appearance release form, please enter your personal information, take a selfie photo and press the "Submit Release" button. If the person appearing on camera is a minor, you will enter their personal information first, select the button noting this person is a minor, and then enter your own personal info under "Guardian Information" at the bottom.
         legal:
           heading: Legal
         personal_info:
           heading: Personal Information
-          instructions: Now, enter your personal information.
+          instructions: Enter the personal information for the person appearing on camera.
         photo:
           camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
-          heading: Take a Photo
+          heading: Photo of Person Appearing on Camera
           instructions: >
-            Lastly, it's time for you to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese!
+            'Before you take your selfie photo, remove your hat and sunglasses (regular eyewear is okay). Make sure you are the only person in the frame, look straight at the camera and snap the photo. NOTE: If you are a Guardian, you must take the photo of the minor. Minor photo is required only for record keeping purposes to maintain proof of parental consent and to identify minor within the Program.'
           no_photo: No photo yet
           take_photo: Take Photo
           warning: If your photo appears sideways, it will be autocorrected when you submit your release.
@@ -944,6 +948,7 @@ en:
     search: Search
     submit_release: Submit Release
     submit_release_long: I have read and agree to the above
+    submit_release_short: Submit
     suite: Suite
     tag_multiple_releases: Add Tag
     tag_multiple_releases_form:

config/locales/es.yml

@@ -52,6 +52,15 @@ es:
     blank_contracts:
       create:
         number_of_copies_invalid_notice: Please enter valid number greater than 0 (ES)
+    form:
+      custom_fields:
+        heading: Medical Questionnaire (ES)
+      exploitable_rights:
+        heading: Exploitable Rights (ES)
+      legal:
+        heading: Legal (ES)
+      release_info:
+        heading: Release Info (ES)
   contracts:
     photos:
       guardian_photo_heading: Guardian photo (ES)

spec/features/user_managing_appearance_releases_spec.rb

@@ -479,11 +479,11 @@ feature 'User managing appearance releases' do
   end
 
   def person_first_name_field
-    'Person first name'
+    t('helpers.label.appearance_release.person_first_name')
   end
 
   def person_last_name_field
-    'Person last name'
+    t('helpers.label.appearance_release.person_last_name')
   end
 
   def person_address_field