diff --git a/app/assets/javascripts/theses.js b/app/assets/javascripts/theses.js
index 532562b..66370a5 100644
--- a/app/assets/javascripts/theses.js
+++ b/app/assets/javascripts/theses.js
@@ -37,4 +37,11 @@ $(document).ready(function () {
source: committee_member_names_list
});
});
+
+ $('div.student-view div.settings-content a').each(function () {
+ var class_attr = $(this).attr('class');
+ if (typeof class_attr === typeof undefined || class_attr == '') {
+ $(this).attr('target', '_blank');
+ }
+ });
});
diff --git a/app/models/app_settings.rb b/app/models/app_settings.rb
index 4425a22..ea1f739 100644
--- a/app/models/app_settings.rb
+++ b/app/models/app_settings.rb
@@ -33,6 +33,7 @@ class AppSettings < RailsSettings::Base
field :student_upload_files
field :student_primary_upload_files
field :student_supplementary_upload_files
+ field :student_supplementary_licence_upload_files
field :student_supplementary_embargo_upload_files
field :student_review_license_info
field :student_review_license_lac
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb
index 55740f7..88afcf2 100644
--- a/app/views/documents/_form.html.erb
+++ b/app/views/documents/_form.html.erb
@@ -24,7 +24,7 @@ html: { multipart: true, class: "file-upload" } do |f| %>
<%= raw(AppSettings.student_supplementary_upload_files) %>
<% end %>
<% if @document.usage == 'licence' %>
- <%= raw(AppSettings.student_supplementary_embargo_upload_files) %>
+ <%= raw(AppSettings.student_supplementary_licence_upload_files) %>
<% end %>
<% if @document.usage == 'embargo' %>
<%= raw(AppSettings.student_supplementary_embargo_upload_files) %>
diff --git a/app/views/settings/_student_submission.html.erb b/app/views/settings/_student_submission.html.erb
index f4f9084..d348875 100644
--- a/app/views/settings/_student_submission.html.erb
+++ b/app/views/settings/_student_submission.html.erb
@@ -20,9 +20,10 @@
<%= f.input :student_update_details_keywords, as: :rich_text_area, label: "Keywords", input_html: { rows: 5 } %>
- <%= f.input :student_upload_files, as: :rich_text_area, label: "Upload files message", input_html: { rows: 20 } %>
- <%= f.input :student_supplementary_upload_files, as: :rich_text_area, label: "Supplementary Upload files message", input_html: { rows: 30 } %>
- <%= f.input :student_supplementary_embargo_upload_files, as: :rich_text_area, label: "Supplementary Embargo Upload files message", input_html: { rows: 30 } %>
+ <%= f.input :student_upload_files, as: :rich_text_area, label: "Upload Primary Thesis File message", input_html: { rows: 20 } %>
+ <%= f.input :student_supplementary_upload_files, as: :rich_text_area, label: "Upload Supplementary Thesis Files message", input_html: { rows: 30 } %>
+ <%= f.input :student_supplementary_licence_upload_files, as: :rich_text_area, label: "Upload Licence Files message", input_html: { rows: 30 } %>
+ <%= f.input :student_supplementary_embargo_upload_files, as: :rich_text_area, label: "Upload Embargo Files message", input_html: { rows: 30 } %>
<%= f.input :primary_thesis_file_extensions, as: :text, label: "Primary Thesis File Extensions", input_html: { rows: 3 } %>
<%= f.input :supplemental_thesis_file_extensions, as: :text, label: "Supplementary Thesis File Extensions", input_html: { rows: 3 } %>
<%= f.input :licence_file_extensions, as: :text, label: "Licence File Extensions", input_html: { rows: 3 } %>
diff --git a/app/views/students/_header.html.erb b/app/views/students/_header.html.erb
index 952f538..ddc2b42 100644
--- a/app/views/students/_header.html.erb
+++ b/app/views/students/_header.html.erb
@@ -6,7 +6,7 @@
<% if @student.blocked? %>
<% end %>
Created by <%= @student.created_by.name%>
- <% if can?(:login_as, :student) && is_controller_and_action?("students", "show") %>
+ <% if current_user.role != User::STUDENT && can?(:login_as, :student) %>
- <%= link_to "Login as this student", login_as_student_path(id: @student.id) %>
<% end %>
diff --git a/app/views/theses/_thesis.html.erb b/app/views/theses/_thesis.html.erb
index 538d141..03eccb7 100644
--- a/app/views/theses/_thesis.html.erb
+++ b/app/views/theses/_thesis.html.erb
@@ -5,7 +5,7 @@
<% unless @student %>
- By <%= thesis.student.name %>
+ By <%= link_to thesis.student.name, student_thesis_path(thesis.student, thesis) %>
<% end %>
<%= link_to thesis.title, student_thesis_path(thesis.student, thesis) %>
diff --git a/app/views/theses/index.html.erb b/app/views/theses/index.html.erb
index caa4b1c..e69de29 100644
--- a/app/views/theses/index.html.erb
+++ b/app/views/theses/index.html.erb
@@ -1,48 +0,0 @@
-<% title "Theses" %>
-
-
-
- Title |
- Author |
- Supervisor |
- Committee |
- Student |
- Subjects |
- Keywords |
- Abstract |
- Comments |
- Acknowledgements |
- Embargo |
- Language |
- Degree Name |
- Degree Level |
- Program |
- Exam Date |
- Published Date |
- Status |
-
- <% for thesis in @theses %>
-
- <%= thesis.title %> |
- <%= thesis.author %> |
- <%= thesis.supervisor %> |
- <%= thesis.committee %> |
- <%= thesis.student.name %> |
- <%= thesis.keywords %> |
- <%= thesis.abstract %> |
- <%= thesis.embargo %> |
- <%= thesis.language %> |
- <%= thesis.degree_name %> |
- <%= thesis.degree_level %> |
- <%= thesis.program %> |
- <%= thesis.exam_date %> |
- <%= thesis.published_date %> |
- <%= thesis.status %> |
- <%= link_to "Show", [@student, thesis] %> |
- <%= link_to "Edit", edit_student_thesis_path(@student, thesis) %> |
- <%= link_to "Destroy", [@student, thesis], :date => { :confirm => 'Are you sure?' }, :method => :delete %> |
-
- <% end %>
-
-
-
<%= link_to "New Thesis", new_student_thesis_path(@student) %>
diff --git a/app/views/theses/show.html.erb b/app/views/theses/show.html.erb
index ca0bcd6..a67bbd3 100644
--- a/app/views/theses/show.html.erb
+++ b/app/views/theses/show.html.erb
@@ -19,7 +19,7 @@
<% if current_user.role == User::STUDENT %>
diff --git a/db/seeds.rb b/db/seeds.rb
index 111073a..691b635 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -226,6 +226,10 @@
- Documents: Portable Document Format (.pdf), Text (.txt), Hypertext Markup Language (.html, .htm), Open Document Format (.odt, .odp, .ods).
- Images: Tagged Image File format (.tif)
- Data: Comma-separated values (.csv) or other delimited text, Extensible Markup Language (.xml)
- Video: MPEG-4 (.mp4) files are preferred, but we can also accept AVI (.avi) and MOV (.mov) file formats.
- Audio: MPEG-1 Audio Layer 3 (.mp3) file are preferred, but we can also accept Free Lossless Audio Codec (.flac) or WAVE (.wav) file formats.
Please ensure that:
- You have permission from subjects appearing in media files.
- The total size of your supplementary files does not exceed 4 gigabytes (4GB)
- If you wish to upload a type of file that you do not see on this list, please email diginit@yorku.ca for support.
HEREDOC
+AppSettings.student_supplementary_licence_upload_files = <
Please upload PDF files only.
+HEREDOC
+
AppSettings.student_supplementary_embargo_upload_files = <Please Upload the following documents:
- Supervisor Letter
- Other Embargo Supporting Documents
- Portable Document Format: (.pdf), Text (.txt), Hypertext Markup Language (.html, .htm), Open Document Format (.odt, .odp, .ods).