Merge pull request #862 from psu-libraries/856-remove-heading-honors

856 remove heading honors
psu-libraries · Oct 31, 2024 · 6fb21e5 · 6fb21e5
2 parents 73a5b72 + cfd697f
commit 6fb21e5
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 50 deletions.
diff --git a/app/views/admin/submissions/edit/_admin_feedback_files.html.erb b/app/views/admin/submissions/edit/_admin_feedback_files.html.erb
@@ -19,4 +19,3 @@
   <% end %>
   </div>
 </div>
-
diff --git a/app/views/admin/submissions/edit/_federal_funding_language_admin.html.erb b/app/views/admin/submissions/edit/_federal_funding_language_admin.html.erb
@@ -2,4 +2,4 @@
     <strong>Federal Funding Statement</strong>
     <br>
     <%= render partial: 'shared/federal_funding_form', locals: {f: f} %>
-</div>
+</div>
diff --git a/app/views/approver/_federal_funding_language_approver.html.erb b/app/views/approver/_federal_funding_language_approver.html.erb
@@ -3,40 +3,39 @@
     <strong>Federal Funding Statement</strong>
     <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.intro_1").html_safe %></p>
     <%= f.label :federal_funding_used, I18n.t("#{current_partner.id}.federal_funding_admin.question_1").html_safe %><br>
-    <%= f.label :federal_funding_used, 'Yes'%>
+    <%= f.label :federal_funding_used, 'Yes' %>
     <%= f.radio_button :federal_funding_used, true %><br>
     <div class="ml-5 collapse hide" id="fed_funding_confirmation_approver" aria-live="polite">
         <% if @submission.federal_funding == false %>
           <div class='alert alert-danger'>
-            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%></p>
+            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %></p>
           </div>
         <% else %>
         <div class='alert alert-info'>
-        <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe%></p>
-                <%= f.label :federal_funding_confirmation, 'Yes'%>
+        <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe %></p>
+                <%= f.label :federal_funding_confirmation, 'Yes' %>
                 <%= f.radio_button :federal_funding_confirmation, true %><br>
-                <%= f.label :federal_funding_confirmation, 'No'%>
+                <%= f.label :federal_funding_confirmation, 'No' %>
                 <%= f.radio_button :federal_funding_confirmation, false %>
             </div>
-        <p id="fed_funding_error_approver" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%></p>
+        <p id="fed_funding_error_approver" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %></p>
         <% end %>
     </div>
     <noscript>
         <div class="ml-5">
             <% if @submission.federal_funding == false %>
-            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_1").html_safe%></p>
+            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_1").html_safe %></p>
             <% else %>
             <div>
-            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe%></p>
-                    <%= f.label :federal_funding_confirmation, 'Yes'%>
+            <p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe %></p>
+                    <%= f.label :federal_funding_confirmation, 'Yes' %>
                     <%= f.radio_button :federal_funding_confirmation, true %><br>
-                    <%= f.label :federal_funding_confirmation, 'No'%>
+                    <%= f.label :federal_funding_confirmation, 'No' %>
                     <%= f.radio_button :federal_funding_confirmation, false %>
             </div>
             <% end %>
         </div>
     </noscript>
-    <%= f.label :federal_funding_used, 'No'%>
+    <%= f.label :federal_funding_used, 'No' %>
     <%= f.radio_button :federal_funding_used, false %>
 </div>
-
diff --git a/app/views/approver/_review_form.html.erb b/app/views/approver/_review_form.html.erb
@@ -5,7 +5,7 @@
       <div id="file_links">
         <%= raw @most_relevant_file_links %>
       </div>
-      <br/>
+      <br>
        <% if current_partner.graduate? && @committee_member == @submission.advisor %>
         <%= f.label :federal_funding_used, 'Were Federal Funds utilized for this submission?'.html_safe %>
         <div class="alert alert-info">
@@ -24,7 +24,7 @@
                       wrapper: :vertical_radio_and_checkboxes,
                       label: false %>
         <% end %>
-        <br/>
+        <br>
       <% end %>
       <strong>Approval</strong>
       <p>I accept and approve <%= @author.full_name %>'s <%= @submission.degree.degree_type.name.to_s.downcase %> and agree to distribution as indicated by the access level.</p>
@@ -35,7 +35,7 @@
                   label: false %>
       </div>
       <%= f.input :notes, :label => "Notes for Student (required only if rejecting)", :input_html => { :class => 'notes_select' } %>
-     
+
       <div class="form-group actions col-xs-4">
         <%= f.button :submit, "Submit Review", class: 'btn-success' %>
         <% if @review_complete %>

diff --git a/app/views/author/submissions/_federal_funding_introduction.html.erb b/app/views/author/submissions/_federal_funding_introduction.html.erb
@@ -12,4 +12,4 @@
     <li><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_4_3").html_safe %></li>
 </ol>
 <p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_5").html_safe %></p>
-<p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %></p>
+<p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %></p>
diff --git a/app/views/author/submissions/_federal_funding_language_author.html.erb b/app/views/author/submissions/_federal_funding_language_author.html.erb
@@ -5,4 +5,3 @@
     <br>
     <%= render partial: 'shared/federal_funding_form', locals: {f: f} %>
 </div>
-
diff --git a/app/views/author/submissions/_submissions.html.erb b/app/views/author/submissions/_submissions.html.erb
@@ -28,5 +28,5 @@
     </div>
   <% end %>
 
-  <%= render 'new_submission_button' unless current_partner.graduate? || (current_partner.honors? && !admin?) %>
+  <%= render 'new_submission_button' unless current_partner.graduate? || (current_partner.honors?) %>
 </div>
diff --git a/app/views/author/submissions/acknowledge.html.erb b/app/views/author/submissions/acknowledge.html.erb
@@ -2,34 +2,34 @@
     <h1><%= I18n.t("graduate.submission.acknowledge.title") %></h1>
     <div class="col-xs-12">
       <p class="mt-3"><%= I18n.t("graduate.submission.acknowledge.description") %> </p>
-      <%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %>  
-        <div class="form-group actions col-xs-6">          
+      <%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %>
+        <div class="form-group actions col-xs-6">
           <%= form.label :sig_1, I18n.t("graduate.submission.acknowledge.point1", degree_type: @degree_type, thesis_guide: I18n.t("graduate.partner.thesis_guide")).html_safe %>
           <%= form.input :sig_1, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial").html_safe %>
-          <%= form.label :sig_2, I18n.t("graduate.submission.acknowledge.point2", degree_type: @degree_type.capitalize)  %>
+          <%= form.label :sig_2, I18n.t("graduate.submission.acknowledge.point2", degree_type: @degree_type.capitalize) %>
           <%= form.input :sig_2, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
           <%= form.label :sig_3, I18n.t("graduate.submission.acknowledge.point3", degree_type: @degree_type) %>
           <%= form.input :sig_3, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
-          <%= form.label :sig_4, I18n.t("graduate.submission.acknowledge.point4")  %>
+          <%= form.label :sig_4, I18n.t("graduate.submission.acknowledge.point4") %>
           <%= form.input :sig_4, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
-          <%= form.label :sig_5, I18n.t("graduate.submission.acknowledge.point5", degree_type: @degree_type)  %>
+          <%= form.label :sig_5, I18n.t("graduate.submission.acknowledge.point5", degree_type: @degree_type) %>
           <%= form.input :sig_5, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
-          <%= form.label :sig_6, I18n.t("graduate.submission.acknowledge.point6")  %>
+          <%= form.label :sig_6, I18n.t("graduate.submission.acknowledge.point6") %>
           <%= form.input :sig_6, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
           <%= form.label :sig_7, I18n.t("graduate.submission.acknowledge.point7") %>
           <%= form.input :sig_7, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
           <% if @submission.degree_type.slug == 'master_thesis' %>
             <%= form.label :sig_8, I18n.t("graduate.submission.acknowledge.point8_masters") %>
-            <%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type)  if @submission.author.confidential_hold?%>
+            <%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type)  if @submission.author.confidential_hold? %>
             <%= form.input :sig_8, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
           <% else %>
             <%= form.label :sig_8, I18n.t("graduate.submission.acknowledge.point8_dissertation") %>
-            <%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type)  if @submission.author.confidential_hold?%>
+            <%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type)  if @submission.author.confidential_hold? %>
             <%= form.input :sig_8, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
           <% end %>
           <%= form.button :submit, class: "btn-primary", value: "Submit" %>
           <%= link_to "Cancel", author_root_path, class: 'btn btn-light' %>
         </div>
       <% end %>
     </div>
-  </div>
+  </div>
diff --git a/app/views/author/submissions/edit_final_submission.html.erb b/app/views/author/submissions/edit_final_submission.html.erb
@@ -37,12 +37,12 @@
       <div id="admin-feedback-files" class="col-sm-12">
         <% @submission.admin_feedback_files.each do |file| %>
         <% if file.feedback_type == 'final-submission' %>
-          <div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
+          <div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
             <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}",  class: 'file-link', target: '_blank' %>
           </div>
         <% end %>
       <% end %>
-  <% end  %>
+  <% end %>
 
       <%= render partial: 'title_and_checkbox', locals: {f: f} %>
       <%= render partial: 'semester_year', locals: {f: f} %>

diff --git a/app/views/author/submissions/edit_format_review.html.erb b/app/views/author/submissions/edit_format_review.html.erb
@@ -18,18 +18,18 @@
             </div>
           </div>
       <% end %>
-      
+
       <% if @submission.format_review_feedback_files? %>
           <div id="admin-feedback-files" class="col-sm-12">
             <% @submission.admin_feedback_files.each do |file| %>
             <% if file.feedback_type == 'format-review' %>
-              <div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
+              <div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
                 <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}",  class: 'file-link', target: '_blank' %>
               </div>
             <% end %>
           <% end %>
-          </div>  
-      <% end  %>
+          </div>
+      <% end %>
 
       <%= render partial: '/author/submissions/title_and_checkbox', locals: {f: f} %>
       <%= render partial: '/author/submissions/semester_year', locals: {f: f} %>

diff --git a/app/views/author/submissions/format_review.html.erb b/app/views/author/submissions/format_review.html.erb
@@ -18,7 +18,7 @@
     <% end %>
 
     <% @submission.admin_feedback_files.each do |file| %>
-    <div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
+    <div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
       <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}",  class: 'file-link', target: '_blank' %>
     </div>
   <% end %>

diff --git a/app/views/author/submissions/index.html.erb b/app/views/author/submissions/index.html.erb
@@ -2,7 +2,9 @@
   <h1>The Submission Process </h1>
   <div class="col-xs-12">
     <br>
-    <p class="thesis_info">Upload your thesis/dissertation to the eTD website for format review, including your front matter, back matter and at least 3 chapters. The Office of Theses and Dissertations will check the format review and email you a PDF with comments. When all corrections are made submit the final by the final submission deadline, no changes can be made after the final is submitted.  </p>
+    <% unless current_partner.honors? %>
+      <p class="thesis_info">Upload your thesis/dissertation to the eTD website for format review, including your front matter, back matter and at least 3 chapters. The Office of Theses and Dissertations will check the format review and email you a PDF with comments. When all corrections are made submit the final by the final submission deadline, no changes can be made after the final is submitted.  </p>
+    <% end %>
     <% if current_partner.graduate? %>
       <p class="thesis_info">There is a <strong>one-time</strong> fee for each thesis and/or dissertation submission required prior to the final submission of the thesis or dissertation.  The fee can be paid at the <a href='https://secure.gradsch.psu.edu/paymentportal/' target='_blank'>Payment Section</a> of the Fox Graduate School Thesis and Dissertation Information <a href='https://gradschool.psu.edu/completing-your-degree/thesis-and-dissertation-information/' target='_blank'>webpage</a>.  You will not be permitted to submit your final document unless the fee is paid.</p>
     <% end %>

diff --git a/app/views/shared/_federal_funding_form.html.erb b/app/views/shared/_federal_funding_form.html.erb
@@ -1,40 +1,39 @@
 <div tabindex="0">
     <%= f.simple_fields_for :federal_funding_details, @submission.federal_funding_details do |g| %>
         <%= g.label :training_support_funding, I18n.t("#{current_partner.id}.federal_funding_author.question_1").html_safe %>
-        <%= g.label :training_support_funding, 'Yes'%>
+        <%= g.label :training_support_funding, 'Yes' %>
         <%= g.radio_button :training_support_funding, true %><br>
 
         <div id="fed_funding_confirmation_author_1" class="ml-5 collapse hide" aria-live="polite">
             <div class="alert alert-info">
-            <p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe%></p>
-            <%= g.label :training_support_acknowledged, 'Yes'%>
+            <p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %></p>
+            <%= g.label :training_support_acknowledged, 'Yes' %>
             <%= g.radio_button :training_support_acknowledged, true %><br>
-            <%= g.label :training_support_acknowledged, 'No'%>
+            <%= g.label :training_support_acknowledged, 'No' %>
             <%= g.radio_button :training_support_acknowledged, false %>
             </div>
-            <p id="fed_funding_error_message_author_1" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%></p>
+            <p id="fed_funding_error_message_author_1" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %></p>
         </div>
 
-        <%= g.label :training_support_funding, 'No'%>
+        <%= g.label :training_support_funding, 'No' %>
         <%= g.radio_button :training_support_funding, false %>
         <br>
         <%= g.label :other_funding, I18n.t("#{current_partner.id}.federal_funding_author.question_2").html_safe %><br>
-        <%= g.label :other_funding, 'Yes'%>
+        <%= g.label :other_funding, 'Yes' %>
         <%= g.radio_button :other_funding, true %><br>
         <div id="fed_funding_confirmation_author_2" class="ml-5 collapse hide" aria-live="polite">
             <div class="alert alert-info">
             <p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %></p>
-            <%= g.label :other_funding_acknowledged, 'Yes'%>
+            <%= g.label :other_funding_acknowledged, 'Yes' %>
             <%= g.radio_button :other_funding_acknowledged, true %><br>
-            <%= g.label :other_funding_acknowledged, 'No'%>
+            <%= g.label :other_funding_acknowledged, 'No' %>
             <%= g.radio_button :other_funding_acknowledged, false %>
             </div>
-            <p id="fed_funding_error_message_author_2" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%></p>
+            <p id="fed_funding_error_message_author_2" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %></p>
         </div>
 
-    <%= g.label :other_funding, 'No'%>
+    <%= g.label :other_funding, 'No' %>
     <%= g.radio_button :other_funding, false %>
-        
+
     <% end %>
 </div>
-
diff --git a/spec/integration/author/author_spec.rb b/spec/integration/author/author_spec.rb
@@ -10,6 +10,7 @@
 
   context 'Author Submissions Page' do
     it 'displays a paragraph of thesis instructions' do
+      skip "honors should not display this" if current_partner.honors?
       expect(page).to have_content('Upload your thesis/dissertation to the eTD website for format review, including your front matter, back matter and at least 3 chapters. ')
       expect(page).to have_link('Accessibility')
     end