diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index e108dfefb16a5fab1eecb3750c66be91a5cedd39..80a53f4f2865bc84b0c61837cdc65ed23d9f6838 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -264,7 +264,7 @@
<h3>Write your comment here:</h3>
{{ form.comment_text }}
<input type="submit" value="Submit your Comment">
- <p id="goodCommenter"><i>By clicking on Submit, the commenter certifies that he/she has read the publication fully and carefully before writing this Comment, and that all sources used are duly referenced and cited. Failure to do so will lead to exclusion from the portal.</i></p>
+ <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>
</div>
</form>
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 9950d1e5c5c9878258868ff4b5293d3db3776d23..273304591a90640f8291dbdc17e7f70939ddff62 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -24,7 +24,7 @@
<h1>SciPost Physics Journals</h1>
<hr>
- <p id="journalsannounce">OPEN FOR SUBMISSION STARTING 1 MARCH 2016</p>
+ <p id="journalsannounce">OPEN FOR SUBMISSION FROM 1 MARCH 2016</p>
<div class="row">
<div class="col-5">
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index d347ddf768df3c9c4e4c88d2893e97a5c20822d7..914eb04da25687b8ef708fd9a0cd6f31e89b5131 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -150,16 +150,38 @@ hr.hr12 {
column-rule-width: 1px;
}
+.flex-container {
+ display: -webkit-flex;
+ display: flex;
+ flex-wrap: wrap;
+}
+.flex-greybox {
+ background-color: #f4f4f4;
+ width: 320px;
+ margin: 10px;
+ padding: 10px;
+}
+
body {
// font-family: Merriweather, sans-serif;
font-family: 'Merriweather Sans';
+ font-weight: lighter;
font-size: 80%;
margin: 0px;
padding: 0px;
background-color: #ffffff;
}
+body section div.sectionbox {
+ width: 300px;
+ background-color: #f4f4f4;
+ margin: 10px;
+ padding: 10px;
+ display: inline-block;
+ vertical-align: top;
+}
+
a {
color: #eeeeee;
// text-decoration: underline;
@@ -262,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;
@@ -403,23 +425,25 @@ select {
}
#journalsannouncesmall {
- background-color: #880000;
- color: #ffffff;
- padding: 5px;
+// 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;
- color: #ffffff;
+// 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/index.html b/scipost/templates/scipost/index.html
index 1332a5e917a93581c1f95d265421207e68033cd3..055b589b333edc90de24f6b7298722d910dbd12e 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -6,6 +6,7 @@
<!-- Temporary strip for online version -->
{% if user.is_authenticated %}
+<!--
<section>
<div class="row">
<div class="col-3">
@@ -22,7 +23,7 @@
<p>SciPost publishes a portfolio of high-quality two-way open access scientific journals.</p>
<p>All SciPost Journals implement the maximally stringent <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> principle.</p>
<p>All Journals are fully managed by professional scientists.</p>
- <h3><a href="{% url 'scipost:peer_witnessed_refereeing' %}">Learn about peer-witnessed refereeing</a></h3>
+ <h3><a href="{% url 'scipost:peer_witnessed_refereeing' %}">About peer-witnessed refereeing</a></h3>
<h3><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a></h3>
</div>
<div class="col-1"></div>
@@ -32,6 +33,66 @@
</div>
</div>
</section>
+-->
+<!--
+<section>
+ <div class="sectionbox">
+ <h1><a href="{% url 'scipost:about' %}">About SciPost</a></h1>
+ <p>SciPost is a complete scientific publication portal managed by active professional scientists.</p>
+ <p>It is purely online-based and offers freely, openly, globally and perpetually accessible science.</p>
+ <h3><a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a></h3>
+ <h3><a href="{% url 'scipost:about' %}">Read more</a></h3>
+ </div>
+ <div class="sectionbox">
+ <h1><a href="{% url 'journals:journals' %}">Journals</a></h1>
+ <p id="journalsannouncesmall">OPEN FOR SUBMISSION STARTING 1 MARCH 2016</p>
+ <p>SciPost publishes a portfolio of high-quality two-way open access scientific journals.</p>
+ <p>All SciPost Journals implement the maximally stringent <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> principle.</p>
+ <p>All Journals are fully managed by professional scientists.</p>
+ <h3><a href="{% url 'scipost:peer_witnessed_refereeing' %}">About peer-witnessed refereeing</a></h3>
+ <h3><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a></h3>
+ </div>
+ <div class="sectionbox">
+ <h1><a href="{% url 'commentaries:commentaries' %}">Commentaries</a></h1>
+ <p>SciPost Commentaries allow Contributors to comment and build on all existing literature.</p>
+ </div>
+</section>
+-->
+<section>
+ <div class="flex-container">
+ <div class="flex-greybox">
+ <h1><a href="{% url 'scipost:about' %}">About SciPost</a></h1>
+ <p>SciPost is a complete scientific publication portal managed by active professional scientists.</p>
+ <p>It is purely online-based and offers freely, openly, globally and perpetually accessible science.</p>
+ <h3><a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a></h3>
+ <h3><a href="{% url 'scipost:about' %}">Read more</a></h3>
+ </div>
+ <div class="flex-greybox">
+ <h1><a href="{% url 'journals:journals' %}">Journals</a></h1>
+ <p id="journalsannouncesmall">OPEN FOR SUBMISSION FROM 1 MARCH 2016</p>
+ <p>SciPost publishes a portfolio of high-quality two-way open access scientific journals.</p>
+ <p>All SciPost Journals implement the maximally stringent <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> principle.</p>
+ <p>All Journals are fully managed by professional scientists.</p>
+ <h3><a href="{% url 'scipost:peer_witnessed_refereeing' %}">About peer-witnessed refereeing</a></h3>
+ <h3><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a></h3>
+ </div>
+ <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">
+ <h3>Search SciPost Commentaries:</h3>
+ <form action="{% url 'commentaries:commentaries' %}" method="post">
+ {% csrf_token %}
+ <table>
+ {{ commentary_search_form.as_table }}
+ </table>
+ <input type="submit" name="Submit" />
+ </form>
+ </div>
+ </div>
+</section>
+
<section>
<div class="row">
diff --git a/scipost/views.py b/scipost/views.py
index fdce7d6b391640652a628f4f2853a4da1a16ee84..2b0c94e9d6320f7e1bc50109982b5a0b6f29c8ab 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -21,6 +21,7 @@ from .utils import *
from commentaries.models import Commentary
+from commentaries.forms import CommentarySearchForm
from comments.models import Comment, AuthorReply
from submissions.models import Submission, Report
@@ -30,7 +31,9 @@ from submissions.models import Submission, Report
#############
def index(request):
- return render(request, 'scipost/index.html')
+ commentary_search_form = CommentarySearchForm(request.POST)
+ context = {'commentary_search_form': commentary_search_form}
+ return render(request, 'scipost/index.html', context)
###############