diff --git a/submissions/templates/submissions/browse.html b/submissions/templates/submissions/browse.html deleted file mode 100644 index f2d0f75ac20086dd3226dc451bec2468354aa4d0..0000000000000000000000000000000000000000 --- a/submissions/templates/submissions/browse.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends 'scipost/base.html' %} - -{% block pagetitle %}: Submissions{% endblock pagetitle %} - -{% block headsup %} -<script type="text/javascript" async src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script> -{% endblock headsup %} - -{% block bodysup %} - -<!-- Temporary strip for online version --> -{% if user.is_authenticated %} - -<section> - <p id="journalsannounce">OPEN FOR SUBMISSION STARTING 30 APRIL 2016</p> - <br/> - <div class="flex-container"> - <div class="flex-greybox320"> - <h1>SciPost Submissions</h1> - <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> - <h3><a href="{% url 'submissions:submit_manuscript' %}">Submit a manuscript to SciPost</a></h3> - </div> - <div class="flex-greybox320"> - <h2>Search SciPost Submissions:</h2> - <form action="{% url 'submissions:submissions' %}" method="post"> - {% csrf_token %} - <table> - {{ form.as_table }} - </table> - <input type="submit" name="Submit" /> - </form> - </div> - <div class="flex-greybox320"> - <h2>View SciPost Submissions</h2> - <ul> - <li>Physics: last <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=1 %}">week</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=4 %}">month</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=52 %}">year</a> </li> - </ul> - </div> - </div> - - {% if submission_list %} - <br /> - <h3>Submissions in {{ discipline }} in the last {{ nrweeksback }} weeks:</h3> - <ul> - {% for submission in submission_list %} -<!-- <li><a href="{% url 'submissions:submission' submission.id %}">{{ submission.title }}</a> by {{ submission.author_list }} (published {{ submission.submission_date }}) </li> --> - {{ submission.header_as_li|safe }} - {% endfor %} - </ul> - {% endif %} - -</section> - -{% endif %} <!-- Temporary strip --> - -{% endblock bodysup %} diff --git a/submissions/templates/submissions/submissions.html b/submissions/templates/submissions/submissions.html index 044748ffc05ec9d8d09b5706c74308aa5dff2d0a..96ac13c1b304457b6859efc0bc5c08bdd227158b 100644 --- a/submissions/templates/submissions/submissions.html +++ b/submissions/templates/submissions/submissions.html @@ -8,7 +8,7 @@ {% if user.is_authenticated %} <section> - <p id="journalsannounce">OPEN FOR SUBMISSION STARTING 30 MAY 2016</p> + <p id="journalsannounce">OPEN FOR SUBMISSION STARTING JUNE 2016</p> <br/> <div class="flex-container"> <div class="flex-greybox320"> @@ -65,6 +65,17 @@ ack=4 %}">month</a> <a href="{% url 'submissions:browse' discipline='physics' nr </section> {% endif %} +{% if submission_browse_list %} +<section> + <hr class="hr12"> + <h2>Submissions in {{ discipline }} in the last {{ nrweeksback }} weeks:</h2> + <ul> + {% for submission in submission_browse_list %} + {{ submission.header_as_li|safe }} + {% endfor %} + </ul> + {% endif %} +</section> {% endif %} <!-- temporary strip --> diff --git a/submissions/views.py b/submissions/views.py index 11971c49d512e4687dc6057acdbbb29a2aac0277..17b40d544b3276c3321f3f6940a060c9032d5a48 100644 --- a/submissions/views.py +++ b/submissions/views.py @@ -116,13 +116,13 @@ def browse(request, discipline, nrweeksback): return HttpResponseRedirect(request, 'submissions/submissions.html', context) else: form = SubmissionSearchForm() - submission_list = Submission.objects.filter( + submission_browse_list = Submission.objects.filter( vetted=True, discipline=discipline, latest_activity__gte=timezone.now() + datetime.timedelta(weeks=-int(nrweeksback)) ) context = {'form': form, 'discipline': discipline, 'nrweeksback': nrweeksback, - 'submission_list': submission_list } - return render(request, 'submissions/browse.html', context) + 'submission_browse_list': submission_browse_list } + return render(request, 'submissions/submissions.html', context) def submission_detail(request, submission_id):