Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes changes requested in issue #1343 #1345

Merged
merged 2 commits into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ <h2>2. Select Files</h2>
<table class="scroll small">
<tr>
<th></th>
<th>ID</th>
<th>Label</th>
<th>Filename</th>
<th>Type</th>
Expand All @@ -68,6 +69,7 @@ <h2>2. Select Files</h2>
<tr>
<td><input type="checkbox" name="files_for_copyediting" value="{{ file.id }}"
{% if file in form.cleaned_data.files_for_copyediting %}checked="checked"{% endif %}></td>
<td>{{ file.pk }}</td>
<td>{{ file.label }}</td>
<td>{{ file.original_filename }}</td>
<td>Manuscript</td>
Expand Down
10 changes: 3 additions & 7 deletions src/templates/admin/copyediting/copyediting.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ <h2>Articles in Copyediting</h2>
<table class="scroll" id="unassigned">
<thead>
<tr>
<th>ID</th>
<th>Title</th>
<th>Submitted</th>
<th>Main Author</th>
Expand All @@ -28,6 +29,7 @@ <h2>Articles in Copyediting</h2>
<tbody>
{% for article in articles_in_copyediting %}
<tr>
<td>{{ article.pk }}</td>
<td>{{ article.title }}</td>
<td>{{ article.date_submitted }}</td>
<td>{{ article.correspondence_author.full_name }}</td>
Expand All @@ -37,13 +39,7 @@ <h2>Articles in Copyediting</h2>
</tr>
{% empty %}
<tr>
<td>No articles in this stage</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="7">No articles in this stage</td>
</tr>
{% endfor %}
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/admin/core/active_submissions.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Submission List</h2>
</div>
<div class="content" id="submission_list">
<input type="text" class="search"
placeholder="Start typing to filter submissions (title, authors, editors)"/>
placeholder="Start typing to filter submissions (id, title, authors, editors)"/>
<ul class="list-group list" id="list_container">
{% for article in active_submissions %}
{% include "elements/core/submission_list_element.html" %}
Expand Down
5 changes: 4 additions & 1 deletion src/templates/admin/core/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<div class="box">
<div class="title-area">
<h2>Editor</h2>
<a class="button" href="{% url 'core_active_submissions' %}">Active Submissions</a>
</div>
<div class="row expanded">
<div class="large-4 columns">
Expand Down Expand Up @@ -60,6 +59,10 @@ <h2>Editor</h2>
</div>
</div>
</div>
<div class="large-12 columns">
<br />
<a class="success button pull-right" href="{% url 'core_active_submissions' %}">Search all submissions</a>
</div>
</div>
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/templates/admin/core/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
</button>
<ul class="vertical menu">
<li class="title"><a href="#"><i class="fa fa-chevron-circle-down action-icon">&nbsp;</i> Janeway</a></li>
<li class="subtitle"><a href="#">Dashboard</a></li>
<li class="subtitle"><a href="#">Dashboards</a></li>
<li><a href="{% url 'core_dashboard' %}"><i class="fa fa-tachometer">&nbsp;</i>
Main</a></li>
{% if editor %}
<li><a href="{% url 'kanban' %}"><i class="fa fa-sticky-note">&nbsp;</i> Kanban</a>
</li>
<li><a href="{% url 'core_active_submissions' %}"><i class="fa fa-list-ol" aria-hidden="true"></i> Search Submissions</a>
</li>
<li class="subtitle"><a href="#">Workflow</a></li>
<li><a href="{% url 'review_unassigned' %}"><i class="fa fa-user">&nbsp;</i> Unassigned</a>
</li>
<li><a href="{% url 'review_home' %}"><i class="fa fa-check">&nbsp;</i> Review</a>
</li>
<li><a href="{% url 'copyediting' %}"><i class="fa fa-pencil">&nbsp;</i> Editing</a>
Expand Down
3 changes: 2 additions & 1 deletion src/templates/admin/elements/core/kanban/card.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card">
<div class="card-divider">
<h5>{{ article.title|safe }}</h5>
<h5>{{ article.pk }} - {{ article.title|safe }}</h5>
</div>
<div class="card-section">
{% if type == "unassigned" %}
Expand All @@ -20,6 +20,7 @@ <h5>{{ article.title|safe }}</h5>
{% elif type == 'prepublication' %}
<p>Awaiting completion of pre-pub checklist.</p>
{% endif %}
<p><small>Primary Author: {{ article.correspondence_author.full_name }}</small></p>
<div class="button-group">
{% if type == "unassigned" %}
<a class="button tiny" href="{% url 'review_unassigned_article' article.pk %}">Assign Editor</a>
Expand Down
15 changes: 7 additions & 8 deletions src/templates/admin/elements/core/submission_list_element.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
{% load truncate %}
<li class="list-group-item list-group-item-dashboard">
<div class="row expanded">
<div class="medium-1 columns">{{ article.pk }}</div>
<div class="medium-9 columns">
<p class="submission">{{ article.title|truncatesmart:80 }}<br/>
<p class="submission">{{ article.pk }} - {{ article.title|truncatesmart:80 }} ({{ article.correspondence_author.last_name }})<br/>
<small>
Authors: {{ article.author_list }}<br/>
Editors:
{% for editor in article.editors %}{{ editor.editor.full_name }} (
{% for editor in article.editors %}{% if forloop.first %}Editors: {% endif %}{{ editor.editor.full_name }} (
{% if editor.editor_type == 'section-editor' %}SE{% else %}E
{% endif %}){% if not forloop.last %}, {% endif %}{% endfor %}

<a href="{{ article.current_stage_url }}">
View Article <i class="fa fa-arrow-circle-o-right"></i>
</a>
</small>
</p>
</div>
<div class="medium-2 columns">
<div class="medium-3 columns">
<small>
<p>
Section: {{ article.section.name }}
<br/>
Stage: {{ article.get_stage_display }}
<br />
<a href="{{ article.current_stage_url }}">View Article</a>

</p>
</small>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/admin/elements/production/card.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<div class="card">
<div class="card-divider">
<h4>{{ article.title|safe }}</h4>
<h4>{{ article.pk }} - {{ article.title|safe }}</h4>
</div>
<div class="card-section">
{% if type == "assignment" %}
Expand Down
2 changes: 2 additions & 0 deletions src/templates/admin/elements/proofing/add_proofreader.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ <h5>Galleys</h5>
<table class="small scroll">
<tr style="text-align: left">
<th></th>
<th>ID</th>
<th>Label</th>
<th width="25%">Filename</th>
<th>Type</th>
Expand All @@ -42,6 +43,7 @@ <h5>Galleys</h5>
<tr>
<td><input type="checkbox" name="galleys_for_proofing" value="{{ galley.id }}"
{% if galley in galleys %}checked="checked"{% endif %}></td>
<td>{{ galley.pk }}</td>
<td>{{ galley.label }}</td>
<td>{{ galley.file.original_filename|truncatechars:40 }}</td>
<td>Galley</td>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/admin/elements/proofing/card.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card">
<div class="card-divider">
<h4>{{ article.title|safe }}</h4>
<h4>{{ article.pk }} - {{ article.title|safe }}</h4>
</div>
<div class="card-section">
{% if type == "assignment" %}
Expand Down
4 changes: 4 additions & 0 deletions src/templates/admin/journal/manage/archive.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ <h2>Published Articles</h2>
<table class="small article_list scroll">
<thead>
<tr>
<td>{{ ID }}</td>
<td>Title</td>
<td>Published</td>
<td>Identifier</td>
Expand All @@ -32,6 +33,7 @@ <h2>Published Articles</h2>
<tbody>
{% for article in published_articles %}
<tr>
<td>{{ article.pk }}</td>
<td><a href="{% url 'manage_archive_article' article.pk %}">{{ article.title|safe }}</a></td>
<td>{{ article.date_published }}</td>
<td>{{ article.identifier }}</td>
Expand All @@ -52,6 +54,7 @@ <h2>Rejected Articles</h2>
<table class="small article_list scroll">
<thead>
<tr>
<td>ID</td>
<td>Title</td>
<td>Declined</td>
<td>Identifier</td>
Expand All @@ -61,6 +64,7 @@ <h2>Rejected Articles</h2>
<tbody>
{% for article in rejected_articles %}
<tr>
<td>{{ article.pk }}</td>
<td><a href="{% url 'manage_archive_article' article.pk %}">{{ article.title|safe }}</a></td>
<td>{{ article.date_declined }}</td>
<td>{{ article.identifier }}</td>
Expand Down
2 changes: 2 additions & 0 deletions src/templates/admin/journal/manage/issues.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ <h2>Issue Management</h2>
<table class="scroll">
<thead>
<tr>
<th>ID</th>
<th>Title</th>
<th>Type</th>
<th>Volume</th>
Expand All @@ -56,6 +57,7 @@ <h2>Issue Management</h2>
<tbody {% if not issue %}class="sortable"{% endif %}>
{% for i in issues %}
<tr {% if not issue %}id="issues-{{ i.pk }}"{% endif %}>
<td>{{ i.pk }}</td>
<td><i class="fa fa-sort">&nbsp;</i>{{ i.issue_title }}</td>
<td>{{ i.issue_type }}</td>
<td>{{ i.volume }}</td>
Expand Down
10 changes: 3 additions & 7 deletions src/templates/admin/journal/publish.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ <h2>Pre-Publication</h2>
<table class="small scroll" id="prepub">
<thead>
<tr>
<th>ID</th>
<th>Title</th>
<th>Submitted</th>
<th>Main Author</th>
Expand All @@ -28,6 +29,7 @@ <h2>Pre-Publication</h2>
<tbody>
{% for article in articles %}
<tr>
<td>{{ article.pk }}</td>
<td>{{ article.title }}</td>
<td>{{ article.date_submitted }}</td>
<td>{{ article.correspondence_author.full_name }}</td>
Expand All @@ -37,13 +39,7 @@ <h2>Pre-Publication</h2>
</tr>
{% empty %}
<tr>
<td>No articles in this stage</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="7">No articles in this stage</td>
</tr>
{% endfor %}
</tbody>
Expand Down
2 changes: 2 additions & 0 deletions src/templates/admin/production/assign_typesetter.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ <h2>2. Select Files</h2>
<table class="scroll small">
<tr>
<th><input type="checkbox" id="checkall"></th>
<th>ID</th>
<th>Label</th>
<th>Filename</th>
<th>Type</th>
Expand All @@ -74,6 +75,7 @@ <h2>2. Select Files</h2>
<tr>
<td><input type="checkbox" name="files_for_typesetting" value="{{ file.id }}"
{% if file in form.cleaned_data.files_for_typesetting %}checked="checked"{% endif %}></td>
<td>{{ file.pk }}</td>
<td>{{ file.label }}</td>
<td>{{ file.original_filename }}</td>
<td>Manuscript</td>
Expand Down
4 changes: 4 additions & 0 deletions src/templates/admin/production/assigned_article.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ <h2>Files Uploaded for Production</h2>
<div class="content">
<table class="scroll small">
<tr style="text-align: left">
<th>ID</th>
<th>Label</th>
<th width="25%">Filename</th>
<th>Type</th>
Expand All @@ -125,6 +126,7 @@ <h2>Files Uploaded for Production</h2>
{% can_edit_file file article as can_edit_file_flag %}
{% can_view_file_history file article as can_view_file_history_flag %}
<tr>
<td>{{ file.pk }}</td>
<td>{{ file.label }}</td>
<td>{{ file.original_filename|truncatechars:40 }}</td>
<td>Manuscript</td>
Expand Down Expand Up @@ -182,6 +184,7 @@ <h2>Galley Files</h2>
<div class="content">
<table class="scroll small">
<tr style="text-align: left">
<th>ID</th>
<th>Label</th>
<th width="25%">Filename</th>
<th>Type</th>
Expand All @@ -198,6 +201,7 @@ <h2>Galley Files</h2>
{% can_edit_file galley.file article as can_edit_file_flag %}
{% can_view_file_history galley.file article as can_view_file_history_flag %}
<tr>
<td>{{ galley.pk }}</td>
<td>{{ galley.label }}</td>
<td>{{ galley.file.original_filename|truncatechars:40 }}</td>
<td>Galley</td>
Expand Down
3 changes: 3 additions & 0 deletions src/templates/admin/review/add_files.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ <h2>Files</h2>
<thead>
<tr>
<th>Select</th>
<th>ID</th>
<th>Label</th>
<th>Filename</th>
<th>Type</th>
Expand All @@ -38,6 +39,7 @@ <h2>Files</h2>
<tr>
<td><input type="checkbox" name="file" value="{{ file.id }}"
{% if file in round.review_files.all %}checked="checked"{% endif %}></td>
<td>{{ file.pk }}</td>
<td>{{ file.label }}</td>
<td>{{ file.original_filename }}</td>
<td>Manuscript</td>
Expand All @@ -54,6 +56,7 @@ <h2>Files</h2>
<tr>
<td><input type="checkbox" name="file" value="{{ file.id }}"
{% if file in round.review_files.all %}checked="checked"{% endif %}></td>
<td>{{ file.pk }}</td>
<td>{{ file.label }}</td>
<td>{{ file.original_filename }}</td>
<td>Data/Figure</td>
Expand Down
8 changes: 3 additions & 5 deletions src/templates/admin/review/unassigned.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<table class="table scroll" id="unassigned">
<thead>
<tr>
<th>ID</th>
<th>Title</th>
<th>Submitted</th>
<th>Main Author</th>
Expand All @@ -23,6 +24,7 @@
<tbody>
{% for article in articles %}
<tr>
<td>{{ article.pk }}</td>
<td>{{ article.title }}</td>
<td>{{ article.date_submitted }}</td>
<td>{{ article.correspondence_author.full_name }}</td>
Expand All @@ -31,11 +33,7 @@
</tr>
{% empty %}
<tr>
<td>No articles in this stage</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="6">No articles in this stage</td>
</tr>
{% endfor %}
</tbody>
Expand Down