Skip to content

Commit

Permalink
changed wording and committee members removal
Browse files Browse the repository at this point in the history
  • Loading branch information
dennis committed Sep 23, 2024
1 parent 22358e5 commit f073396
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 16 deletions.
10 changes: 6 additions & 4 deletions app/views/committee_members/_committee_member.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
method: :delete, class: "btn btn-close pull-right", remote: true, data: { confirm: "Are you sure?" } do %>&nbsp;<% end %>
<% end %>
<% else %>
<%= hidden_field_tag "committee_member_ids[]", committee_member.id %>
<a href="#" class="btn btn-close pull-right" onclick="this.closest('.row').remove(); return false;" data-confirm="Are you sure?" rel="nofollow" data-remote="true">
&nbsp;
</a>
<% if current_user.role != User::STUDENT %>
<%= hidden_field_tag "committee_member_ids[]", committee_member.id %>
<a href="#" class="btn btn-close pull-right" onclick="this.closest('.row').remove(); return false;" data-confirm="Are you sure?" rel="nofollow" data-remote="true">
&nbsp;
</a>
<% end %>
<% end %>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/reports/by_status.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div id="reports" class="p-3">

<h2>Grouped by Publish On Date </h2>
<h2>Grouped by Publication Date </h2>
<hr />

<ul id="date_nav" class="nav nav-pills">
Expand Down
2 changes: 1 addition & 1 deletion app/views/reports/review_thesis.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<p><%= @thesis.exam_date.strftime("%B %d, %Y") rescue nil %></p>
</div>
<div class="col-md-12 col-lg-4">
<h4>Publish on</h4>
<h4>Publication Date</h4>
<p><%= @thesis.published_date ? @thesis.published_date.strftime("%B %d, %Y") : format(@thesis.published_date) %></p>
<h4>Degree Name and Level</h4>
<p><%= format @thesis.degree_name %> - <%= format @thesis.degree_level %></p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/student_view/process/submit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<p><%= format @thesis.supervisor %></p>
<h4>Exam date</h4>
<p><%= @thesis.exam_date.strftime("%B %d, %Y") rescue nil %></p>
<h4>Publish on</h4>
<h4>Publication Date</h4>
<p><%= @thesis.published_date ? @thesis.published_date.strftime("%B %d, %Y") : format(@thesis.published_date) %></p>
</div>
<div class="col-md-12 col-lg-4">
Expand Down
4 changes: 2 additions & 2 deletions app/views/student_view/process/update.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%= progress_bar (Thesis::PROCESS_UPDATE) %>

<div class="student-view fitted update">
<h2>Update Thesis Details</h2>
<h2>Update ETD Details</h2>
<div class="settings-content">
<%= raw(AppSettings.student_update_details_initial) %>
</div>
Expand All @@ -35,7 +35,7 @@
<p><%= format @thesis.supervisor %></p>
</div>
<div class="col-md-6 col-lg-4">
<h4>Publish On</h4>
<h4>Publication Date</h4>
<p><%= @thesis.published_date ? @thesis.published_date.strftime("%B %d, %Y") : format(@thesis.published_date) %></p>
</div>
<div class="col-md-6 col-lg-4">
Expand Down
2 changes: 1 addition & 1 deletion app/views/theses/_form_admin_editable.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<hr class="fitted"/>

<%= f.input :published_date, label: "Publish On", collection: publish_on_dates(6.months) %>
<%= f.input :published_date, label: "Publication Date", collection: publish_on_dates(6.months) %>

<hr class="fitted"/>

Expand Down
2 changes: 1 addition & 1 deletion app/views/theses/_form_help_text.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</a>

<a class="thesis-help-sign" href="#" data-for-element="thesis_publishdate" data-toggle="popover"
data-original-title="Publish On"
data-original-title="Publication Date"
data-content="This is the date your thesis/dissertation will be deposited to YorkSpace and publicly accessible through the Library and through Library and Archives Canada. The date is entered by a staff member in FGS and refers to the date you are expected to have completed all your degree requirements and receive your degree. If you have requested an embargo on the publication of your thesis/dissertation and it is not reflected here, please contact a Thesis Coordinator at [email protected].">
<i class="fa fa-quetion-circle-o"></i>
</a>
Expand Down
8 changes: 4 additions & 4 deletions app/views/theses/_form_student_editable.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<hr/>

<%= f.input :language, collection: Thesis::LANGUAGE, readonly: read_only_if_student("language"), input_html: { aria_label: "Language" } %>
<%= f.input :language, collection: Thesis::LANGUAGE, readonly: read_only_if_student("language"), input_html: { aria_label: "Language" }, label_html: { style: "font-size: 17px;" } %>
<%= f.label :abstract, label: "Abstract", required: true, class: "d-block mb-1" %>
<%= f.label :abstract, label: "Abstract", required: true, class: "d-block mb-1", style: "font-size: 17px;" %>
<small class="form-text"><%= AppSettings.student_update_details_abstract.html_safe %></small>
<%= f.input :abstract, input_html: { class: "", rows: "8" }, label: false, readonly: read_only_if_student("abstract") %>

<hr/>

<%= f.label :loc_subject_ids, label: "Subjects", class: "d-block mb-1" %>
<%= f.label :loc_subject_ids, label: "Subjects", class: "d-block mb-1", style: "font-size: 17px;" %>
<small class="form-text"><%= AppSettings.student_update_details_subjects.html_safe %></small>

<div id="thesis_loc_subject_ids" class="span3 no-space">
Expand All @@ -27,6 +27,6 @@

</div>

<%= f.label :keywords, label: "Keywords", class: "d-block mb-1" %>
<%= f.label :keywords, label: "Keywords", class: "d-block mb-1", style: "font-size: 17px;" %>
<small class="form-text"><%= AppSettings.student_update_details_keywords.html_safe %></small>
<%= f.input :keywords, label: false, input_html: { rows: "2", aria:{ label: "Keywords" } }, readonly: read_only_if_student("keywords") %>
2 changes: 1 addition & 1 deletion app/views/theses/_thesis_details.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p><%= format @thesis.supervisor %></p>
<h4>Exam date</h4>
<p><%= @thesis.exam_date.strftime("%B %d, %Y") rescue nil %></p>
<h4>Publish on</h4>
<h4>Publication Date</h4>
<p>
<% if @thesis.embargoed == true %>
Never
Expand Down

0 comments on commit f073396

Please sign in to comment.