From 875e8598dbaf8a651396e30452c4697c8c66d704 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 14 Apr 2019 14:06:22 +0200
Subject: [PATCH] Restyle templates for commentaries

---
 .../_commentary_card_content.html             |  18 +--
 .../commentaries/_commentary_summary.html     |  78 +++++------
 commentaries/templates/commentaries/base.html |  16 +--
 .../commentaries/comment_on_publication.html  |  17 +--
 .../commentaries/commentary_detail.html       |  22 +--
 .../commentaries/commentary_list.html         | 126 +++++++++---------
 .../templates/commentaries/howto.html         |  26 ++--
 .../modify_commentary_request.html            |  40 +++---
 .../commentaries/request_arxiv_preprint.html  |  42 +++---
 .../commentaries/request_commentary.html      |  25 ++--
 .../request_published_article.html            |  43 +++---
 .../vet_commentary_email_accepted.html        |   4 +-
 .../vet_commentary_email_modified.html        |   4 +-
 .../vet_commentary_email_rejected.html        |   6 +-
 .../commentaries/vet_commentary_requests.html |  46 +++----
 15 files changed, 258 insertions(+), 255 deletions(-)

diff --git a/commentaries/templates/commentaries/_commentary_card_content.html b/commentaries/templates/commentaries/_commentary_card_content.html
index 8bb9d61f5..61d51d713 100644
--- a/commentaries/templates/commentaries/_commentary_card_content.html
+++ b/commentaries/templates/commentaries/_commentary_card_content.html
@@ -1,11 +1,11 @@
 <div class="card-body px-0">
-    <div class="li commentary">
-        <h3 class="title"><a href="{{ commentary.get_absolute_url }}">{{ commentary.title }}</a></h3>
-        <p class="authors">
-            by {{ commentary.author_list }}{% if commentary.type == 'published' %}, {{ commentary.journal }} {{ commentary.volume }}, {{ commentary.pages }}{% elif commentary.type == 'preprint' %} &middot; <a href="{{ commentary.arxiv_link }}">{{ commentary.arxiv_link }}</a>{% endif %}
-        </p>
-        <p class="meta">
-            {% if commentary.pub_date %}(published {{ commentary.pub_date }}) &middot; {% endif %}latest activity: {{ commentary.latest_activity }}
-        </p>
-    </div>
+  <div class="li commentary">
+    <h3 class="title"><a href="{{ commentary.get_absolute_url }}">{{ commentary.title }}</a></h3>
+    <p class="authors">
+      by {{ commentary.author_list }}{% if commentary.type == 'published' %}, {{ commentary.journal }} {{ commentary.volume }}, {{ commentary.pages }}{% elif commentary.type == 'preprint' %} &middot; <a href="{{ commentary.arxiv_link }}">{{ commentary.arxiv_link }}</a>{% endif %}
+    </p>
+    <p class="meta">
+      {% if commentary.pub_date %}(published {{ commentary.pub_date }}) &middot; {% endif %}latest activity: {{ commentary.latest_activity }}
+    </p>
+  </div>
 </div>
diff --git a/commentaries/templates/commentaries/_commentary_summary.html b/commentaries/templates/commentaries/_commentary_summary.html
index 8c817cca6..3e017ff14 100644
--- a/commentaries/templates/commentaries/_commentary_summary.html
+++ b/commentaries/templates/commentaries/_commentary_summary.html
@@ -1,50 +1,50 @@
 <table class="commentary summary">
+  <tr>
+    <td>Title:</td>
+    <td>{{ commentary.title }}</td>
+  </tr>
+  <tr>
+    <td>Author(s):</td>
+    <td>{{ commentary.author_list }}</td>
+  </tr>
+  <tr>
+    <td>As Contributors:</td>
+    <td>
+      {% for author in commentary.authors.all %}
+        {% if not forloop.first %} &middot; {% endif %}<a href="{% url 'scipost:contributor_info' author.id %}">{{ author.user.first_name }} {{ author.user.last_name }}</a>
+      {% empty %}
+        (none claimed)
+      {% endfor %}
+    </td>
+  </tr>
+  {% if commentary.type == 'published' %}
     <tr>
-        <td>Title:</td>
-        <td>{{commentary.title}}</td>
+      <td>Journal ref.:</td>
+      <td>{{ commentary.journal }} {{ commentary.volume }}{% if commentary.pages %}, {{ commentary.pages }}{% endif %}</td>
     </tr>
     <tr>
-        <td>Author(s):</td>
-        <td>{{commentary.author_list}}</td>
+      <td>DOI:</td>
+      <td>
+        <a href="{{commentary.pub_DOI_link}}" target="_blank">{{ commentary.pub_DOI_link }}</a>
+      </td>
     </tr>
+  {% elif commentary.type == 'preprint' %}
     <tr>
-        <td>As Contributors:</td>
-        <td>
-            {% for author in commentary.authors.all %}
-                {% if not forloop.first %} &middot; {% endif %}<a href="{% url 'scipost:contributor_info' author.id %}">{{author.user.first_name}} {{author.user.last_name}}</a>
-            {% empty %}
-                (none claimed)
-            {% endfor %}
-        </td>
+      <td>arxiv Link:</td>
+      <td>
+        <a href="{{commentary.arxiv_link}}" target="_blank">{{ commentary.arxiv_link }}</a>
+      </td>
     </tr>
-    {% if commentary.type == 'published' %}
-        <tr>
-            <td>Journal ref.:</td>
-            <td>{{commentary.journal}} {{commentary.volume}}{% if commentary.pages %}, {{commentary.pages}}{% endif %}</td>
-        </tr>
-        <tr>
-            <td>DOI:</td>
-            <td>
-                <a href="{{commentary.pub_DOI_link}}" target="_blank">{{commentary.pub_DOI_link}}</a>
-            </td>
-        </tr>
-    {% elif commentary.type == 'preprint' %}
-        <tr>
-            <td>arxiv Link:</td>
-            <td>
-                <a href="{{commentary.arxiv_link}}" target="_blank">{{commentary.arxiv_link}}</a>
-            </td>
-        </tr>
-    {% endif %}
-    {% if commentary.pub_date %}
-        <tr>
-            <td>Date:</td>
-            <td>{{commentary.pub_date}}</td>
-        </tr>
-    {% endif %}
+  {% endif %}
+  {% if commentary.pub_date %}
+    <tr>
+      <td>Date:</td>
+      <td>{{ commentary.pub_date }}</td>
+    </tr>
+  {% endif %}
 </table>
 
 {% if commentary.scipost_publication %}
-    <br>
-    <p class="my-0">Published in {{commentary.scipost_publication.in_issue.in_volume.in_journal.get_name_display}}: <a href="{{commentary.scipost_publication.get_absolute_url}}">{{commentary.scipost_publication.in_issue.in_volume.in_journal.abbreviation_citation}} <strong>{{commentary.scipost_publication.in_issue.in_volume.number}}</strong>, {{commentary.scipost_publication.get_paper_nr}} ({{commentary.scipost_publication.publication_date|date:'Y'}})</a></p>
+  <br>
+  <p class="my-0">Published in {{ commentary.scipost_publication.get_journal.get_name_display }}: <a href="{{ commentary.scipost_publication.get_absolute_url }}">{{ commentary.scipost_publication.citation }}</a></p>
 {% endif %}
diff --git a/commentaries/templates/commentaries/base.html b/commentaries/templates/commentaries/base.html
index bf1617386..e5afebc9d 100644
--- a/commentaries/templates/commentaries/base.html
+++ b/commentaries/templates/commentaries/base.html
@@ -1,13 +1,13 @@
 {% extends 'scipost/base.html' %}
 
 {% block breadcrumb %}
-    <div class="breadcrumb-container">
-        <div class="container">
-            <nav class="breadcrumb">
-                {% block breadcrumb_items %}
-                    <a href="{% url 'commentaries:commentaries' %}" class="breadcrumb-item">Commentaries</a>
-                {% endblock %}
-            </nav>
-        </div>
+  <div class="breadcrumb-container">
+    <div class="container">
+      <nav class="breadcrumb">
+        {% block breadcrumb_items %}
+          <a href="{% url 'commentaries:commentaries' %}" class="breadcrumb-item">Commentaries</a>
+        {% endblock %}
+      </nav>
     </div>
+  </div>
 {% endblock %}
diff --git a/commentaries/templates/commentaries/comment_on_publication.html b/commentaries/templates/commentaries/comment_on_publication.html
index 2471db9ca..ac90492f5 100644
--- a/commentaries/templates/commentaries/comment_on_publication.html
+++ b/commentaries/templates/commentaries/comment_on_publication.html
@@ -3,20 +3,21 @@
 {% block pagetitle %}: Comment on your Publication{% endblock pagetitle %}
 
 {% block breadcrumb_items %}
-    {{ block.super }}
-    <span class="breadcrumb-item">Comment on your Publication</span>
+  {{ block.super }}
+  <span class="breadcrumb-item">Comment on your Publication</span>
 {% endblock %}
 
 {% block content %}
 
-<h1 class="highlight">Comment on your Publication</h1>
+  <h1 class="highlight">Comment on your Publication</h1>
 
-{% include 'partials/journals/publication_li_content.html' with publication=publication %}
+  {% include 'partials/journals/publication_li_content.html' with publication=publication %}
 
-<h3 class="mt-2">Abstract</h3>
-<p>{{ publication.abstract|default:'No abstract found' }}</p>
+  <h3 class="mt-2">Abstract</h3>
+  <p>{{ publication.abstract|default:'No abstract found' }}</p>
 
-{% url 'comments:new_comment' object_id=object_id type_of_object=type_of_object as url %}
-{% include 'comments/_add_comment_form.html' with form=form url=url %}
+  {% url 'comments:new_comment' object_id=object_id type_of_object=type_of_object as url %}
+
+  {% include 'comments/_add_comment_form.html' with form=form url=url %}
 
 {% endblock content %}
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 710c058db..0b9158444 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -5,27 +5,27 @@
 {% block pagetitle %}: Commentary detail{% endblock pagetitle %}
 
 {% block breadcrumb_items %}
-    {{ block.super }}
-    <span class="breadcrumb-item">{{ commentary }}</span>
+  {{ block.super }}
+  <span class="breadcrumb-item">{{ commentary }}</span>
 {% endblock %}
 
 {% block content %}
 
-<h1 class="highlight">SciPost Commentary Page</h1>
+  <h1 class="highlight">SciPost Commentary Page</h1>
 
-<h3>Original publication:</h3>
-{% include 'commentaries/_commentary_summary.html' with commentary=commentary %}
+  <h3>Original publication:</h3>
+  {% include 'commentaries/_commentary_summary.html' with commentary=commentary %}
 
-<br>
+  <br>
 
-<h3>Abstract:</h3>
-<p>{{ commentary.pub_abstract }}</p>
+  <h3>Abstract:</h3>
+  <p>{{ commentary.pub_abstract }}</p>
 
-{% if commentary.comments.vetted %}
+  {% if commentary.comments.vetted %}
     <hr class="divider">
     {% include 'scipost/comments_block.html' with comments=commentary.comments.vetted type_of_object='Commentary' %}
-{% endif %}
+  {% endif %}
 
-{% include 'comments/new_comment.html' with object_id=commentary.id type_of_object='commentary' open_for_commenting=commentary.open_for_commenting %}
+  {% include 'comments/new_comment.html' with object_id=commentary.id type_of_object='commentary' open_for_commenting=commentary.open_for_commenting %}
 
 {% endblock content %}
diff --git a/commentaries/templates/commentaries/commentary_list.html b/commentaries/templates/commentaries/commentary_list.html
index 712ba8f2e..ba159caaa 100644
--- a/commentaries/templates/commentaries/commentary_list.html
+++ b/commentaries/templates/commentaries/commentary_list.html
@@ -6,91 +6,91 @@
 {% block pagetitle %}: Commentaries{% endblock pagetitle %}
 
 {% block headsup %}
-    <script type="text/javascript" async src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+  <script type="text/javascript" async src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 {% endblock headsup %}
 
 {% block content %}
-<div class="row">
+  <div class="row">
     <div class="col-md-4">
-        <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
-            <h1 class="mb-3">SciPost Commentaries</h1>
-            <h4>
-                <a href="{% url 'commentaries:howto' %}">SciPost Commentaries how-to</a>
-            </h4>
-            <h3>
-                <a href="{% url 'commentaries:request_commentary' %}">Request a new Commentary Page</a>
-            </h3>
-        </div>
+      <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
+        <h1 class="mb-3">SciPost Commentaries</h1>
+        <h4>
+          <a href="{% url 'commentaries:howto' %}">SciPost Commentaries how-to</a>
+        </h4>
+        <h3>
+          <a href="{% url 'commentaries:request_commentary' %}">Request a new Commentary Page</a>
+        </h3>
+      </div>
     </div>
     <div class="col-md-4">
-        <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
-            <h2>Search SciPost Commentaries:</h2>
-            <form action="{% url 'commentaries:commentaries' %}" class="small" method="get">
-                {{ form|bootstrap:'4,8,sm' }}
-                <input class="btn btn-outline-secondary" type="submit"  value="Search"/>
-            </form>
-        </div>
+      <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
+        <h2>Search SciPost Commentaries:</h2>
+        <form action="{% url 'commentaries:commentaries' %}" class="small" method="get">
+          {{ form|bootstrap:'4,8,sm' }}
+          <input class="btn btn-outline-secondary" type="submit"  value="Search"/>
+        </form>
+      </div>
     </div>
     <div class="col-md-4">
-        <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
-            <h2>View SciPost Commentaries</h2>
-            <ul>
-                <li>Physics: last <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=1 %}">week</a>, <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=4 %}">month</a> or <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=52 %}">year</a> </li>
-            </ul>
-        </div>
+      <div class="p-3 mb-3 bg-light scipost-bar border min-height-190">
+        <h2>View SciPost Commentaries</h2>
+        <ul>
+          <li>Physics: last <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=1 %}">week</a>, <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=4 %}">month</a> or <a href="{% url 'commentaries:browse' discipline='physics' nrweeksback=52 %}">year</a> </li>
+        </ul>
+      </div>
     </div>
-</div>
+  </div>
 
-{% if not browse and recent %}
-<hr>
-<div class="row">
-    <div class="col-12">
+  {% if not browse and recent %}
+    <hr>
+    <div class="row">
+      <div class="col-12">
         <h2>Recent Comments</h2>
-    </div>
-    <div class="col-12">
+      </div>
+      <div class="col-12">
         <ul class="list-group list-group-flush">
-            {% for comment in comment_list %}
-                <li class="list-group-item">
-                    {% include 'comments/_comment_card_content.html' with comment=comment %}
-                </li>
-            {% endfor %}
+          {% for comment in comment_list %}
+            <li class="list-group-item">
+              {% include 'comments/_comment_card_content.html' with comment=comment %}
+            </li>
+          {% endfor %}
         </ul>
+      </div>
     </div>
-</div>
-{% endif %}
+  {% endif %}
 
-<hr>
-<div class="row">
+  <hr>
+  <div class="row">
     <div class="col-12">
-        {% if recent %}
-          <h2>Recently active Commentaries:</h2>
-        {% elif browse %}
-          <h2>Commentaries in {{ discipline }} in the last {{ nrweeksback }} week{{ nrweeksback|pluralize }}:</h2>
-        {% else %}
-          <h2>Search results:</h3>
-        {% endif %}
+      {% if recent %}
+        <h2>Recently active Commentaries:</h2>
+      {% elif browse %}
+        <h2>Commentaries in {{ discipline }} in the last {{ nrweeksback }} week{{ nrweeksback|pluralize }}:</h2>
+      {% else %}
+        <h2>Search results:</h2>
+      {% endif %}
     </div>
     {% if is_paginated %}
-        <div class="col-12">
-            {% include 'partials/pagination.html' with page_obj=page_obj %}
-        </div>
+      <div class="col-12">
+        {% include 'partials/pagination.html' with page_obj=page_obj %}
+      </div>
     {% endif %}
     <div class="col-12">
-        <ul class="list-group list-group-flush">
-            {% for object in commentary_list %}
-                <li class="list-group-item">
-                    {% include 'commentaries/_commentary_card_content.html' with commentary=object %}
-                </li>
-            {% empty %}
-                <h3><em>No match found for your search query.</em></h3>
-            {% endfor %}
-        </ul>
+      <ul class="list-group list-group-flush">
+        {% for object in commentary_list %}
+          <li class="list-group-item">
+            {% include 'commentaries/_commentary_card_content.html' with commentary=object %}
+          </li>
+        {% empty %}
+          <h3><em>No match found for your search query.</em></h3>
+        {% endfor %}
+      </ul>
     </div>
     {% if is_paginated %}
-        <div class="col-12">
-            {% include 'partials/pagination.html' with page_obj=page_obj %}
-        </div>
+      <div class="col-12">
+        {% include 'partials/pagination.html' with page_obj=page_obj %}
+      </div>
     {% endif %}
-</div>
+  </div>
 
 {% endblock content %}
diff --git a/commentaries/templates/commentaries/howto.html b/commentaries/templates/commentaries/howto.html
index ce7b1bc65..9d2bd935e 100644
--- a/commentaries/templates/commentaries/howto.html
+++ b/commentaries/templates/commentaries/howto.html
@@ -4,21 +4,21 @@
 
 {% block content %}
 
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <h1 class="highlight">SciPost Commentaries how-to</h1>
-        <h2>Activation procedure</h2>
-          <p>A Commentary Page can be requested by any registered SciPost Contributor for any published scientific paper or arXiv preprint by filling the <a href="{% url 'commentaries:request_commentary' %}">Commentary request form</a>. After vetting by an Editor, the Commentary Page is activated and made open for Comments from registered SciPost Contributors. Authors can reply to Comments, and Contributors can add Comments to the chain.</p>
-          <ul>
-            <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
-          </ul>
+      <h1 class="highlight">SciPost Commentaries how-to</h1>
+      <h2>Activation procedure</h2>
+      <p>A Commentary Page can be requested by any registered SciPost Contributor for any published scientific paper or arXiv preprint by filling the <a href="{% url 'commentaries:request_commentary' %}">Commentary request form</a>. After vetting by an Editor, the Commentary Page is activated and made open for Comments from registered SciPost Contributors. Authors can reply to Comments, and Contributors can add Comments to the chain.</p>
+      <ul>
+        <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
+      </ul>
 
-          <br/>
-          <h3>Standardized URLs</h3>
-          <p>In order to facilitate localization of commentaries on particular publications, within SciPost, all Commentary Pages have a standardized URL of the form</p>
-          <p class="text-blue">https://scipost.org/commentary/IDENTIFIER</p>
-          <p>where IDENTIFIER is either the (by definition unique and stable) DOI of the published paper, or the arXiv identifier in new (arXiv:####.#####v#) or old (cond-mat/#######v#) style. NOTE: for arXiv, we systematically require the presence of the version number in order to avoid confusion (and yes, we do so even if there exists only one version).</p>
+      <br/>
+      <h3>Standardized URLs</h3>
+      <p>In order to facilitate localization of commentaries on particular publications, within SciPost, all Commentary Pages have a standardized URL of the form</p>
+      <p class="text-blue">https://scipost.org/commentary/IDENTIFIER</p>
+      <p>where IDENTIFIER is either the (by definition unique and stable) DOI of the published paper, or the arXiv identifier in new (arXiv:####.#####v#) or old (cond-mat/#######v#) style. NOTE: for arXiv, we systematically require the presence of the version number in order to avoid confusion (and yes, we do so even if there exists only one version).</p>
     </div>
-</div>
+  </div>
 
 {% endblock %}
diff --git a/commentaries/templates/commentaries/modify_commentary_request.html b/commentaries/templates/commentaries/modify_commentary_request.html
index e364d6e61..e786196b9 100644
--- a/commentaries/templates/commentaries/modify_commentary_request.html
+++ b/commentaries/templates/commentaries/modify_commentary_request.html
@@ -5,40 +5,40 @@
 {% block pagetitle %}: vet Commentary requests{% endblock pagetitle %}
 
 {% block breadcrumb_items %}
-    {{block.super}}
-    <span class="breadcrumb-item">Vet Commentary Page requests</span>
+  {{block.super}}
+  <span class="breadcrumb-item">Vet Commentary Page requests</span>
 {% endblock %}
 
 {% block content %}
 
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <h1>SciPost Commentary Page request to modify and accept:</h1>
+      <h1>SciPost Commentary Page request to modify and accept:</h1>
     </div>
-</div>
+  </div>
 
-<hr>
-<div class="row">
+  <hr>
+  <div class="row">
     <div class="col-12">
-        {% include 'commentaries/_commentary_summary.html' with commentary=commentary %}
+      {% include 'commentaries/_commentary_summary.html' with commentary=commentary %}
     </div>
-</div>
+  </div>
 
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <h3 class="mt-4">Abstract:</h3>
-        <p>{{ commentary.pub_abstract }}</p>
+      <h3 class="mt-4">Abstract:</h3>
+      <p>{{ commentary.pub_abstract }}</p>
     </div>
-</div>
+  </div>
 
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <form action="{% url 'commentaries:modify_commentary_request' commentary_id=commentary.id %}" method="post">
-            {% csrf_token %}
-            {{ form|bootstrap }}
-            <input type="submit" class="btn btn-outline-secondary" value="Submit and accept" />
-        </form>
+      <form action="{% url 'commentaries:modify_commentary_request' commentary_id=commentary.id %}" method="post">
+        {% csrf_token %}
+        {{ form|bootstrap }}
+        <input type="submit" class="btn btn-outline-secondary" value="Submit and accept" />
+      </form>
     </div>
-</div>
+  </div>
 
 {% endblock  %}
diff --git a/commentaries/templates/commentaries/request_arxiv_preprint.html b/commentaries/templates/commentaries/request_arxiv_preprint.html
index 3586fc213..a902d9b0f 100644
--- a/commentaries/templates/commentaries/request_arxiv_preprint.html
+++ b/commentaries/templates/commentaries/request_arxiv_preprint.html
@@ -6,35 +6,35 @@
 
 {% block content %}
 
-<div class="row">
+  <div class="row">
     <div class="col">
-        <div class="card card-gray">
-            <div class="card-body">
-              <h1 class="card-title">Request Activation of a Commentary Page</h1>
-              <a href="{% url 'commentaries:request_published_article' %}">Click here to request a Commentary Page on a published article</a>
-          </div>
+      <div class="card card-gray">
+        <div class="card-body">
+          <h1 class="card-title">Request Activation of a Commentary Page</h1>
+          <a href="{% url 'commentaries:request_published_article' %}">Click here to request a Commentary Page on a published article</a>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 
-<div class="row justify-content-center">
+  <div class="row justify-content-center">
     <div class="col-md-10 col-lg-8">
-        <form action="{% url 'commentaries:prefill_using_arxiv_identifier' %}" method="post">
-          {% csrf_token %}
-          {{ query_form|bootstrap }}
-          <input class="btn btn-outline-secondary" type="submit" value="Query arXiv"/>
-        </form>
+      <form action="{% url 'commentaries:prefill_using_arxiv_identifier' %}" method="post">
+        {% csrf_token %}
+        {{ query_form|bootstrap }}
+        <input class="btn btn-outline-secondary" type="submit" value="Query arXiv"/>
+      </form>
     </div>
-</div>
+  </div>
 
-<div class="row justify-content-center">
+  <div class="row justify-content-center">
     <div class="col-md-10 col-lg-8">
-        <form id="requestForm" action="{% url 'commentaries:request_arxiv_preprint' %}" method="post">
-            {% csrf_token %}
-            {{ form|bootstrap }}
-            <input class="btn btn-primary" type="submit" value="Submit"/>
-        </form>
+      <form id="requestForm" action="{% url 'commentaries:request_arxiv_preprint' %}" method="post">
+        {% csrf_token %}
+        {{ form|bootstrap }}
+        <input class="btn btn-primary" type="submit" value="Submit"/>
+      </form>
     </div>
-</div>
+  </div>
 
 {% endblock content%}
diff --git a/commentaries/templates/commentaries/request_commentary.html b/commentaries/templates/commentaries/request_commentary.html
index bc71f5b15..ee359e3cf 100644
--- a/commentaries/templates/commentaries/request_commentary.html
+++ b/commentaries/templates/commentaries/request_commentary.html
@@ -8,20 +8,23 @@
 
 {% block content %}
 
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <h1 class="highlight">Request Activation of a Commentary Page:</h1>
+      <h1 class="highlight">Request Activation of a Commentary Page:</h1>
     </div>
+  </div>
+
+  <div class="row">
     <div class="col-12">
-        <ul>
-            <li>
-                <a href="{% url 'commentaries:request_published_article' %}">Click here to request a Commentary Page on a published article</a>
-            </li>
-            <li>
-                <a href="{% url 'commentaries:request_arxiv_preprint' %}">Click here to request a Commentary Page on an arXiv preprint</a>
-            </li>
-        </ul>
+      <ul>
+        <li>
+          <a href="{% url 'commentaries:request_published_article' %}">Click here to request a Commentary Page on a published article</a>
+        </li>
+        <li>
+          <a href="{% url 'commentaries:request_arxiv_preprint' %}">Click here to request a Commentary Page on an arXiv preprint</a>
+        </li>
+      </ul>
     </div>
-</div>
+  </div>
 
 {% endblock content %}
diff --git a/commentaries/templates/commentaries/request_published_article.html b/commentaries/templates/commentaries/request_published_article.html
index 1c8a42f7e..495e98b29 100644
--- a/commentaries/templates/commentaries/request_published_article.html
+++ b/commentaries/templates/commentaries/request_published_article.html
@@ -6,36 +6,35 @@
 
 {% block content %}
 
-
-<div class="row">
+  <div class="row">
     <div class="col-12">
-        <div class="card card-gray">
-            <div class="card-body">
-              <h1 class="card-title">Request Activation of a Commentary Page</h1>
-              <a href="{% url 'commentaries:request_arxiv_preprint' %}">Click here to request a Commentary Page on an arXiv preprint</a>
-          </div>
+      <div class="card card-gray">
+        <div class="card-body">
+          <h1 class="card-title">Request Activation of a Commentary Page</h1>
+          <a href="{% url 'commentaries:request_arxiv_preprint' %}">Click here to request a Commentary Page on an arXiv preprint</a>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 
-<div class="row justify-content-center">
+  <div class="row justify-content-center">
     <div class='col-md-10 col-lg-8'>
-        <form action="{% url 'commentaries:prefill_using_DOI' %}" method="post">
-          {% csrf_token %}
-          {{ query_form|bootstrap }}
-          <input class="btn btn-outline-secondary" type="submit" value="Query DOI"/>
-        </form>
+      <form action="{% url 'commentaries:prefill_using_DOI' %}" method="post">
+        {% csrf_token %}
+        {{ query_form|bootstrap }}
+        <input class="btn btn-outline-secondary" type="submit" value="Query DOI"/>
+      </form>
     </div>
-</div>
+  </div>
 
-<div class="row justify-content-center">
+  <div class="row justify-content-center">
     <div class='col-md-10 col-lg-8'>
-        <form id="requestForm" action="{% url 'commentaries:request_published_article' %}" method="post">
-            {% csrf_token %}
-            {{ form|bootstrap }}
-            <input class="btn btn-primary" type="submit" value="Submit"/>
-        </form>
+      <form id="requestForm" action="{% url 'commentaries:request_published_article' %}" method="post">
+        {% csrf_token %}
+        {{ form|bootstrap }}
+        <input class="btn btn-primary" type="submit" value="Submit"/>
+      </form>
     </div>
-</div>
+  </div>
 
 {% endblock content %}
diff --git a/commentaries/templates/commentaries/vet_commentary_email_accepted.html b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
index d9bdf8271..630b8d691 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_accepted.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
@@ -1,6 +1,6 @@
-Dear {{commentary.requested_by.get_title_display}} {{commentary.requested_by.user.last_name}},
+Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
 
-The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has been activated at https://scipost.org/commentary/{{commentary.arxiv_or_DOI_string}}.
+The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has been activated at https://scipost.org/commentary/{{ commentary.arxiv_or_DOI_string }}.
 You are now welcome to submit your comments.
 
 Thank you for your contribution,
diff --git a/commentaries/templates/commentaries/vet_commentary_email_modified.html b/commentaries/templates/commentaries/vet_commentary_email_modified.html
index cd42da92b..908e8d6c5 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_modified.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_modified.html
@@ -1,6 +1,6 @@
-Dear {{commentary.requested_by.get_title_display}} {{commentary.requested_by.user.last_name}},
+Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
 
-The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has been activated (with slight modifications to your submitted details).
+The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has been activated (with slight modifications to your submitted details).
 You are now welcome to submit your comments.
 
 Thank you for your contribution,
diff --git a/commentaries/templates/commentaries/vet_commentary_email_rejected.html b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
index 20ecb6e21..15be125ed 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_rejected.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
@@ -1,10 +1,10 @@
-Dear {{commentary.requested_by.get_title_display}} {{commentary.requested_by.user.last_name}},
+Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
 
-The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has not been activated for the following reason: {{refusal_reason}}.
+The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has not been activated for the following reason: {{ refusal_reason }}.
 
 {% if further_explanation %}
 Further explanations:
-{{further_explanation}}
+{{ further_explanation }}
 {% endif %}
 
 Thank you for your interest,
diff --git a/commentaries/templates/commentaries/vet_commentary_requests.html b/commentaries/templates/commentaries/vet_commentary_requests.html
index 054c8bf06..52c5eb439 100644
--- a/commentaries/templates/commentaries/vet_commentary_requests.html
+++ b/commentaries/templates/commentaries/vet_commentary_requests.html
@@ -5,33 +5,33 @@
 {% block pagetitle %}: vet Commentary requests{% endblock pagetitle %}
 
 {% block breadcrumb_items %}
-    {{block.super}}
-    <span class="breadcrumb-item">Vet Commentary Page requests</span>
+  {{ block.super }}
+  <span class="breadcrumb-item">Vet Commentary Page requests</span>
 {% endblock %}
 
 {% block content %}
 
-{% if not commentary_to_vet %}
-  <h1>There are no Commentary Page requests for you to vet.</h1>
-  <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
-{% else %}
-  <h1 class="highlight">SciPost Commentary Page request to vet:</h1>
-
-
-  <div class="card">
-    <div class="card-body">
-      {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %}
-      <h3 class="mt-4">Abstract:</h3>
-      <p>{{ commentary_to_vet.pub_abstract }}</p>
-
-    </div>
-    <div class="card-body">
-      <form action="{% url 'commentaries:vet_commentary_requests_submit' commentary_id=commentary_to_vet.id %}" method="post">
-        {% csrf_token %}
-        {{ form|bootstrap }}
-        <input type="submit" class="btn btn-primary" value="Submit" />
+  {% if not commentary_to_vet %}
+    <h1>There are no Commentary Page requests for you to vet.</h1>
+    <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
+  {% else %}
+    <h1 class="highlight">SciPost Commentary Page request to vet:</h1>
+
+
+    <div class="card">
+      <div class="card-body">
+        {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %}
+        <h3 class="mt-4">Abstract:</h3>
+        <p>{{ commentary_to_vet.pub_abstract }}</p>
+      </div>
+      <div class="card-footer">
+        <form action="{% url 'commentaries:vet_commentary_requests_submit' commentary_id=commentary_to_vet.id %}" method="post">
+          {% csrf_token %}
+          {{ form|bootstrap }}
+          <input type="submit" class="btn btn-primary" value="Submit" />
+        </form>
+      </div>
     </div>
-  </div>
-{% endif %}
+  {% endif %}
 
 {% endblock  %}
-- 
GitLab