From 6c4ac706032f1e8f21623229b3f9d0e954af3755 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 28 Oct 2019 06:24:17 +0100
Subject: [PATCH] Improve submission status presentation

---
 .../submissions/submission_status.html        | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/submissions/templates/partials/submissions/submission_status.html b/submissions/templates/partials/submissions/submission_status.html
index d1a1b3e37..df19de612 100644
--- a/submissions/templates/partials/submissions/submission_status.html
+++ b/submissions/templates/partials/submissions/submission_status.html
@@ -1,16 +1,19 @@
-<div class="submission status">
-  <h6 class="prefix">Current status:</h6>
-  <div class="status">
-    <span class="label label-secondary">{{ submission.get_status_display }}</span>
-  </div>
-  <p>
-    Editorial decision:
-    <span class="label label-secondary">For Journal {{ submission.editorial_decision.for_journal }}: {{ submission.editorial_decision.get_decision_display }}</span>
-    <br>(status: {{ submission.editorial_decision.get_status_display }})
+{% if submission.publication and submission.publication.is_published %}
+  <p class="mt-2">Published as <a href="{{ submission.publication.get_absolute_url }}">
+    {{ submission.publication.citation }}</a>
   </p>
-  {% if submission.publication and submission.publication.is_published %}
-    <p>Published as <a href="{{ submission.publication.get_absolute_url }}">
-      {{ submission.publication.citation }}</a>
-    </p>
-  {% endif %}
-</div>
+{% else %}
+  <div class="submission status mt-2">
+    <h6 class="prefix">Current status:</h6>
+    <div class="status">
+      <span class="label label-secondary">{{ submission.get_status_display }}</span>
+    </div>
+    {% if submission.editorial_decision %}
+      <p>
+	Editorial decision:
+	<span class="label label-secondary">For Journal {{ submission.editorial_decision.for_journal }}: {{ submission.editorial_decision.get_decision_display }}</span>
+	<br>(status: {{ submission.editorial_decision.get_status_display }})
+      </p>
+    {% endif %}
+  </div>
+{% endif %}
-- 
GitLab