From 2bcdbd5f6217612b26739b58337686964175bc36 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 27 Sep 2017 10:18:18 +0200
Subject: [PATCH] Improvements
---
.../pool/required_actions_tooltip.html | 10 +++++
.../submissions/pool/submission_li.html | 40 +++++++++++++------
.../templates/submissions/pool/pool.html | 1 +
3 files changed, 39 insertions(+), 12 deletions(-)
create mode 100644 submissions/templates/partials/submissions/pool/required_actions_tooltip.html
diff --git a/submissions/templates/partials/submissions/pool/required_actions_tooltip.html b/submissions/templates/partials/submissions/pool/required_actions_tooltip.html
new file mode 100644
index 000000000..fd34f9c6d
--- /dev/null
+++ b/submissions/templates/partials/submissions/pool/required_actions_tooltip.html
@@ -0,0 +1,10 @@
+{% if submission.cycle.has_required_actions and submission.cycle.get_required_actions %}
+ <i class="fa fa-exclamation-circle text-danger" data-toggle="tooltip" data-html="true" title="
+ Required Actions:
+ <ul class='mb-0 pl-3 text-left'>
+ {% for action in submission.cycle.get_required_actions %}
+ <li>{{action.1}}</li>
+ {% endfor %}
+ </ul>
+ "></i>
+{% endif %}
diff --git a/submissions/templates/partials/submissions/pool/submission_li.html b/submissions/templates/partials/submissions/pool/submission_li.html
index bff3e4448..a5d71a453 100644
--- a/submissions/templates/partials/submissions/pool/submission_li.html
+++ b/submissions/templates/partials/submissions/pool/submission_li.html
@@ -1,23 +1,39 @@
<div class="row pool-item mb-0">
<div class="icons{% if is_current %} text-info{% endif %}">
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=submission %}
- {% if submission.editor_in_charge == request.user.contributor %}
- <i class="fa fa-gavel mt-1{% if not is_current %} text-primary{% endif %}" data-toggle="tooltip" data-html="true" title="You are editor-in-charge"></i>
- {% elif not submission.editor_in_charge %}
+
+ {% if submission.status == 'unassigned' %}
<i class="fa fa-exclamation mt-1 px-1 text-danger" data-toggle="tooltip" data-html="true" title="You can volunteer to become Editor-in-charge"></i>
+ {% else %}
+ {% include 'partials/submissions/pool/required_actions_tooltip.html' with submission=submission %}
{% endif %}
</div>
<div class="item col-auto">
- {% if is_current %}
- <strong>
+ <p class="mb-1">
+ <a href="{% url 'submissions:pool' submission.arxiv_identifier_w_vn_nr %}">{{ submission.title }}</a><br>
+ <em>by {{ submission.author_list }}</em>
+ </p>
+
+ <p class="card-text mb-3">
+ <a href="{% url 'submissions:pool' submission.arxiv_identifier_w_vn_nr %}">See details in the pool</a>
+ {% if submission.editor_in_charge == request.user.contributor %}
+ · <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}">Go directly to editorial page</a>
+ {% endif %}
+ </p>
+
+ {% if submission.cycle.has_required_actions and submission.cycle.get_required_actions %}
+ <p class="card-text text-danger">This Submission contains required actions.</p>
{% endif %}
- <p class="mb-2">
- <a href="{% url 'submissions:pool' submission.arxiv_identifier_w_vn_nr %}">{{ submission.title }}</a><br>
- <em>by {{ submission.author_list }}</em>
- </p>
- <p class="label label-{% if submission.status == 'unassigned' %}outline-danger{% else %}secondary{% endif %} label-sm">{{ submission.get_status_display }}</p>
- {% if is_current %}
- </strong>
+
+ {% if submission.status == 'unassigned' %}
+ <p class="card-text text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:volunteer_as_EIC' submission.arxiv_identifier_w_vn_nr %}">clicking here</a>.</p>
+ {% elif submission.editor_in_charge == request.user.contributor %}
+ <p class="card-text"><strong>You are Editor-in-charge</strong></p>
+ {% else %}
+ <p class="card-text">Editor-in-charge: <em>{{ submission.editor_in_charge }}</em></p>
{% endif %}
+
+ <p class="label label-{% if submission.status == 'unassigned' %}outline-danger{% else %}secondary{% endif %} label-sm">{{ submission.get_status_display }}</p>
+
</div>
</div>
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 2d852931e..8572b5c2c 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -57,6 +57,7 @@
<h3>Filter by status</h3>
<form method="get" class="auto-submit mb-3">
{{ search_form|bootstrap:'12,12' }}
+ <input type="submit" class="btn btn-secondary btn-sm" value="Filter">
</form>
{% endif %}
--
GitLab