From 904dca0405b87369287b1dc736167882d65caaa7 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 30 Jan 2018 21:32:20 +0100
Subject: [PATCH] Take 2
---
scipost/templatetags/request_filters.py | 16 +++++
.../submissions/table_of_contents.html | 33 +++++-----
.../submissions/submission_detail.html | 62 ++++++++++---------
3 files changed, 65 insertions(+), 46 deletions(-)
diff --git a/scipost/templatetags/request_filters.py b/scipost/templatetags/request_filters.py
index d28599705..124ebd9ae 100644
--- a/scipost/templatetags/request_filters.py
+++ b/scipost/templatetags/request_filters.py
@@ -1,4 +1,8 @@
+import re
+
from django import template
+from django.core.urlresolvers import reverse, NoReverseMatch
+
from urllib.parse import urlencode
register = template.Library()
@@ -9,3 +13,15 @@ def url_replace(context, **kwargs):
query = context['request'].GET.dict()
query.update(kwargs)
return urlencode(query)
+
+
+@register.simple_tag(takes_context=True)
+def active(context, pattern_or_urlname):
+ try:
+ pattern = '^' + reverse(pattern_or_urlname)
+ except NoReverseMatch:
+ pattern = pattern_or_urlname
+ path = context['request'].path
+ if re.search(pattern, path):
+ return 'active'
+ return ''
diff --git a/submissions/templates/partials/submissions/table_of_contents.html b/submissions/templates/partials/submissions/table_of_contents.html
index f1e175134..143d3d5f0 100644
--- a/submissions/templates/partials/submissions/table_of_contents.html
+++ b/submissions/templates/partials/submissions/table_of_contents.html
@@ -1,12 +1,11 @@
-<div class="card border-secondary">
+{% load request_filters %}
+
+<div class="card">
<div class="card-body">
- <h3>Table of Contents</h3>
- {# <p class="card-text">{{ submission.title }}</p> #}
- </div>
- <ul class="toc list-group list-group-flush">
+ <h3 class="card-title">Table of Contents</h3>
{% for sibling in submission.thread %}
- <li class="list-group-item"><div class="card-body pb-1">
- <a class="pubtitleli" href="{{ sibling.get_absolute_url }}">Version {{ sibling.arxiv_vn_nr }}</a>
+ <div class="mt-1">
+ <b><a href="{{ sibling.get_absolute_url }}" class="pubtitleli">Version {{ sibling.arxiv_vn_nr }}</a></b>
<span class="version-suffix">
{% if sibling.is_current %}
(current version)
@@ -14,18 +13,18 @@
(deprecated version)
{% endif %}
</span>
- <p class="mx-1 mt-1 mb-0">Submitted on {{ sibling.submission_date }}</p>
- <ul class="">
+ </div>
+ <div class="p-1">
+ Submitted on {{ sibling.submission_date|date:'j F Y' }}
+ <br>
+
+ <ul class="m-0">
{% for report in sibling.reports.accepted %}
- <li class="py-1">
- <a href="{{ report.get_absolute_url }}" class="pubtitleli">Report {{ report.report_nr }}</a>
- <div class="mt-1 ml-1">Submitted on {{ report.date_submitted }} by {% if not report.anonymous %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% else %}<em>Anonymous</em>{% endif %}</div>
- </li>
- {% empty %}
- <li><em>No Reports have been submitted yet.</em></li>
+
+ <li><a href="{{ report.get_absolute_url }}">Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
{% endfor %}
</ul>
- </div></li>
+ </div>
{% endfor %}
- </ul>
+ </div>
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 4ef69e1ad..15500fbca 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -25,41 +25,45 @@
<h1 class="text-primary">{{submission.title}}</h1>
<h3 class="mb-3">by {{submission.author_list}}</h3>
- <div class="pl-2">
- {% if submission.publication %}
- <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3>
- {% endif %}
+ <div class="pl-2">
+ {% if submission.publication %}
+ <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3>
+ {% endif %}
- {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %}
- <h3>- You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions</h3>
- {% endif %}
+ {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %}
+ <h3>- You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions</h3>
+ {% endif %}
- {% if unfinished_report_for_user %}
- <h3 class="mt-0">- <span class="circle text-danger border-danger">!</span> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h3>
- {% endif %}
+ {% if unfinished_report_for_user %}
+ <h3>- <span class="circle text-danger border-danger">!</span> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h3>
+ {% endif %}
- {% comment %}
- {% if submission.other_versions or not submission.is_current %}
- <ul class="mt-3 mb-1 list-unstyled pl-4">
- {% if not submission.is_current %}
- <li><h3 class="text-danger">This is not the current version.</h3></li>
- {% endif %}
+ {% if not submission.is_current %}
+ <h3><span class="text-danger">- This is not the current version.</span></h3>
+ {% endif %}
- {% if submission.other_versions %}
- <li>Other versions of this Submission (with Reports) exist:</li>
- <ul class="list-unstyled">
- {% for vn in submission.other_versions %}
- <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li>
- {% endfor %}
- </ul>
- {% endif %}
- </ul>
- {% endif %}
- {% endcomment %}
- </div>
+ {% comment %}
+ {% if submission.other_versions or not submission.is_current %}
+ <ul class="mt-3 mb-1 list-unstyled pl-4">
+ {% if not submission.is_current %}
+ <li><h3 class="text-danger">This is not the current version.</h3></li>
+ {% endif %}
+
+ {% if submission.other_versions %}
+ <li>Other versions of this Submission (with Reports) exist:</li>
+ <ul class="list-unstyled">
+ {% for vn in submission.other_versions %}
+ <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </ul>
+ {% endif %}
+ {% endcomment %}
+ </div>
- <h3>Submission summary</h3>
+ <h3 class="mt-2">Submission summary</h3>
{% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
{% include 'submissions/_submission_status_block.html' with submission=submission %}
--
GitLab