From 772db2719e712ef478f6f345817c6ee877d851b0 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 24 Jul 2017 18:36:53 +0200
Subject: [PATCH] Add SubmissionEvents to editorial page

---
 .../templates/submissions/editorial_page.html | 56 +++++++++----------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index 6debf2f9e..723ca7458 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -26,10 +26,10 @@
                 <p class="card-text">(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
             </div>
         </div>
-        {% if other_versions %}
+        {% if submission.other_versions %}
             <h3>Other versions of this Submission exist:</h3>
             <div class="pl-4">
-                {% for vn in other_versions %}
+                {% for vn in submission.other_versions %}
                     {% include 'submissions/_submission_version.html' with submission=vn %}
                 {% endfor %}
             </div>
@@ -83,14 +83,10 @@
     {% endif %}
 {% endwith %}
 
-<div class="row">
-    <div class="col-12">
-        <div class="card card-grey">
-            <div class="card-block">
-                <h1 class="card-title">Editorial Workflow</h1>
-                <a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a>
-            </div>
-        </div>
+<div class="card card-grey my-4">
+    <div class="card-block">
+        <h2 class="card-title">Editorial Workflow</h2>
+        <a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a>
     </div>
 </div>
 
@@ -113,7 +109,6 @@
         </div>
     </div>
 {% else %}
-
     {% if submission.refereeing_cycle != 'direct_rec' %}
         <div class="row">
             <div class="col-12">
@@ -150,7 +145,7 @@
 
     <div class="row">
         <div class="col-12">
-            <h3>Actions:</h3>
+            <h2 class="mt-3">Actions</h2>
                 <ul>
                     {% if submission.refereeing_cycle != 'direct_rec' %}
                         <li>
@@ -190,28 +185,29 @@
     </div>
 {% endif %}
 
-<div class="row">
-    <div class="col-12">
-        <h1 class="highlight">Communications</h1>
-        <ul>
-            <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoA' %}">Draft and send a communication with the submitting Author</a></li>
-            <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoS' %}">Draft and send a communication with SciPost Editorial Administration</a></li>
-        </ul>
-    </div>
-</div>
+<h2 class="mt-3">Communications</h2>
+<ul>
+    <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoA' %}">Draft and send a communication with the submitting Author</a></li>
+    <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoS' %}">Draft and send a communication with SciPost Editorial Administration</a></li>
+</ul>
 
 <div class="row">
     <div class="col-12">
-        <ul class="list-group list-group-flush">
-            {% for comm in submission.editorial_communications.all %}
-                <li class="list-group-item">
-                    {% include 'submissions/_editorial_communication_content.html' with communication=comm %}
-                </li>
-            {% empty %}
-                <li class="list-group-item">There have been no communications for this Submission.</li>
-            {% endfor %}
-        </ul>
+            <ul class="list-group list-group-flush">
+                {% for comm in submission.editorial_communications.all %}
+                    <li class="list-group-item">
+                        {% include 'submissions/_editorial_communication_content.html' with communication=comm %}
+                    </li>
+                {% empty %}
+                    <li class="list-group-item">There have been no communications for this Submission.</li>
+                {% endfor %}
+            </ul>
     </div>
 </div>
 
+<h2 class="mt-3">Events</h2>
+{% include 'submissions/submission_event_list.html' with event=submission.events.for_eic %}
+
+
+<div class="mb-5"></div>
 {% endblock content %}
-- 
GitLab