diff --git a/app/views/admin/submissions/edit/_admin_feedback_files.html.erb b/app/views/admin/submissions/edit/_admin_feedback_files.html.erb index f3e2020af..0c3218279 100644 --- 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 %> - 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 index 4e9b6be11..7a6e9fb6a 100644 --- 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 @@ Federal Funding Statement
<%= render partial: 'shared/federal_funding_form', locals: {f: f} %> - \ No newline at end of file + diff --git a/app/views/approver/_federal_funding_language_approver.html.erb b/app/views/approver/_federal_funding_language_approver.html.erb index 9c7cee068..8b118c8d1 100644 --- a/app/views/approver/_federal_funding_language_approver.html.erb +++ b/app/views/approver/_federal_funding_language_approver.html.erb @@ -3,40 +3,39 @@ Federal Funding Statement

<%= I18n.t("#{current_partner.id}.federal_funding_admin.intro_1").html_safe %>

<%= f.label :federal_funding_used, I18n.t("#{current_partner.id}.federal_funding_admin.question_1").html_safe %>
- <%= f.label :federal_funding_used, 'Yes'%> + <%= f.label :federal_funding_used, 'Yes' %> <%= f.radio_button :federal_funding_used, true %>
<% if @submission.federal_funding == false %>
-

<%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%>

+

<%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %>

<% else %>
-

<%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe%>

- <%= f.label :federal_funding_confirmation, 'Yes'%> +

<%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe %>

+ <%= f.label :federal_funding_confirmation, 'Yes' %> <%= f.radio_button :federal_funding_confirmation, true %>
- <%= f.label :federal_funding_confirmation, 'No'%> + <%= f.label :federal_funding_confirmation, 'No' %> <%= f.radio_button :federal_funding_confirmation, false %>
-

<%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%>

+

<%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %>

<% end %>
- <%= f.label :federal_funding_used, 'No'%> + <%= f.label :federal_funding_used, 'No' %> <%= f.radio_button :federal_funding_used, false %> - \ No newline at end of file diff --git a/app/views/approver/_review_form.html.erb b/app/views/approver/_review_form.html.erb index f6fad0155..12b25a11d 100644 --- a/app/views/approver/_review_form.html.erb +++ b/app/views/approver/_review_form.html.erb @@ -5,7 +5,7 @@ -
+
<% if current_partner.graduate? && @committee_member == @submission.advisor %> <%= f.label :federal_funding_used, 'Were Federal Funds utilized for this submission?'.html_safe %>
@@ -24,7 +24,7 @@ wrapper: :vertical_radio_and_checkboxes, label: false %> <% end %> -
+
<% end %> Approval

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.

@@ -35,7 +35,7 @@ label: false %>
<%= f.input :notes, :label => "Notes for Student (required only if rejecting)", :input_html => { :class => 'notes_select' } %> - +
<%= 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 index efc5c1a15..ce450838e 100644 --- a/app/views/author/submissions/_federal_funding_introduction.html.erb +++ b/app/views/author/submissions/_federal_funding_introduction.html.erb @@ -12,4 +12,4 @@
  • <%= I18n.t("#{current_partner.id}.federal_funding_author.intro_4_3").html_safe %>
  • <%= I18n.t("#{current_partner.id}.federal_funding_author.intro_5").html_safe %>

    -

    <%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %>

    \ No newline at end of file +

    <%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %>

    diff --git a/app/views/author/submissions/_federal_funding_language_author.html.erb b/app/views/author/submissions/_federal_funding_language_author.html.erb index fa8cc5618..66ef4b5e8 100644 --- 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 @@
    <%= render partial: 'shared/federal_funding_form', locals: {f: f} %>
    - \ No newline at end of file diff --git a/app/views/author/submissions/_submissions.html.erb b/app/views/author/submissions/_submissions.html.erb index 9f6a321ec..56af3d95e 100644 --- a/app/views/author/submissions/_submissions.html.erb +++ b/app/views/author/submissions/_submissions.html.erb @@ -28,5 +28,5 @@ <% end %> - <%= render 'new_submission_button' unless current_partner.graduate? || (current_partner.honors? && !admin?) %> + <%= render 'new_submission_button' unless current_partner.graduate? || (current_partner.honors?) %> diff --git a/app/views/author/submissions/acknowledge.html.erb b/app/views/author/submissions/acknowledge.html.erb index 031aaf252..cbe2e170b 100644 --- a/app/views/author/submissions/acknowledge.html.erb +++ b/app/views/author/submissions/acknowledge.html.erb @@ -2,29 +2,29 @@

    <%= I18n.t("graduate.submission.acknowledge.title") %>

    <%= I18n.t("graduate.submission.acknowledge.description") %>

    - <%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %> -
    + <%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %> +
    <%= 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" %> @@ -32,4 +32,4 @@
    <% end %>
    -
    \ No newline at end of file + diff --git a/app/views/author/submissions/edit_final_submission.html.erb b/app/views/author/submissions/edit_final_submission.html.erb index 2549c2e9c..839249eab 100644 --- a/app/views/author/submissions/edit_final_submission.html.erb +++ b/app/views/author/submissions/edit_final_submission.html.erb @@ -37,12 +37,12 @@
    <% @submission.admin_feedback_files.each do |file| %> <% if file.feedback_type == 'final-submission' %> -
    +
    <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
    <% 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 index bf95067c5..bf62fb811 100644 --- a/app/views/author/submissions/edit_format_review.html.erb +++ b/app/views/author/submissions/edit_format_review.html.erb @@ -18,18 +18,18 @@
    <% end %> - + <% if @submission.format_review_feedback_files? %>
    <% @submission.admin_feedback_files.each do |file| %> <% if file.feedback_type == 'format-review' %> -
    +
    <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
    <% end %> <% end %> -
    - <% end %> +
    + <% 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 index 7cce685bf..1811d5c1d 100644 --- 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| %> -
    +
    <%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
    <% end %> diff --git a/app/views/author/submissions/index.html.erb b/app/views/author/submissions/index.html.erb index b7d19d22f..a5ecd284d 100644 --- a/app/views/author/submissions/index.html.erb +++ b/app/views/author/submissions/index.html.erb @@ -2,7 +2,9 @@

    The Submission Process


    -

    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.

    + <% unless current_partner.honors? %> +

    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.

    + <% end %> <% if current_partner.graduate? %>

    There is a one-time 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 Payment Section of the Fox Graduate School Thesis and Dissertation Information webpage. You will not be permitted to submit your final document unless the fee is paid.

    <% end %> diff --git a/app/views/shared/_federal_funding_form.html.erb b/app/views/shared/_federal_funding_form.html.erb index 0f7ec8ae8..6a7644ff5 100644 --- a/app/views/shared/_federal_funding_form.html.erb +++ b/app/views/shared/_federal_funding_form.html.erb @@ -1,40 +1,39 @@
    <%= 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 %>
    -

    <%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe%>

    - <%= g.label :training_support_acknowledged, 'Yes'%> +

    <%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %>

    + <%= g.label :training_support_acknowledged, 'Yes' %> <%= g.radio_button :training_support_acknowledged, true %>
    - <%= g.label :training_support_acknowledged, 'No'%> + <%= g.label :training_support_acknowledged, 'No' %> <%= g.radio_button :training_support_acknowledged, false %>
    -

    <%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%>

    +

    <%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %>

    - <%= g.label :training_support_funding, 'No'%> + <%= g.label :training_support_funding, 'No' %> <%= g.radio_button :training_support_funding, false %>
    <%= g.label :other_funding, I18n.t("#{current_partner.id}.federal_funding_author.question_2").html_safe %>
    - <%= g.label :other_funding, 'Yes'%> + <%= g.label :other_funding, 'Yes' %> <%= g.radio_button :other_funding, true %>

    <%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %>

    - <%= g.label :other_funding_acknowledged, 'Yes'%> + <%= g.label :other_funding_acknowledged, 'Yes' %> <%= g.radio_button :other_funding_acknowledged, true %>
    - <%= g.label :other_funding_acknowledged, 'No'%> + <%= g.label :other_funding_acknowledged, 'No' %> <%= g.radio_button :other_funding_acknowledged, false %>
    -

    <%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%>

    +

    <%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %>

    - <%= g.label :other_funding, 'No'%> + <%= g.label :other_funding, 'No' %> <%= g.radio_button :other_funding, false %> - + <% end %>
    - \ No newline at end of file diff --git a/spec/integration/author/author_spec.rb b/spec/integration/author/author_spec.rb index 0dbef9c85..a0cd4fcdf 100644 --- 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