From 0ebe2e4a61e828a02f55e01680e6071e4645f932 Mon Sep 17 00:00:00 2001
From: Jean-Sebastien Caux <J.S.Caux@uva.nl>
Date: Sun, 10 Jan 2016 12:42:50 +0000
Subject: [PATCH] Used scipost/base.html template in all other templates;
 trying to get to valid HTML

---
 .../templates/commentaries/commentaries.html  | 18 +++++----
 .../commentaries/commentary_detail.html       | 26 ++++++++-----
 .../commentaries/request_commentary.html      | 11 ++----
 .../commentaries/request_commentary_ack.html  | 11 ++----
 .../vet_commentary_request_ack.html           | 11 ++----
 .../commentaries/vet_commentary_requests.html | 14 ++-----
 commentaries/views.py                         |  6 +--
 .../comments/author_reply_to_comment.html     | 13 ++-----
 .../comments/author_reply_to_report.html      | 13 ++-----
 .../comments/comment_submission_ack.html      | 10 ++---
 .../templates/comments/reply_to_comment.html  | 17 ++-------
 .../comments/vet_author_replies.html          | 14 ++-----
 .../comments/vet_author_reply_ack.html        | 11 ++----
 .../comments/vet_submitted_comment_ack.html   | 11 ++----
 .../comments/vet_submitted_comments.html      | 14 ++-----
 .../templates/contributors/login.html         | 11 ++----
 .../templates/contributors/login_error.html   | 12 ++----
 .../templates/contributors/logout.html        | 11 ++----
 .../templates/contributors/personal_page.html | 12 ++----
 .../templates/contributors/register.html      | 11 ++----
 .../contributors/thanks_for_registering.html  | 10 ++---
 .../vet_registration_request_ack.html         | 11 ++----
 .../vet_registration_requests.html            | 11 ++----
 contributors/views.py                         | 12 ++++--
 journals/templates/journals/journals.html     | 27 ++-----------
 .../ratings/vote_on_authorreply_ack.html      | 10 ++---
 .../ratings/vote_on_comment_ack.html          | 10 ++---
 .../ratings/vote_on_commentary_ack.html       | 10 ++---
 .../templates/ratings/vote_on_report_ack.html | 10 ++---
 .../ratings/vote_on_submission_ack.html       | 10 ++---
 reports/templates/reports/submit_report.html  | 13 +++----
 .../templates/reports/submit_report_ack.html  | 10 ++---
 .../reports/vet_submitted_report_ack.html     | 11 ++----
 .../reports/vet_submitted_reports.html        | 16 +++-----
 scipost/templates/scipost/about.html          | 12 ++----
 scipost/templates/scipost/base.html           | 23 +++++++++++
 .../templates/scipost/disabled_account.html   | 12 ++----
 scipost/templates/scipost/footer.html         |  2 +-
 scipost/templates/scipost/index.html          | 38 ++-----------------
 .../scipost/peer_witnessed_refereeing.html    | 10 ++---
 scipost/urls.py                               |  1 +
 scipost/views.py                              |  3 ++
 .../process_new_submission_ack.html           | 11 ++----
 .../submissions/process_new_submissions.html  | 14 ++-----
 .../submissions/sub_and_ref_procedure.html    | 17 +++++----
 .../submissions/submission_detail.html        | 21 +++++-----
 .../templates/submissions/submissions.html    | 13 ++-----
 .../submissions/submit_manuscript.html        | 14 +++----
 .../submissions/submit_manuscript_ack.html    | 11 ++----
 49 files changed, 248 insertions(+), 382 deletions(-)
 create mode 100644 scipost/templates/scipost/base.html

diff --git a/commentaries/templates/commentaries/commentaries.html b/commentaries/templates/commentaries/commentaries.html
index e86bc98b4..57ba621f6 100644
--- a/commentaries/templates/commentaries/commentaries.html
+++ b/commentaries/templates/commentaries/commentaries.html
@@ -1,14 +1,15 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: Commentaries</title>
+{% block pagetitle %}: Commentaries{% endblock pagetitle %}
 
-{% load mathjax %}
+{% block headsup %}
+<script type="text/javascript" async src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+{% endblock headsup %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
-{% mathjax_scripts %}
+<!-- Temporary strip for online version -->
+{% if user.is_authenticated %}
 
 <section>
   <h1>SciPost Commentaries</h1>
@@ -61,5 +62,6 @@
   <p>The original publication subject to the Commentary can be rated by Contributors. An aggregate of these ratings is displayed next to the publication's summary info. All Comments and Replies are similarly open to Contributor rating. Ratings in aggregated form are made publicly available.</p>
 </section>
 
+{% endif %} <!-- Temporary strip -->
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 5391f2527..9d237dc6d 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -1,12 +1,9 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
-<!--<script type="text/javascript" src="{% static 'js/jquery.js' %}"></script> -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: Commentary detail</title>
+{% block pagetitle %}: Commentary detail{% endblock pagetitle %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block headsup %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 
   <script>
     $(document).ready(function(){
@@ -20,9 +17,16 @@
     });
   </script>
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+<script type="text/javascript" async src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+<script type="text/javascript">MathJax.Hub.Config({"tex2jax": {"inlineMath": [["$", "$"], ["\\(", "\\)"]], "processEscapes": true}});</script>
+
 
+{% endblock headsup %}
+
+{% block bodysup %}
+
+<!-- Temporary strip -->
+{% if user.is_authenticated %}
 
 <section>
   <div class="row">
@@ -269,4 +273,6 @@
 </section>
 {% endif %}
 
-{% include 'scipost/footer.html' %}
+{% endif %} <!-- Temporary strip -->
+
+{% endblock bodysup %}
diff --git a/commentaries/templates/commentaries/request_commentary.html b/commentaries/templates/commentaries/request_commentary.html
index 2dcfdc8c2..fe7d1e18e 100644
--- a/commentaries/templates/commentaries/request_commentary.html
+++ b/commentaries/templates/commentaries/request_commentary.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: request Commentary</title>
+{% block pagetitle %}: request Commentary{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Request Activation of a Commentary Page:</h1>
@@ -19,5 +17,4 @@
   </form>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/commentaries/templates/commentaries/request_commentary_ack.html b/commentaries/templates/commentaries/request_commentary_ack.html
index f6eeddfe7..167a697ed 100644
--- a/commentaries/templates/commentaries/request_commentary_ack.html
+++ b/commentaries/templates/commentaries/request_commentary_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: request Commentary (ack)</title>
+{% block pagetitle %}: request Commentary (ack){% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for your request for a Commentary Page</h1>
   <p>Your request will soon be handled by an Editor.</p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/commentaries/templates/commentaries/vet_commentary_request_ack.html b/commentaries/templates/commentaries/vet_commentary_request_ack.html
index a883a763b..ad329294f 100644
--- a/commentaries/templates/commentaries/vet_commentary_request_ack.html
+++ b/commentaries/templates/commentaries/vet_commentary_request_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: vet Commentary request (ack)</title>
+{% block pagetitle %}: vet Commentary request (ack){% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Commentary request vetted.</h1>
   <p><a href="{% url 'commentaries:vet_commentary_requests' %}">Back to Commentary requests page</a></p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/commentaries/templates/commentaries/vet_commentary_requests.html b/commentaries/templates/commentaries/vet_commentary_requests.html
index 11d2b8790..22998d4d9 100644
--- a/commentaries/templates/commentaries/vet_commentary_requests.html
+++ b/commentaries/templates/commentaries/vet_commentary_requests.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: vet Commentary requests{% endblock pagetitle %}
 
-<title>SciPost: vet Commentary requests</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Commentary Page requests to vet:</h1>
@@ -37,5 +32,4 @@
   {% endfor %}
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/commentaries/views.py b/commentaries/views.py
index a7028b1ca..4d2a94b2b 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -74,14 +74,14 @@ def vet_commentary_request_ack(request, commentary_id):
                 commentary.vetted = True
                 commentary.save()
                 email_text = 'The Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has been activated. You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
-                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'noreply@scipost.org', ['jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
+                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [request.user.email, 'commentaries@scipost.org'], reply_to=['commentaries@scipost.org'])
                 emailmessage.send(fail_silently=False)                
             elif form.cleaned_data['action_option'] == '0':
                 # re-edit the form starting from the data provided
                 form2 = RequestCommentaryForm(initial={'pub_title': commentary.pub_title, 'arxiv_link': commentary.arxiv_link, 'pub_DOI_link': commentary.pub_DOI_link, 'author_list': commentary.author_list, 'pub_date': commentary.pub_date, 'pub_abstract': commentary.pub_abstract})
                 commentary.delete()
                 email_text = 'The Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has been activated (with slight modifications to your submitted details). You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
-                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'noreply@scipost.org', ['jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
+                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [request.user.email, 'commentaries@scipost.org'], reply_to=['commentaries@scipost.org'])
                 emailmessage.send(fail_silently=False)                
                 context = {'form': form2 }
                 return render(request, 'commentaries/request_commentary.html', context)
@@ -90,7 +90,7 @@ def vet_commentary_request_ack(request, commentary_id):
                 email_text = 'The Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has not been activated for the following reason: ' + form.cleaned_data['refusal_reason'] + '.\n\nThank you for your interest, \nThe SciPost Team.'
                 if form.cleaned_data['email_response_field']:
                     email_text += '\n\nFurther explanations: ' + form.cleaned_data['email_response_field']
-                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'noreply@scipost.org', ['jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
+                emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [request.user.email, 'commentaries@scipost.org'], reply_to=['comentaries@scipost.org'])
                 emailmessage.send(fail_silently=False)                
                 commentary.delete()
 
diff --git a/comments/templates/comments/author_reply_to_comment.html b/comments/templates/comments/author_reply_to_comment.html
index 2855a180c..d219c3dd9 100644
--- a/comments/templates/comments/author_reply_to_comment.html
+++ b/comments/templates/comments/author_reply_to_comment.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: author reply to comment{% endblock pagetitle %}
 
-<title>SciPost: author reply to comment</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 {% if user.is_authenticated %}
 <section>
@@ -71,4 +66,4 @@
 </section>
 {% endif %}
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/author_reply_to_report.html b/comments/templates/comments/author_reply_to_report.html
index 58355a505..492b11b4a 100644
--- a/comments/templates/comments/author_reply_to_report.html
+++ b/comments/templates/comments/author_reply_to_report.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: author reply to report{% endblock pagetitle %}
 
-<title>SciPost: author reply to report</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 {% if user.is_authenticated %}
 <section>
@@ -79,4 +74,4 @@
 </section>
 {% endif %}
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/comment_submission_ack.html b/comments/templates/comments/comment_submission_ack.html
index 17b5c2c57..b29ae9eb7 100644
--- a/comments/templates/comments/comment_submission_ack.html
+++ b/comments/templates/comments/comment_submission_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: comment submitted</title>
+{% block pagetitle %}: comment submitted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for contributing a comment.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index c32f0ed66..e1bbdbb8e 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: reply to comment{% endblock pagetitle %}
 
-<title>SciPost: reply to comment</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 {% if user.is_authenticated %}
 <section>
@@ -88,10 +83,6 @@
             <input type="submit" value="Submit your Reply">
           </div>
         </div>
-<!--
-	{{ form }}
-	<input type="submit" value="Submit your Reply">
--->
       </form>
     </div>
 
@@ -100,4 +91,4 @@
 </section>
 {% endif %}
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/vet_author_replies.html b/comments/templates/comments/vet_author_replies.html
index 19ac92463..33b05b3b5 100644
--- a/comments/templates/comments/vet_author_replies.html
+++ b/comments/templates/comments/vet_author_replies.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: vet author replies{% endblock pagetitle %}
 
-<title>SciPost: vet author replies</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Author Replies to vet:</h1>
@@ -66,5 +61,4 @@
   {% endfor %}
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/vet_author_reply_ack.html b/comments/templates/comments/vet_author_reply_ack.html
index 56aa7b2c7..2a0da7ca7 100644
--- a/comments/templates/comments/vet_author_reply_ack.html
+++ b/comments/templates/comments/vet_author_reply_ack.html
@@ -1,14 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: author reply vetted</title>
+{% block pagetitle %}: author reply vetted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Reply vetted.</h1>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/vet_submitted_comment_ack.html b/comments/templates/comments/vet_submitted_comment_ack.html
index a80405445..b85ba450e 100644
--- a/comments/templates/comments/vet_submitted_comment_ack.html
+++ b/comments/templates/comments/vet_submitted_comment_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: comment vetted</title>
+{% block pagetitle %}: comment vetted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost submitted Comment vetted.</h1>
   <p><a href="{% url 'comments:vet_submitted_comments' %}">Back to submitted Comments page</a></p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/comments/templates/comments/vet_submitted_comments.html b/comments/templates/comments/vet_submitted_comments.html
index 1710bbb59..a257c6365 100644
--- a/comments/templates/comments/vet_submitted_comments.html
+++ b/comments/templates/comments/vet_submitted_comments.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: vet comments{% endblock pagetitle %}
 
-<title>SciPost: vet comments</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Comments to vet:</h1>
@@ -59,5 +54,4 @@
   {% endfor %}
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/login.html b/contributors/templates/contributors/login.html
index 6efecb94c..1c7e9fefd 100644
--- a/contributors/templates/contributors/login.html
+++ b/contributors/templates/contributors/login.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: login</title>
+{% block pagetitle %}: login{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <div class="row">
@@ -31,5 +29,4 @@
   </div>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/login_error.html b/contributors/templates/contributors/login_error.html
index 0640cde74..9f893a107 100644
--- a/contributors/templates/contributors/login_error.html
+++ b/contributors/templates/contributors/login_error.html
@@ -1,16 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: login error</title>
+{% block pagetitle %}: login error{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h3>login error</h3>
   <p>Please try again.</p>
 </section>
 
-
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/logout.html b/contributors/templates/contributors/logout.html
index 0264e82c4..6a8fd267f 100644
--- a/contributors/templates/contributors/logout.html
+++ b/contributors/templates/contributors/logout.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: logged out</title>
+{% block pagetitle %}: logged out{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Your are now logged out of SciPost.</h1>
   <p>Keep contributing!</p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/personal_page.html b/contributors/templates/contributors/personal_page.html
index 3dee2ea3e..f6c6d8b15 100644
--- a/contributors/templates/contributors/personal_page.html
+++ b/contributors/templates/contributors/personal_page.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: personal page</title>
+{% block pagetitle %}: personal page{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Welcome to your SciPost Personal Page, {{ user.username }} (rank {{ contributor.rank }} Contributor)</h1>
@@ -109,6 +107,4 @@
 </section>
 {% endif %}
 
-
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/register.html b/contributors/templates/contributors/register.html
index 5adf5ccb7..4220fe7a6 100644
--- a/contributors/templates/contributors/register.html
+++ b/contributors/templates/contributors/register.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: register</title>
+{% block pagetitle %}: register{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Register to SciPost</h1>
@@ -19,5 +17,4 @@
   </form>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/thanks_for_registering.html b/contributors/templates/contributors/thanks_for_registering.html
index 4a46d2014..bb20de3c2 100644
--- a/contributors/templates/contributors/thanks_for_registering.html
+++ b/contributors/templates/contributors/thanks_for_registering.html
@@ -1,14 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: thanks for registering</title>
+{% block pagetitle %}: thanks for registering{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
 <h1>Thanks for registering to SciPost.</h1>
 <p>Your credentials will soon be verified by an Editor. If accepted, your rank (currently: 'newly registered') will be set to 'normal user', enabling you to submit, comment and vote.</p>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/vet_registration_request_ack.html b/contributors/templates/contributors/vet_registration_request_ack.html
index eeaaf23ce..597018a24 100644
--- a/contributors/templates/contributors/vet_registration_request_ack.html
+++ b/contributors/templates/contributors/vet_registration_request_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: registration vetted</title>
+{% block pagetitle %}: registration vetted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Registration request vetted.</h1>
   <p><a href="{% url 'contributors:vet_registration_requests' %}">Back to Registration requests page</a></p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/templates/contributors/vet_registration_requests.html b/contributors/templates/contributors/vet_registration_requests.html
index cea529572..8f0900d16 100644
--- a/contributors/templates/contributors/vet_registration_requests.html
+++ b/contributors/templates/contributors/vet_registration_requests.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: registrations to vet</title>
+{% block pagetitle %}: registrations to vet{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Registration requests to vet:</h1>
@@ -35,5 +33,4 @@
   {% endfor %}
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/contributors/views.py b/contributors/views.py
index 53b5f8023..0eac4377e 100644
--- a/contributors/views.py
+++ b/contributors/views.py
@@ -15,7 +15,7 @@ from .forms import *
 
 from commentaries.models import Commentary
 from comments.models import Comment, AuthorReply
-from contributors.models import Contributor
+#from contributors.models import Contributor
 from reports.models import Report
 from submissions.models import Submission
 
@@ -47,6 +47,9 @@ def register(request):
                 personalwebpage = form.cleaned_data['personalwebpage'],
                 )
             contributor.save()
+            email_text = 'Dear ' + contributor.title + ' ' + contributor.user.last_name + ', \n Your request for registration to the SciPost publication portal has been received, and will be processed soon. Many thanks for your interest.  \n\n The SciPost Team.'
+            emailmessage = EmailMessage('SciPost registration request received', email_text, 'registration@scipost.org', [contributor.user.email, 'registration@scipost.org'], reply_to=['registration@scipost.org'])
+            emailmessage.send(fail_silently=False)
             return HttpResponseRedirect('thanks_for_registering')
     # if GET or other method, create a blank form
     else:
@@ -77,8 +80,7 @@ def vet_registration_request_ack(request, contributor_id):
                 contributor.rank = 1
                 contributor.save()
                 email_text = 'Dear ' + contributor.title + ' ' + contributor.user.last_name + ', \n Your registration to the SciPost publication portal has been accepted. You can now login and contribute. \n\n The SciPost Team.'
-                #send_mail('SciPost registration accepted', email_text, 'noreply@scipost.org', [contributor.user.email, 'noreply@scipost.org'], fail_silently=False)
-                emailmessage = EmailMessage('SciPost registration accepted', email_text, 'noreply@scipost.org', [contributor.user.email, 'jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
+                emailmessage = EmailMessage('SciPost registration accepted', email_text, 'registration@scipost.org', [contributor.user.email, 'jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
                 emailmessage.send(fail_silently=False)
             else:
                 email_text = 'Dear ' + contributor.title + ' ' + contributor.user.last_name + ', \n Your registration to the SciPost publication portal has been turned down, the reason being: ' + form.cleaned_data['refusal_reason'] + '. You can however still view all SciPost contents, just not submit papers, comments or votes. We nonetheless thank you for your interest. \n\n The SciPost Team.'
@@ -144,6 +146,8 @@ def personal_page(request):
         context = {'contributor': contributor, 'nr_reg_to_vet': nr_reg_to_vet, 'nr_commentary_page_requests_to_vet': nr_commentary_page_requests_to_vet, 'nr_comments_to_vet': nr_comments_to_vet, 'nr_author_replies_to_vet': nr_author_replies_to_vet, 'nr_reports_to_vet': nr_reports_to_vet, 'nr_submissions_to_process': nr_submissions_to_process }
         return render(request, 'contributors/personal_page.html', context)
     else:
-        return render(request, 'contributors/login.html')
+        form = AuthenticationForm()
+        context = {'form': form}
+        return render(request, 'contributors/login.html', context)
 
 
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 21f408da4..55b6cc205 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -1,11 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: Journals</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block pagetitle %}: Journals{% endblock pagetitle %}
 
+{% block bodysup %}
 
 <!-- Temporary strip for online version -->
 {% if user.is_authenticated %}
@@ -64,22 +61,6 @@
     </div>
   </div>
 
-
-
-
-<!--
-  <div class="row">
-    <div class="col-6">
-      <h3>SciPost Physics Select</h3><p>(Editorially-selected Letters of superlative quality)</p>
-      <h3>SciPost Physics Letters</h3><p>(Letters of broad interest and outstanding quality)</p>
-    </div>
-    <div class="col-6">
-      <h3>SciPost Physics X</h3><p>(articles of exceptional quality)</p>
-      <h3>SciPost Physics </h3><p>(Experimental, Theoretical and Computational Physics)</p>
-      <h3>SciPost Physics Lecture Notes</h3><p>(Research-level didactic material)</p>
-    </div>
-  </div>
--->
   <br/>
   <hr>
   <h1><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and Refereeing procedure</a></h1>
@@ -88,4 +69,4 @@
 
 {% endif %} <!-- temporary strip -->
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/ratings/templates/ratings/vote_on_authorreply_ack.html b/ratings/templates/ratings/vote_on_authorreply_ack.html
index 963fa590b..6518c06b4 100644
--- a/ratings/templates/ratings/vote_on_authorreply_ack.html
+++ b/ratings/templates/ratings/vote_on_authorreply_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: ratings</title>
+{% block pagetitle %}: ratings{% endblock %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for rating an Author Reply.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/ratings/templates/ratings/vote_on_comment_ack.html b/ratings/templates/ratings/vote_on_comment_ack.html
index ed5958380..63d759cdf 100644
--- a/ratings/templates/ratings/vote_on_comment_ack.html
+++ b/ratings/templates/ratings/vote_on_comment_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: ratings</title>
+{% block pagetitle %}: ratings{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for rating a Comment.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/ratings/templates/ratings/vote_on_commentary_ack.html b/ratings/templates/ratings/vote_on_commentary_ack.html
index 3408dfd30..4ee1d88e2 100644
--- a/ratings/templates/ratings/vote_on_commentary_ack.html
+++ b/ratings/templates/ratings/vote_on_commentary_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: ratings</title>
+{% block pagetitle %}: ratings{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for rating the publication associated to this Commentary.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/ratings/templates/ratings/vote_on_report_ack.html b/ratings/templates/ratings/vote_on_report_ack.html
index 5d2e37258..5aab8138e 100644
--- a/ratings/templates/ratings/vote_on_report_ack.html
+++ b/ratings/templates/ratings/vote_on_report_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: ratings</title>
+{% block pagetitle %}: ratings{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for rating a Report.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/ratings/templates/ratings/vote_on_submission_ack.html b/ratings/templates/ratings/vote_on_submission_ack.html
index 3ea8b9724..5dfc6c97b 100644
--- a/ratings/templates/ratings/vote_on_submission_ack.html
+++ b/ratings/templates/ratings/vote_on_submission_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: ratings</title>
+{% block pagetitle %}: ratings{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for rating a SciPost Submission.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/reports/templates/reports/submit_report.html b/reports/templates/reports/submit_report.html
index 23ea0ec5a..22d0214ea 100644
--- a/reports/templates/reports/submit_report.html
+++ b/reports/templates/reports/submit_report.html
@@ -1,11 +1,10 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submit report</title>
+{% block pagetitle %}: submit report{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
+{% if user.is_authenticated %}
 <section>
   <h1>Submit a Report on a SciPost Submission</h1>
 </section>
@@ -38,6 +37,6 @@
     <input type="submit" value="Submit"/>
   </form>
 </section>
+{% endif %}
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/reports/templates/reports/submit_report_ack.html b/reports/templates/reports/submit_report_ack.html
index 473295f42..f16628bda 100644
--- a/reports/templates/reports/submit_report_ack.html
+++ b/reports/templates/reports/submit_report_ack.html
@@ -1,13 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submit report (ack)</title>
+{% block pagetitle %}: submit report (ack){% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for your Report.</h1>
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/reports/templates/reports/vet_submitted_report_ack.html b/reports/templates/reports/vet_submitted_report_ack.html
index c9e798704..b03cf25d0 100644
--- a/reports/templates/reports/vet_submitted_report_ack.html
+++ b/reports/templates/reports/vet_submitted_report_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: report vetted</title>
+{% block pagetitle %}: report vetted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost submitted Report vetted.</h1>
   <p><a href="{% url 'reports:vet_submitted_reports' %}">Back to submitted Reports page</a></p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/reports/templates/reports/vet_submitted_reports.html b/reports/templates/reports/vet_submitted_reports.html
index b8051bc13..910b7dfc2 100644
--- a/reports/templates/reports/vet_submitted_reports.html
+++ b/reports/templates/reports/vet_submitted_reports.html
@@ -1,14 +1,10 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: vet reports{% endblock pagetitle %}
 
-<title>SciPost: vet reports</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
+{% if submitted_reports_to_vet %}
 <section>
   <h1>SciPost Reports to vet:</h1>
   {% for report_to_vet in submitted_reports_to_vet %}
@@ -48,6 +44,6 @@
   </div>
   {% endfor %}
 </section>
+{% endif %}
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index 5f61ecb00..1ffc6c999 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -1,12 +1,9 @@
+{% extends 'scipost/base.html' %}
 
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% block pagetitle %}: About{% endblock pagetitle %}
 
-<title>SciPost: About</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
 
+{% block bodysup %}
 
 <!-- Temporary strip for online version -->
 {% if user.is_authenticated %}
@@ -108,5 +105,4 @@
 
 {% endif %} <!-- temporary strip -->
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/scipost/templates/scipost/base.html b/scipost/templates/scipost/base.html
new file mode 100644
index 000000000..367631077
--- /dev/null
+++ b/scipost/templates/scipost/base.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    {% load staticfiles %}
+    <link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+
+    <title>SciPost{% block pagetitle %}{% endblock pagetitle %}</title>
+
+    {% block headsup %}
+    {% endblock headsup %}
+  </head>
+
+  <body>
+    {% include 'scipost/header.html' %}
+    {% include 'scipost/navbar.html' %}
+
+    {% block bodysup %}
+    {% endblock bodysup %}
+
+    {% include 'scipost/footer.html' %}
+  </body>
+
+</html>    
diff --git a/scipost/templates/scipost/disabled_account.html b/scipost/templates/scipost/disabled_account.html
index cd867bd1d..5598d5b92 100644
--- a/scipost/templates/scipost/disabled_account.html
+++ b/scipost/templates/scipost/disabled_account.html
@@ -1,13 +1,9 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: account disabled</title>
+{% block pagetitle %}: account disabled{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <p>Your account is disabled.</p>
 
-
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/scipost/templates/scipost/footer.html b/scipost/templates/scipost/footer.html
index ca8798875..4a4186c8d 100644
--- a/scipost/templates/scipost/footer.html
+++ b/scipost/templates/scipost/footer.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-6">
       Copyright &copy; SciPost.org. 
-      <a href="mailto:J.S.Caux@uva.nl">Contact the administrator.</a>  
+      <a href="mailto:admin@scipost.org">Contact the administrators.</a>  
     </div>
     <!-- Temporary strip for online version -->
     {% if user.is_authenticated %}
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index fd8f49679..1a4ffe00f 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -1,10 +1,6 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <!-- Temporary strip for online version -->
 {% if user.is_authenticated %}
@@ -64,33 +60,5 @@
 {% endif %}
 
 {% endif %}
-<!--
-<section>
-  <div class="row">
-    <div class="col-4">
-      <h1><a href="{% url 'journals:journals' %}">SciPost Journals</a></h1>
-      <p>SciPost publishes a family of online open-access peer-witnessed refereed Journals covering all domains and specialties in the field of Physics.</p>
-    </div>
-    <div class="col-2"></div>
-    <div class="col-6">
-      <h3>SciPost Physics Select</h3>
-      <h3>SciPost Physics Letters</h3>
-      <h3>SciPost Physics X</h3>
-      <h3>SciPost Physics</h3>
-    </div>
-  </div>
-</section>
-
-<section>
-  <h1><a href="{% url 'submissions:submissions' %}">SciPost Submissions</a></h1>
-  <p>Submissions currently under consideration for publication in a SciPost Journal (open to Reporting and Commenting).</p>
-</section>
-
-<section>
-  <h1><a href="{% url 'commentaries:commentaries' %}">SciPost Commentaries</a></h1>
-  <p>SciPost Commentaries is a repository of Commentary Pages on scientific publications. Each Commentary Page contains summary info about the publication (Title, Author(s), arXiv preprint link, DOI link to published version, abstract), followed by Comments from Contributors and Author and Contributor Replies. </p>
-</section>
-
--->
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/scipost/templates/scipost/peer_witnessed_refereeing.html b/scipost/templates/scipost/peer_witnessed_refereeing.html
index 1d9344d9a..8519026d2 100644
--- a/scipost/templates/scipost/peer_witnessed_refereeing.html
+++ b/scipost/templates/scipost/peer_witnessed_refereeing.html
@@ -1,10 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: peer-witnessed refereeing</title>
+{% block pagetitle %}: peer-witnessed refereeing{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost's Peer Review Method: Peer-Witnessed Refereeing.</h1>
@@ -33,4 +31,4 @@
 
 </section>
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/scipost/urls.py b/scipost/urls.py
index 7808cd880..199cf0779 100644
--- a/scipost/urls.py
+++ b/scipost/urls.py
@@ -4,6 +4,7 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.index, name='index'),
+    url(r'^base$', views.base, name='base'),
     # Info
     url(r'^about$', views.about, name='about'),
     url(r'^description$', views.description, name='description'),
diff --git a/scipost/views.py b/scipost/views.py
index ec207f074..19d46bf32 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -25,6 +25,9 @@ def index(request):
 # Information
 ###############
 
+def base(request):
+    return render(request, 'scipost/base.html')
+
 def about(request):
     return render(request, 'scipost/about.html')
 
diff --git a/submissions/templates/submissions/process_new_submission_ack.html b/submissions/templates/submissions/process_new_submission_ack.html
index 8780cf30b..b66c87cbb 100644
--- a/submissions/templates/submissions/process_new_submission_ack.html
+++ b/submissions/templates/submissions/process_new_submission_ack.html
@@ -1,14 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submission processed</title>
+{% block pagetitle %}: submission processed{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>The new submission has been successfully assigned to an editor-in-charge.</h1>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/process_new_submissions.html b/submissions/templates/submissions/process_new_submissions.html
index 04e9a43dd..ae62957ea 100644
--- a/submissions/templates/submissions/process_new_submissions.html
+++ b/submissions/templates/submissions/process_new_submissions.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block pagetitle %}: process submissions{% endblock pagetitle %}
 
-<title>SciPost: process submissions</title>
-
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>SciPost Submissions to Process</h1>
@@ -36,5 +31,4 @@
   {% endfor %}
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index 5c47468c3..367aa61c7 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -1,10 +1,13 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submission and refereeing procedure</title>
+{% block pagetitle %}: submission and refereeing procedure{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block headsup %} {% load staticfiles %} {% endblock headsup %}
+
+{% block bodysup %}
+
+<!-- Temporary strip for online version -->
+{% if user.is_authenticated %}
 
 <section>
   <h1>Submission and Refereeing procedure</h1>
@@ -29,6 +32,6 @@
     <li>The Authors can respond to the Editorial decision by accepting an eventual publication offer (in which case the Submission Page and its contents are moved to a SciPost Publication Page), by revising their manuscript and resubmitting to SciPost, or by withdrawing their Submission (in which case the Submission Page is deactivated and all its contents removed from public view).</li>
   </ul>
 </section>
+{% endif %} <!-- Temporary strip -->
     
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 3c965e3c6..aeb33d894 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -1,12 +1,9 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
-<!--<script type="text/javascript" src="{% static 'js/jquery.js' %}"></script> -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submission detail</title>
+{% block pagetitle %}: submission detail{% endblock pagetitle %}
 
-{% load mathjax %}
-{% mathjax_scripts %}
+{% block headsup %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 
   <script>
     $(document).ready(function(){
@@ -22,10 +19,12 @@
     });
     });
   </script>
+{% endblock headsup %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
+<!-- Temporary strip -->
+{% if user.is_authenticated %}
 
 <section>
   <div class="row">
@@ -415,4 +414,6 @@
 </section>
 {% endif %}
 
-{% include 'scipost/footer.html' %}
+{% endif %} <!-- Temporary strip -->
+
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/submissions.html b/submissions/templates/submissions/submissions.html
index cceab5fa1..5d5add485 100644
--- a/submissions/templates/submissions/submissions.html
+++ b/submissions/templates/submissions/submissions.html
@@ -1,13 +1,8 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-{% load mathjax %}
+{% block pagetitle %}: Submissions{% endblock pagetitle %}
 
-<title>SciPost: Submissions</title>
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
-
-{% mathjax_scripts %}
+{% block bodysup %}
 
 <!-- Temporary strip for online version -->
 {% if user.is_authenticated %}
@@ -56,4 +51,4 @@
 
 {% endif %} <!-- temporary strip -->
 
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/submit_manuscript.html b/submissions/templates/submissions/submit_manuscript.html
index 9f4c2d52f..6b9bfa46a 100644
--- a/submissions/templates/submissions/submit_manuscript.html
+++ b/submissions/templates/submissions/submit_manuscript.html
@@ -1,11 +1,11 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: submit manuscript</title>
+{% block pagetitle %}: submit manuscript{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
+<!-- Temporary strip -->
+{% if user.is_authenticated %}
 <section>
   <h1>Submit a manuscript to SciPost</h1>
   <form action="{% url 'submissions:submit_manuscript' %}" method="post">
@@ -18,6 +18,6 @@
     <input type="submit" value="Submit"/>
   </form>
 </section>
+{% endif %} <!-- Temporary strip -->
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
diff --git a/submissions/templates/submissions/submit_manuscript_ack.html b/submissions/templates/submissions/submit_manuscript_ack.html
index f1228677d..bc9167edb 100644
--- a/submissions/templates/submissions/submit_manuscript_ack.html
+++ b/submissions/templates/submissions/submit_manuscript_ack.html
@@ -1,15 +1,12 @@
-{% load staticfiles %}
-<link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
+{% extends 'scipost/base.html' %}
 
-<title>SciPost: manuscript submitted</title>
+{% block pagetitle %}: manuscript submitted{% endblock pagetitle %}
 
-{% include 'scipost/header.html' %}
-{% include 'scipost/navbar.html' %}
+{% block bodysup %}
 
 <section>
   <h1>Thank you for your submission to SciPost</h1>
   <p>Your request will soon be handled by an Editor.</p>
 </section>
 
-
-{% include 'scipost/footer.html' %}
+{% endblock bodysup %}
-- 
GitLab