show questionnaire and exhibits only when they are present

app/assets/javascripts/trix.js

@@ -1,30 +1,4 @@
 // Do not allow file attachments in rich text content
 addEventListener("trix-file-accept", function(event) {
   event.preventDefault();
-});
-
-Trix.config.textAttributes.underline = {
-    style: { "textDecoration": "underline" },
-    inheritable: true,
-    parser: function (element) {
-        var style = window.getComputedStyle(element);
-        return style.textDecoration === "underline";
-    }
-}
-
-document.addEventListener('trix-initialize', function (e) {
-    const trix = e.target;
-    const toolBar = trix.toolbarElement;
-
-    // // Creation of the button
-    const button = document.createElement("button");
-    button.setAttribute("type", "button");
-    button.setAttribute("class", "trix-button trix-button--icon trix-button--icon-underline");
-    button.setAttribute("data-trix-attribute", "underline");
-    button.setAttribute("title", "underline");
-    button.setAttribute("tabindex", "-1");
-    button.innerText = "U";
-
-    // Attachment of the button to the toolBar
-    toolBar.querySelector('.trix-button-group--text-tools').appendChild(button);
-});
+})

app/assets/stylesheets/application.scss

@@ -461,10 +461,3 @@ a[data-behavior=seekable-timecode] {
   border-color: transparent;
   border-bottom: 3px solid #ff0000;
 }
-
-//Trix underline style
-trix-toolbar {
-  .trix-button--icon-underline::before {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 17c3.31 0 6-2.69 6-6V3h-2.5v8c0 1.93-1.57 3.5-3.5 3.5S8.5 12.93 8.5 11V3H6v8c0 3.31 2.69 6 6 6zm-7 2v2h14v-2H5z'/%3E%3C/svg%3E");
-  }
-}

app/assets/stylesheets/contract_pdf.scss

@@ -48,10 +48,6 @@ u {
   margin-right: -30px;
 }
 
-.embed-person-photo {
-  text-align: right;
-}
-
 .do-not-copy-warning {
   padding-right: 15px;
 }

app/controllers/contracts_controller.rb

@@ -3,7 +3,7 @@ class ContractsController < ApplicationController
     respond_to do |format|
       format.pdf { send_contract_pdf }
 
-      if Rails.env.development? || Rails.env.test?
+      if Rails.env.development?
         format.html { render_sample_html }
       end
     end

app/views/contracts/_logo_page.html.erb

@@ -1,37 +0,0 @@
-<% has_logo = local_assigns[:logo] %>
-<% has_user_photo = releasable.model_name == "AppearanceRelease" && releasable.person_photo.attached? %>
-
-<% if has_logo || has_user_photo %>
-  <table class="heading-table">
-    <tr>
-      <td>
-        <% if has_logo %>
-          <div class="logo">
-            <%= render "blank_contracts/logo", logo: logo %>
-          </div>
-        <% end %>
-      </td>
-      <td class="embed-person-photo">
-        <% if has_user_photo %>
-          <%= image_tag releasable.photos.first.variant(auto_orient: true, resize: "200x200"), id: "top-person-photo" %>
-        <% end %>
-      </td>
-    </tr>
-  </table>
-
-  <hr>
-<% end %>
-
-<% if preview %>
-  <h1>PREVIEW ONLY</h1>
-<% end %>
-
-<% if contract_template.body.present? %>
-  <%= contract_template.body %>
-  <br/>
-<% end %>
-
-<% if releasable.minor? && contract_template.guardian_clause.present? %>
-  <p class="text-left"><strong>Guardian Clause</strong></p>
-  <%= contract_template.guardian_clause %>
-<% end %>

app/views/contracts/pdf.html.erb

@@ -1,10 +1,19 @@
-<% logo = local_assigns[:logo] ? local_assigns[:logo] : nil %>
-
-<% if logo || (releasable.model_name == 'AppearanceRelease' && releasable.person_photo.attached?) ||
-    contract_template.body.present? || (releasable.minor? && contract_template.guardian_clause.present?) %>
-  <div class="page">
-    <%= render "contracts/logo_page", logo: logo, preview: preview, releasable: releasable, contract_template: contract_template %>
+<% if local_assigns[:logo] %>
+  <div class="logo">
+    <%= render "contracts/logo", logo: logo %>
   </div>
+  <hr>
+<% end %>
+<% if preview %>
+  <h1>PREVIEW ONLY</h1>
+<% end %>
+<% if contract_template.body.present? %>
+  <%= contract_template.body %>
+  <br/>
+<% end %>
+<% if releasable.minor? && contract_template.guardian_clause.present? %>
+  <p class="text-left"><strong>Guardian Clause</strong></p>
+  <%= contract_template.guardian_clause %>
 <% end %>
 
 <% if contract_template.present? && contract_template.has_questionnaire? %>

spec/features/user_manages_contract_templates_spec.rb

@@ -386,13 +386,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(ct.signature_legal_text.id).not_to eq ContractTemplate.last.signature_legal_text.id
   end
 
-  scenario 'trix editor has underline button', js: true do
-    visit new_project_contract_template_path(project)
-
-    select 'Appearance Release', from: 'Release type'
-    expect(page).to have_selector("button[data-trix-attribute='underline']")
-  end
-
   context 'When the user is associate' do
     let(:current_user) { create(:user, :associate) }
 

spec/features/user_managing_appearance_releases_spec.rb

@@ -675,24 +675,6 @@ feature 'User managing appearance releases' do
       expect(pdf_body).to have_content appearance_release.exhibit_b_answer
     end
 
-    scenario "viewing the contract PDF - it shows person photo on first page if person photo is attached" do
-      appearance_release = create(:appearance_release_with_contract_template, :native, :minor_with_guardian_photo, project: project)
-
-      visit view_release_pdf_html_preview_link_for(appearance_release)
-
-      person_photo_url = url_for(appearance_release.person_photo.variant(auto_orient: true, resize: "200x200")).to_s
-      expect(page).to have_selector("#top-person-photo[src^='#{person_photo_url}']")
-    end
-
-    scenario "viewing the contract PDF - it shows person photo on first page if person photo is attached" do
-      appearance_release = create(:appearance_release_with_contract_template, :native, :minor_with_guardian_photo, project: project)
-
-      visit view_release_pdf_html_preview_link_for(appearance_release)
-
-      person_photo_url = url_for(appearance_release.person_photo.variant(auto_orient: true, resize: "200x200")).to_s
-      expect(page).to have_selector("#top-person-photo[src^='#{person_photo_url}']")
-    end
-
     scenario 'deleting a release', js: true do
       appearance_release = create(:appearance_release, project: project)
 
@@ -1029,10 +1011,6 @@ feature 'User managing appearance releases' do
     ['Download', href: appearance_release_contracts_path(appearance_release, format: 'pdf')]
   end
 
-  def view_release_pdf_html_preview_link_for(appearance_release)
-    appearance_release_contracts_path(appearance_release)
-  end
-
   def successful_submission_message
     'Your release was successfully submitted. Thank you.'
   end