diff --git a/CODE_BUPS/SciPost_v1p1_20151206.tgz b/CODE_BUPS/SciPost_v1p1_20151206.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3617d13b1b902f54a3497e7750789d050ad421af
Binary files /dev/null and b/CODE_BUPS/SciPost_v1p1_20151206.tgz differ
diff --git a/SciPost_v1/settings.py b/SciPost_v1/settings.py
deleted file mode 100644
index 1d141ef63c4130299e7acd5d666facc72ef411b5..0000000000000000000000000000000000000000
--- a/SciPost_v1/settings.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""
-Django settings for SciPost_v1 project.
-
-Generated by 'django-admin startproject' using Django 1.8.5.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.8/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.8/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
-
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 's2=5b9jc+fe2&sf=!+-_pfp1ol3gl7#q6p!70l2x(!-@121@bd'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-# Secure proxy SSL header and secure cookies
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-#SESSION_COOKIE_SECURE = True
-#CSRF_COOKIE_SECURE = True
-
-# Session expire at browser close
-SESSION_EXPIRE_AT_BROWSER_CLOSE = True
-
-# Wsgi scheme
-os.environ['wsgi.url_scheme'] = 'https'
-
-# Application definition
-
-INSTALLED_APPS = (
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'django_mathjax',
- 'commentaries',
- 'comments',
- 'contributors',
- 'journals',
- 'ratings',
- 'reports',
- 'scipost',
- 'submissions',
-)
-MATHJAX_ENABLED = True
-MATHJAX_CONFIG_DATA = {
- "tex2jax": {
- "inlineMath": [['$', '$'], ['\\(', '\\)']],
- "processEscapes": True
- }
- }
-
-MIDDLEWARE_CLASSES = (
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'django.middleware.security.SecurityMiddleware',
-)
-
-ROOT_URLCONF = 'SciPost_v1.urls'
-
-TEMPLATES = [
- {
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'templates')],
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
- ],
- },
- },
-]
-
-WSGI_APPLICATION = 'SciPost_v1.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'scipostv1db',
- 'USER': 'scipostv1db',
- 'PASSWORD': 'devpass',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.8/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'CET'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.8/howto/static-files/
-
-STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
diff --git a/commentaries/templates/commentaries/commentaries.html b/commentaries/templates/commentaries/commentaries.html
index 3bcd10a7018af689bb4adb7c5f88dad30bd473e6..e08a16072208f5a48aaf7b4b883cbf00ceb53aac 100644
--- a/commentaries/templates/commentaries/commentaries.html
+++ b/commentaries/templates/commentaries/commentaries.html
@@ -19,9 +19,7 @@
<form action="{% url 'commentaries:commentaries' %}" method="post">
{% csrf_token %}
<table>
- <ul>
- {{ form.as_table }}
- </ul>
+ {{ form.as_table }}
</table>
<input type="submit" name="Submit" />
</form>
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 5f9f9fbcfa9718c23cae360a7c6c38fefe041e14..31fefb1f22fb7546b221340e902b26e925bf3d8a 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -15,7 +15,7 @@
<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>(cross-division articles)</p>
+ <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>
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index 89fb2af858471325557cdb05c946b6e88add8e2f..ee20c85a89ef55b6674e0af4c062112a288b8a3b 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -216,6 +216,7 @@ section form label {
// color: #102040;
// color: #ffffff;
color: black;
+ font-weight: 400;
}
section form ul li label {
// color: #ffffff;
diff --git a/scipost/static/info/SciPost_Description.pdf b/scipost/static/scipost/info/SciPost_Description.pdf
similarity index 89%
rename from scipost/static/info/SciPost_Description.pdf
rename to scipost/static/scipost/info/SciPost_Description.pdf
index 20c24cd58bfda51e1e1841fa9e879c7e31772dd6..e39ac9944ffad50fab1bec7be4d64f92ff72e58b 100644
Binary files a/scipost/static/info/SciPost_Description.pdf and b/scipost/static/scipost/info/SciPost_Description.pdf differ
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index 2e948f70f2b2cb2c246997af4852ec99153d9e8a..c0f888ffc7b40a71ebcf1d2b67fd7767bc7030dd 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -9,7 +9,7 @@
<div class="row">
<div class="col-6">
<h1>About SciPost</h1>
- <h4>Read the original <a href="{% static 'info/SciPost_Description.pdf' %}">SciPost description document</a>.
+ <h4>Read the original <a href="{% static 'scipost/info/SciPost_Description.pdf' %}">SciPost description document</a>.
</div>
<div class="col-6">
<p>SciPost is a complete scientific publication portal.</p>
diff --git a/static/info/SciPost_Description.pdf b/static/info/SciPost_Description.pdf
deleted file mode 100644
index 20c24cd58bfda51e1e1841fa9e879c7e31772dd6..0000000000000000000000000000000000000000
Binary files a/static/info/SciPost_Description.pdf and /dev/null differ
diff --git a/static/info/SciPost_LaTeX_template.pdf b/static/info/SciPost_LaTeX_template.pdf
deleted file mode 100644
index 44f40a1744129f0ce8758caca03123b765869143..0000000000000000000000000000000000000000
Binary files a/static/info/SciPost_LaTeX_template.pdf and /dev/null differ
diff --git a/static/info/SciPost_LaTeX_template.tex b/static/info/SciPost_LaTeX_template.tex
deleted file mode 100644
index 62cf060bf7f894144881f1d9ae774445428fbecb..0000000000000000000000000000000000000000
--- a/static/info/SciPost_LaTeX_template.tex
+++ /dev/null
@@ -1,159 +0,0 @@
-% SciPost LaTeX template
-% Version 1.0 December 2015
-%
-% Submissions to SciPost Journals should make use of this template.
-%
-% FOR SUBMISSIONS: simply look for the `TODO:' tokens and adapt your file.
-%
-% - please enable line numbers (package: lineno)
-% - you should run LaTeX twice in order for the line numbers to
-% appear on the outer margins of both columns
-%
-
-%\documentclass[10pt,twocolumn]{article}
-\documentclass[10pt]{article}
-\usepackage{a4wide}
-
-% Layout
-\usepackage[top=10mm,bottom=10mm,left=16mm,right=16mm,head=10mm,includeheadfoot]{geometry}
-
-\setlength\columnsep{8mm}
-
-\bigskipamount 6mm
-
-\usepackage[colaction]{multicol}
-
-% Unicode characters
-\usepackage[utf8]{inputenc}
-
-% Math formulas and symbols
-\usepackage{amsmath,amssymb}
-
-% Hyperrefs
-\usepackage{hyperref}
-
-% Include line numbers in submissions
-\usepackage[switch,columnwise]{lineno} % line numbers alternately left/right for left/right column
-
-% SciPost BiBTeX style
-%\bibliographystyle{scipostbib}
-
-% SciPost header and footer
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-
-\usepackage{xcolor}
-\definecolor{scipostblue}{rgb}{0.0,0.2,0.4}
-\lhead{
-\colorbox{scipostblue}{\strut \bf \color{white} SciPost Submission}
-}
-
-\rhead{
-\colorbox{scipostblue}
-% TODO: Select the appropriate journal:
-{\strut \bf \color{white} SciPost Physics Letters}
-%{\strut \bf \color{white} SciPost Physics X}
-%{\strut \bf \color{white} SciPost Physics}
-}
-
-\lfoot{\bf SciPost Submission}
-\rfoot{\sf SciPost.org}
-
-% Graphics
-\usepackage{graphicx}
-
-
-
-% Document
-\begin{document}
-
-\def\makeLineNumber{\docolaction{\makeLineNumberLeft}{}{\makeLineNumberRight}}
-
-\begin{center}
-{\Large
-% TODO: write your article's title here.
-% The article title is Large boldface, and should fit in two lines
-\textbf{Article Title}
-}
-\end{center}
-
-\begin{center}
-% TODO: write the author list here. Use initials + surname format.
-% Separate subsequent authors by a comma, omit comma at the end of the list.
-% Mark the corresponding author with a superscript *.
-Initials1 Surname1\textsuperscript{1},
-Initials2 Surname2\textsuperscript{2*}
-\end{center}
-
-\begin{center}
-% TODO: write all affiliations here.
-% Format: institute, city, country
-{\bf 1} Affiliation1
-\\
-{\bf 2} Affiliation2
-\\
-% TODO: provide email address of corresponding author
-* CorrespondingAuthor@affiliation.edu
-\bigskip
-\end{center}
-
-\linenumbers
-
-\begin{multicols}{2}
-
-\section*{Abstract}
-{\bf
-% TODO: write your abstract here.
-% The abstract is in boldface, and should fit in 8 lines.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-}
-
-\section{Introduction}
-% TODO: the stage is yours. Write your article here.
-Lorem ipsum dolor sit amet\cite{Cite1}, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-\section{A Section}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-\begin{equation}
-H = \sum_{j=1}^N \left[J (S^x_j S^x_{j+1} + S^y_j S^y_{j+1} + \Delta S^z_j S^z_{j+1}) - h S^z_j \right]
-\end{equation}
-
-You can also easily switch between two columns format and single column format for longer equations like
-% To switch between single and double columns, proceed as in the following example:
-\end{multicols}
-\begin{equation}
-H = \sum_{j=1}^N \left[J (S^x_j S^x_{j+1} + S^y_j S^y_{j+1} + \Delta S^z_j S^z_{j+1}) - h S^z_j + J' (S^x_j S^x_{j+2} + S^y_j S^y_{j+2} + \Delta' S^z_j S^z_{j+2}) \right]
-\label{eq:HXXZnnn}
-\end{equation}
-% After you're done with the long equation(s), simply restart the two columns environment
-\begin{multicols}{2}
-after which you can go back to two columns format.
-
-\section{Another Section}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-\section{A Third Section}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-\section{Conclusion}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium. Suspendisse ut dui eu ante cursus gravida non sed sem. Nullam sapien tellus, commodo id velit id, eleifend volutpat quam. Phasellus mauris velit, dapibus finibus elementum vel, pulvinar non tellus. Nunc pellentesque pretium diam, quis maximus dolor faucibus id. Nunc convallis sodales ante, ut ullamcorper est egestas vitae. Nam sit amet enim ultrices, ultrices elit pulvinar, volutpat risus.
-
-\section*{Acknowledgements}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget porta erat. Morbi consectetur est vel gravida pretium.
-
-
-\nolinenumbers
-
-% TODO:
-% Provide your bibliography here, either by:
-% - writing it directly
-% - running BiBTeX and pasting the .bbl file contents here.
-\begin{thebibliography}{99}
-\bibitem{Cite1} L. Ipsum, `Dolor sit amet', Cons. ad. I p.1 (2015).
-\end{thebibliography}
-
-\end{multicols}
-\end{document}
diff --git a/submissions/migrations/0002_auto_20151206_1530.py b/submissions/migrations/0002_auto_20151206_1530.py
new file mode 100644
index 0000000000000000000000000000000000000000..3c9dd696773b19917dccaf5910583dfa17a4b217
--- /dev/null
+++ b/submissions/migrations/0002_auto_20151206_1530.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='submitted_to_journal',
+ field=models.CharField(max_length=30, choices=[('SciPost Physics Select', 'SciPost Physics Select'), ('SciPost Physics Letters', 'SciPost Physics Letters'), ('SciPost Physics X', 'SciPost Physics X (cross-division)'), ('SciPost Physics', 'SciPost Physics (Experimental, Theoretical and Computational)'), ('SciPost Physics Lecture Notes', 'SciPost Physics Lecture Notes')]),
+ ),
+ ]
diff --git a/scipost/static/info/SciPost_LaTeX_template.pdf b/submissions/static/submissions/latex/SciPost_LaTeX_template.pdf
similarity index 100%
rename from scipost/static/info/SciPost_LaTeX_template.pdf
rename to submissions/static/submissions/latex/SciPost_LaTeX_template.pdf
diff --git a/scipost/static/info/SciPost_LaTeX_template.tex b/submissions/static/submissions/latex/SciPost_LaTeX_template.tex
similarity index 100%
rename from scipost/static/info/SciPost_LaTeX_template.tex
rename to submissions/static/submissions/latex/SciPost_LaTeX_template.tex
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index f57cd76d2315f487f1cf08d6b4683a149a6a1d51..197886c6c713b03101909c969617360684f7d82b 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -9,7 +9,7 @@
<h3>Submission</h3>
<p>To submit your article for publication in a SciPost Journal, you must:</p>
<ol>
- <li>Prepare your manuscript using the SciPost LaTeX template (<a href="{% static 'info/SciPost_LaTeX_template.tex' %}">.tex</a>, <a href="{% static 'info/SciPost_LaTeX_template.pdf' %}">.pdf</a>)</li>
+ <li>Prepare your manuscript using the SciPost LaTeX template (<a href="{% static 'submissions/latex/SciPost_LaTeX_template.tex' %}">.tex</a>, <a href="{% static 'submissions/latex/SciPost_LaTeX_template.pdf' %}">.pdf</a>)</li>
<li>Make your preprint publicly available on arXiv</li>
<li>After appearance on arXiv, fill the SciPost <a href="{% url 'submissions:submit_manuscript' %}">Submission</a> form, choosing which SciPost Journal you wish to submit to. </li>
</ol>