From 27a6c312591e56a06d350e3632e45fdad7647cd7 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 29 Jan 2016 14:12:45 +0100
Subject: [PATCH] Work on layout (not complete yet)
---
.../templates/commentaries/commentaries.html | 4 ++
.../commentaries/commentary_detail.html | 17 ++++++---
comments/forms.py | 2 +-
comments/models.py | 11 ++++++
.../templates/comments/reply_to_comment.html | 2 +
journals/templates/journals/journals.html | 25 +++++-------
scipost/static/scipost/SciPost.css | 38 +++++++++----------
scipost/templates/scipost/FAQ.html | 4 ++
scipost/templates/scipost/base.html | 6 ++-
scipost/templates/scipost/index.html | 4 +-
scipost/templates/scipost/personal_page.html | 8 ++++
.../submissions/submission_detail.html | 14 ++++---
.../templates/submissions/submissions.html | 10 +++--
13 files changed, 91 insertions(+), 54 deletions(-)
diff --git a/commentaries/templates/commentaries/commentaries.html b/commentaries/templates/commentaries/commentaries.html
index 477680b53..92f02162e 100644
--- a/commentaries/templates/commentaries/commentaries.html
+++ b/commentaries/templates/commentaries/commentaries.html
@@ -12,12 +12,14 @@
{% if user.is_authenticated %}
<section>
+ <hr class="hr12">
<h1>SciPost Commentaries</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>
<h3><a href="{% url 'commentaries:request_commentary' %}">Request opening a new SciPost Commentary Page</a></h3>
</section>
<section>
+ <hr class="hr12">
<h2>Search SciPost Commentaries:</h2>
<form action="{% url 'commentaries:commentaries' %}" method="post">
{% csrf_token %}
@@ -43,6 +45,7 @@
{% if commentary_recent_list %}
<section>
+ <hr class="hr12">
<h2>Recently active Commentaries:</h2>
<ul>
{% for commentary in commentary_recent_list %}
@@ -53,6 +56,7 @@
{% endif %}
<section>
+ <hr class="hr12">
<h1>SciPost Commentaries how-to</h1>
<h3>Activation procedure</h3>
<p>A Commentary Page can be requested by any registererd SciPost Contributor for any scientific paper 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. Authors who are registered SciPost Contributors can opt to receive email notifications of activity on any specific Commentary Page.</p>
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index ce339e1b8..8055676bb 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -25,6 +25,7 @@
{% if user.is_authenticated %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-10">
<h1>SciPost Commentary Page (for non-SciPost publications)</h1>
@@ -37,12 +38,12 @@
</section>
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-4">
<h2>Original publication: </h2>
</div>
</div>
- <hr class="hr12">
<table>
<tr><td>Title: </td><td>{{ commentary.pub_title }}</td></tr>
@@ -81,6 +82,7 @@
{% if reports %}
<section>
+ <hr class="hr12">
<h2>Reports on this publication</h2>
<hr>
</section>
@@ -88,6 +90,7 @@
{% if comments %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-10">
<h2>Comments on this publication</h2>
@@ -96,18 +99,21 @@
<button id="commentsbutton">Toggle comments view</button>
</div>
</div>
- <hr class="hr12">
<div id="commentslist">
{% for comment in comments %}
+ <hr class="hr6">
<div class="row">
<div class="col-3">
+ {{ comment.print_identifier|safe }}
+<!--
<div class="commentid">
- <h3>{{ comment.id }} {% if comment.in_reply_to %} (in reply to {{ comment.in_reply_to.id }}) {% endif %}</h3>
+ <h3>{{ comment.id }} {% if not comment.anonymous %} by {{ comment.author.user.first_name }} {{ comment.author.user.last_name }} {% endif %} {% if comment.in_reply_to %} (in reply to {{ comment.in_reply_to.id }}) {% endif %}</h3>
<h4>Date: {{ comment.date_submitted }}</h4>
</div>
+-->
</div>
<div class="col-9">
@@ -224,7 +230,6 @@
<h3><a href="{% url 'comments:reply_to_comment' comment_id=comment.id %}">Reply to this comment (Contributor)</a></h3>
</div>
</div>
- <hr class="hr12">
{% endif %}
{% endfor %}
</div id="commentslist">
@@ -233,11 +238,12 @@
{% if user.is_authenticated and commentary.open_for_commenting and user.contributor.rank > 0 %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-3">
<h1>Contribute a Comment</h1>
<p>Specify which category your comment belongs to (you can choose more than one).</p>
- <p>In your comment, you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for separate equations.</p>
+ <p>In your comment, you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for on-line equations.</p>
</div>
<div class="col-9">
<form action="{% url 'commentaries:commentary' commentary.id %}" method="post">
@@ -260,6 +266,7 @@
<div class="col-7">
<h3>Write your comment here:</h3>
{{ form.comment_text }}
+ <p>Publish anonymously {{ form.anonymous }}</p>
<input type="submit" value="Submit your Comment">
<p id="goodCommenter"><i>Be professional. Only serious and meaningful comments will be vetted through. By clicking on Submit, the commenter certifies that all sources used are duly referenced and cited. Failure to do so will lead to exclusion from the portal.</i></p>
</div>
diff --git a/comments/forms.py b/comments/forms.py
index 5273de202..c6c133dc6 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -44,7 +44,7 @@ AUTHOR_REPLY_REFUSAL_CHOICES = (
class CommentForm(forms.ModelForm):
class Meta:
model = Comment
- fields = ['is_rem', 'is_que', 'is_ans', 'is_obj', 'is_rep', 'is_val', 'is_lit', 'is_sug', 'comment_text']
+ fields = ['is_rem', 'is_que', 'is_ans', 'is_obj', 'is_rep', 'is_val', 'is_lit', 'is_sug', 'comment_text', 'anonymous']
def __init__(self, *args, **kwargs):
super(CommentForm, self).__init__(*args, **kwargs)
diff --git a/comments/models.py b/comments/models.py
index 77ed104ac..7bb0aa123 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -39,6 +39,7 @@ class Comment(models.Model):
submission = models.ForeignKey(Submission, blank=True, null=True)
in_reply_to = models.ForeignKey('self', blank=True, null=True)
author = models.ForeignKey(Contributor)
+ anonymous = models.BooleanField(default=False, verbose_name='Publish anonymously')
# Categories:
is_rem = models.BooleanField(default=False, verbose_name='remark')
is_que = models.BooleanField(default=False, verbose_name='question')
@@ -65,6 +66,16 @@ class Comment(models.Model):
def __str__ (self):
return self.comment_text
+ def print_identifier (self):
+ output = '<div class="commentid">\n'
+ output += '<h3>' + str(self.id)
+ if not self.anonymous:
+ output += ' by ' + self.author.user.first_name + ' ' + self.author.user.last_name
+ if self.in_reply_to:
+ output += ' in reply to ' + str(self.in_reply_to.id) + '</h3>\n'
+ output += '<h4>Date: ' + self.date_submitted.strftime("%Y-%m-%d") + '</h4>\n</div>\n'
+ return output
+
class AuthorReply(models.Model):
""" Reply to a Comment or Report. """
diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index e1bbdbb8e..9f7f7af26 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -6,6 +6,7 @@
{% if user.is_authenticated %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-6">
<h1>SciPost Reply to Comment Page</h1>
@@ -13,6 +14,7 @@
</div>
</section>
<section>
+ <hr class="hr12">
{% if comment.commentary %}
<h1>The Commentary concerned:</h1>
{% endif %}
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 273304591..e47a159ce 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -8,33 +8,23 @@
{% if user.is_authenticated %}
<section>
- <h1>SciPost Journals</h1>
- <div class="row">
- <div class="col-6">
- <p>SciPost publishes a family of online scientific Journals.</p>
- <p>All SciPost Journals are subscription-free and perpetually openly accessible.</p>
- </div>
- <div class="col-6">
- <p>Manuscripts submitted to SciPost undergo the extremely stringent <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> process, guaranteeing that papers published in SciPost Journals meet the highest possible academic standards.</p>
- </div>
- </div>
-</section>
-
-<section>
+ <hr class="hr12">
<h1>SciPost Physics Journals</h1>
- <hr>
-
+ <br/>
<p id="journalsannounce">OPEN FOR SUBMISSION FROM 1 MARCH 2016</p>
-
+ <br/>
<div class="row">
<div class="col-5">
+ <hr class="hr6">
<h1>SciPost Physics Select</h1>
<p>SciPost Physics Select publishes Letters of superlative quality in the field of Physics.</p>
<p>Authors cannot submit directly to this Journal; SPS papers are editorially selected from the most outstanding Submissions to SciPost Physics Letters.</p>
<br/>
+ <hr class="hr6">
<h1>SciPost Physics Letters</h1>
<p>SciPost Physics Letters publishes outstanding-quality, broad-interest papers in all fields of Physics.</p>
<br/><br/>
+ <hr class="hr6">
<h1>SciPost Physics Lecture Notes</h1>
<p>SciPost Physics Lecture Notes publishes high-quality, research-level didactic material in all domains and specializations of Physics.</p>
</div>
@@ -42,10 +32,12 @@
<div class="col-1"></div>
<div class="col-5">
+ <hr class="hr6">
<h1>SciPost Physics X</h1>
<p>SciPost Physics X publishes papers of superlative quality in the field of Physics.</p>
<p>Similarly to SPS, authors cannot submit directly to this Journal; SPX papers are editorially selected from the most outstanding Submissions to SciPost Physics.</p>
<br/>
+ <hr class="hr6">
<h1>SciPost Physics</h1>
<p>SciPost Physics publishes high-quality papers in Physics. It covers the three major domains of modern Physics, namely E (Experimental), T (Theoretical) and C (Computational) Physics, which encompass the following specialties:</p>
<ul>
@@ -65,6 +57,7 @@
</section>
<section>
+ <hr class="hr12">
<h1><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and Refereeing procedure</a></h1>
</section>
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index 130363d3a..852af381f 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -50,11 +50,11 @@ hr.hr12 {
}
.commentcategorychoices {
- list-style-type: none; // for categorizing comments
+ list-style-type: none;
}
.commentcategorydisplay {
display: inline-block;
- margin: 2px; 2px;
+ margin: 2px 2px;
padding: 1px;
box-shadow: 1px 1px 3px #888888;
background: linear-gradient(to right,#fcfcfc, #f0f0f0);
@@ -164,7 +164,7 @@ hr.hr12 {
body {
-// font-family: Merriweather, sans-serif;
+/* font-family: Merriweather, sans-serif; */
font-family: 'Merriweather Sans';
font-weight: lighter;
font-size: 80%;
@@ -184,7 +184,7 @@ body section div.sectionbox {
a {
color: #eeeeee;
-// text-decoration: underline;
+/* text-decoration: underline; */
target: _parent;
}
a:hover {
@@ -198,7 +198,7 @@ header {
color: #ffffff;
border: 0px solid grey; border-radius:0px;
margin: 0px;
- padding: 0px; 5px;
+ padding: 0px 5px;
}
header h1 {
font-size: 50px;
@@ -241,7 +241,7 @@ nav ul li {
padding: 5px;
background-color: #204080;
color: #002B49;
-// color: #222222;
+/* color: #222222; */
float: center;
clear: both;
}
@@ -250,18 +250,18 @@ nav a {
padding: 5px;
background-color: #f0f0f0;
color: #002B49;
-// color: #000000;
+/* color: #000000; */
text-decoration: none;
display: inline-block;
target: _parent;
}
nav a:visited {
color: #002B49;
-// color: #000000;
+/* color: #000000; */
}
nav a:hover {
color: #000000;
-// color: #FFA300
+/* color: #FFA300 */
text-decoration: none;
background-color: #ffffff;
}
@@ -284,7 +284,7 @@ p#goodCommenter {
section {
color: #111111;
background-color: white;
-// border: 1px solid grey; border-radius: 1px;
+/* border: 1px solid grey; border-radius: 1px; */
margin: 25px 15px;
padding: 10px;
text-align: justify;
@@ -306,7 +306,7 @@ section div {
section h1, h2, h3, h4, h5, h6 {
margin: 0px;
padding: 6px 2px;
-// color: #103050;
+/* color: #103050; */
text-shadow: 0px 0px 0px #222222;
font-weight: 500;
}
@@ -425,25 +425,25 @@ select {
}
#journalsannouncesmall {
-// background-color: #880000;
+/* background-color: #880000; */
background-color: #002B49;
color: #FFA300;
padding: 10px;
font-size: 90%;
text-align: center;
-// animation-name: journalsannounceanim;
-// animation-duration: 2s;
-// animation-iteration-count: infinite;
+/* animation-name: journalsannounceanim; */
+/* animation-duration: 2s; */
+/* animation-iteration-count: infinite; */
}
#journalsannounce {
-// background-color: #880000;
+/* background-color: #880000; */
background-color: #002B49;
color: #FFA300;
padding: 20px;
font-size: 150%;
text-align: center;
-// animation-name: journalsannounceanim;
-// animation-duration: 2s;
-// animation-iteration-count: infinite;
+/* animation-name: journalsannounceanim; */
+/* animation-duration: 2s; */
+/* animation-iteration-count: infinite; */
}
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index eaa5f6c2f..a9607cab4 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -14,6 +14,10 @@
<div class="row">
<h1>Frequently asked questions</h1>
<div class="col-5">
+ <h3>What are the distinguishing features of SciPost Journals?</h3>
+ <p>All SciPost Journals are subscription-free, two-way open access (free for readers, free for authors) online journals.</p>
+ <p>Manuscripts submitted to SciPost undergo the extremely stringent <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> process, guaranteeing that papers published in SciPost Journals meet the highest possible academic standards.</p>
+ <br/>
<h3>Why should I submit my manuscripts to SciPost?</h3>
<p>Because:</p>
<ul>
diff --git a/scipost/templates/scipost/base.html b/scipost/templates/scipost/base.html
index 0699a9f25..9462e8460 100644
--- a/scipost/templates/scipost/base.html
+++ b/scipost/templates/scipost/base.html
@@ -7,7 +7,11 @@
<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
<script type="text/x-mathjax-config">
- MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});
+ MathJax.Hub.Config({
+ tex2jax: {
+ inlineMath: [['$','$'], ['\\(','\\)']],
+ processEscapes: true
+ }});
</script>
<script type="text/javascript" async src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 055b589b3..deaebc425 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -79,8 +79,7 @@
<div class="flex-greybox">
<h1><a href="{% url 'commentaries:commentaries' %}">Commentaries</a></h1>
<p>SciPost Commentaries allow Contributors to comment and build on all existing literature.</p>
- </div>
- <div class="flex-greybox">
+ <br/>
<h3>Search SciPost Commentaries:</h3>
<form action="{% url 'commentaries:commentaries' %}" method="post">
{% csrf_token %}
@@ -95,6 +94,7 @@
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-4">
<h1>SciPost is endorsed by</h1>
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 319d2d57f..5e2f5d80b 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -5,10 +5,12 @@
{% block bodysup %}
<section>
+ <hr class="hr12">
<h1>Welcome to your SciPost Personal Page, {{ user.username }} (rank {{ contributor.rank }} Contributor)</h1>
</section>
<section>
+ <hr class="hr12">
<h1>Your SciPost Account</h1>
<div class="row">
<div class="col-6">
@@ -31,6 +33,7 @@
{% if contributor.rank >= 2 %}
<section>
+ <hr class="hr12">
<h1>Pending SciPost Editorial Actions</h1>
<br>
<div class="row">
@@ -68,6 +71,7 @@
{% endif %}
<section>
+ <hr class="hr12">
<h1>SciPost Submissions</h1>
<ul>
<li><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></li>
@@ -75,6 +79,7 @@
</section>
<section>
+ <hr class="hr12">
<h1>SciPost Commentaries</h1>
<ul>
<li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
@@ -83,6 +88,7 @@
{% if contributor.rank > 0 %}
<section>
+ <hr class="hr12">
<h1>Your ratings:</h1>
<div class="row">
<div class="col-3">
@@ -121,12 +127,14 @@
{% else %}
<section>
+ <hr class="hr12">
<p>Your credentials will soon be verified by an Editor. If accepted, your rank (currently 0: newly registered) will be set to 1 (normal user), enabling you to submit, comment and vote.</p>
</section>
{% endif %}
{% if own_comments %}
<section>
+ <hr class="hr12">
<h1>Your Comments</h1>
<ul>
{% for own_comment in own_comments %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 9eb6c82e5..388bb7588 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -27,6 +27,7 @@
{% if user.is_authenticated %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-10">
<h1>SciPost Submission Page (for papers submitted to SciPost)</h1>
@@ -39,12 +40,12 @@
</section>
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-4">
<h2>Submission:</h2>
</div>
</div>
- <hr class="hr12">
{{ submission.header_as_table|safe }}
<h3>Abstract:</h3>
<p>{{ submission.abstract }}</p>
@@ -75,6 +76,7 @@
{% if reports %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-10">
<h2>Reports on this Submission</h2>
@@ -83,12 +85,11 @@
<button id="reportsbutton">Toggle reports view</button>
</div>
</div>
- <hr class="hr12">
-
<div id="reportslist">
{% for report in reports %}
+ <hr class="hr6">
<div class="row">
<div class="col-3">
<div class="reportid">
@@ -209,7 +210,6 @@
<h3><a href="{% url 'comments:author_reply_to_report' report_id=report.id %}">Reply to this Report (Author)</a></h3>
</div>
</div>
- <hr class="hr12">
{% endif %}
{% endfor %}
@@ -221,6 +221,7 @@
{% if user.is_authenticated and submission.open_for_reporting and user.contributor.rank > 0 %}
<section>
+ <hr class="hr6">
<div class="row">
<div class="col-3">
<h1><a href="{% url 'submissions:submit_report' submission.id %}">Contribute a Report</a></h1>
@@ -232,6 +233,7 @@
{% if comments %}
<section>
+ <hr class="hr12">
<div class="row">
<div class="col-10">
<h2>Comments on this Submission</h2>
@@ -240,11 +242,11 @@
<button id="commentsbutton">Toggle comments view</button>
</div>
</div>
- <hr class="hr12">
<div id="commentslist">
{% for comment in comments %}
+ <hr class="hr6">
<div class="row">
<div class="col-3">
@@ -367,7 +369,6 @@
<h3><a href="{% url 'comments:reply_to_comment' comment_id=comment.id %}">Reply to this comment (Contributor)</a></h3>
</div>
</div>
- <hr class="hr12"/>
{% endif %}
{% endfor %}
</div>
@@ -376,6 +377,7 @@
{% if user.is_authenticated and submission.open_for_commenting and user.contributor.rank > 0 %}
<section>
+ <hr class="hr12"/>
<div class="row">
<div class="col-3">
<h1>Contribute a Comment</h1>
diff --git a/submissions/templates/submissions/submissions.html b/submissions/templates/submissions/submissions.html
index 066a2c2d8..ea6ba39e1 100644
--- a/submissions/templates/submissions/submissions.html
+++ b/submissions/templates/submissions/submissions.html
@@ -8,15 +8,16 @@
{% if user.is_authenticated %}
<section>
+ <hr class="hr12">
<h1>SciPost Submissions</h1>
- <p>Submissions to SciPost Journals: papers currently under consideration for publication in a SciPost Journal.</p>
- <h3><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></h3>
-
- <p id="journalsannouncesmall">OPEN FOR SUBMISSION STARTING 1 MARCH 2016</p>
+ <br/>
+ <h3><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></h3>
+ <p id="journalsannounce">OPEN FOR SUBMISSION STARTING 1 MARCH 2016</p>
</section>
<section>
+ <hr class="hr12">
<h2>Search SciPost Submissions:</h2>
<form action="{% url 'submissions:submissions' %}" method="post">
{% csrf_token %}
@@ -44,6 +45,7 @@
{% if submission_recent_list %}
<section>
+ <hr class="hr12">
<h2>Recent Submissions:</h2>
<ul>
{% for submission in submission_recent_list %}
--
GitLab