From 88d32668c6e3520061f965707e602c8dfc1da492 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 1 Mar 2016 16:34:33 +0100
Subject: [PATCH] Highlight current page in navbar. Other small corrections.
---
scipost/models.py | 1 -
scipost/static/scipost/SciPost.css | 6 +++-
scipost/templates/scipost/navbar.html | 12 +++----
scipost/templates/scipost/personal_page.html | 34 +++++++++++--------
scipost/templates/scipost/reset_password.html | 2 +-
5 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/scipost/models.py b/scipost/models.py
index e31b84a5a..031444c27 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -144,4 +144,3 @@ class Contributor(models.Model):
return output
-#class LeadEditorGroup(models.Group)
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index 00abb96b2..a5a1fe8ff 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -307,11 +307,15 @@ nav a:hover {
color: #000000;
/* color: #FFA300 */
text-decoration: none;
- background-color: #ffffff;
+ background-color: #FFFFFF;
}
nav a:active {
color: #222222;
}
+nav a.highlighted {
+/* background-color: #FFFFFF; */
+ border: 1px solid black;
+}
nav p {
display: inline-block;
margin: 10px;
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index a3e99c8c7..04f73cd55 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -1,20 +1,20 @@
<nav>
<div class="row">
<div class="col-6">
- <a href="{% url 'scipost:index' %}">Home</a>
+ <a href="{% url 'scipost:index' %}" {% if request.path == '/' %}class="highlighted"{% endif %}>Home</a>
<!-- Temporary strip for online version -->
{% if user.is_authenticated %}
- <a href="{% url 'journals:journals' %}">Journals</a>
- <a href="{% url 'submissions:submissions' %}">Submissions</a>
- <a href="{% url 'commentaries:commentaries' %}">Commentaries</a>
- <a href="{% url 'theses:theses' %}">Theses</a>
+ <a href="{% url 'journals:journals' %}" {% if "/journals/" in request.path %}class="highlighted"{% endif %}>Journals</a>
+ <a href="{% url 'submissions:submissions' %}" {% if "/submissions/" in request.path %}class="highlighted"{% endif %}>Submissions</a>
+ <a href="{% url 'commentaries:commentaries' %}" {% if "/commentaries/" in request.path %}class="highlighted"{% endif %}>Commentaries</a>
+ <a href="{% url 'theses:theses' %}" {% if "/theses/" in request.path %}class="highlighted"{% endif %}>Theses</a>
{% endif %}
</div>
<div class="col-6">
{% if user.is_authenticated %}
<p>Logged in as {{ user.username }}</p>
<a href="{% url 'scipost:logout' %}">Logout</a>
- <a href="{% url 'scipost:personal_page' %}">Personal Page</a>
+ <a href="{% url 'scipost:personal_page' %}" {% if "/personal_page" in request.path %}class="highlighted"{% endif %}>Personal Page</a>
{% else %}
<a href="{% url 'scipost:login' %}">Login</a>
{% endif %}
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 3d9d5695f..0cfce98dd 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -2,6 +2,10 @@
{% block pagetitle %}: personal page{% endblock pagetitle %}
+{% block headsup %}
+{% load rating_extras %}
+{% endblock headsup %}
+
{% block bodysup %}
<section>
@@ -104,31 +108,31 @@
<div class="col-3">
<table class="ratings">
<th>Reports</th><th>(nr: {{ contributor.nr_reports }})</th>
- <tr><td>relevance:</td><td>{{ contributor.report_relevance_rating }}% ({{ contributor.nr_report_relevance_ratings }})</td></tr>
- <tr><td>importance:</td><td>{{ contributor.report_importance_rating }}% ({{ contributor.nr_report_importance_ratings }})</td></tr>
- <tr><td>clarity:</td><td>{{ contributor.report_clarity_rating }}% ({{ contributor.nr_report_clarity_ratings }})</td></tr>
- <tr><td>validity:</td><td>{{ contributor.report_validity_rating }}% ({{ contributor.nr_report_validity_ratings }})</td></tr>
- <tr><td>rigour:</td><td>{{ contributor.report_rigour_rating }}% ({{ contributor.nr_report_rigour_ratings }})</td></tr>
+ <tr><td>relevance:</td><td>{{ contributor.report_relevance_rating }}% {{ contributor.report_relevance_rating|rating_as_text }} ({{ contributor.nr_report_relevance_ratings }})</td></tr>
+ <tr><td>importance:</td><td>{{ contributor.report_importance_rating }}% {{ contributor.report_importance_rating|rating_as_text }} ({{ contributor.nr_report_importance_ratings }})</td></tr>
+ <tr><td>clarity:</td><td>{{ contributor.report_clarity_rating }}% {{ contributor.report_importance_rating|rating_as_text }} ({{ contributor.nr_report_clarity_ratings }})</td></tr>
+ <tr><td>validity:</td><td>{{ contributor.report_validity_rating }}% {{ contributor.report_validity_rating|rating_as_text }} ({{ contributor.nr_report_validity_ratings }})</td></tr>
+ <tr><td>rigour:</td><td>{{ contributor.report_rigour_rating }}% {{ contributor.report_rigour_rating|rating_as_text }} ({{ contributor.nr_report_rigour_ratings }})</td></tr>
</table>
</div>
<div class="col-3">
<table class="ratings">
<th>Comments</th><th>(nr: {{ contributor.nr_comments }})</th>
- <tr><td>relevance:</td><td>{{ contributor.comment_relevance_rating }}% ({{ contributor.nr_comment_relevance_ratings }})</td></tr>
- <tr><td>importance:</td><td>{{ contributor.comment_importance_rating }}% ({{ contributor.nr_comment_importance_ratings }})</td></tr>
- <tr><td>clarity:</td><td>{{ contributor.comment_clarity_rating }}% ({{ contributor.nr_comment_clarity_ratings }})</td></tr>
- <tr><td>validity:</td><td>{{ contributor.comment_validity_rating }}% ({{ contributor.nr_comment_validity_ratings }})</td></tr>
- <tr><td>rigour:</td><td>{{ contributor.comment_rigour_rating }}% ({{ contributor.nr_comment_rigour_ratings }})</td></tr>
+ <tr><td>relevance:</td><td>{{ contributor.comment_relevance_rating }}% {{ contributor.comment_relevance_rating|rating_as_text }} ({{ contributor.nr_comment_relevance_ratings }})</td></tr>
+ <tr><td>importance:</td><td>{{ contributor.comment_importance_rating }}% {{ contributor.comment_importance_rating|rating_as_text }} ({{ contributor.nr_comment_importance_ratings }})</td></tr>
+ <tr><td>clarity:</td><td>{{ contributor.comment_clarity_rating }}% {{ contributor.comment_clarity_rating|rating_as_text }} ({{ contributor.nr_comment_clarity_ratings }})</td></tr>
+ <tr><td>validity:</td><td>{{ contributor.comment_validity_rating }}% {{ contributor.comment_validity_rating|rating_as_text }} ({{ contributor.nr_comment_validity_ratings }})</td></tr>
+ <tr><td>rigour:</td><td>{{ contributor.comment_rigour_rating }}% {{ contributor.comment_rigour_rating|rating_as_text }} ({{ contributor.nr_comment_rigour_ratings }})</td></tr>
</table>
</div>
<div class="col-3">
<table class="ratings">
<th>Author Replies</th><th>(nr: {{ contributor.nr_authorreplies }})</th>
- <tr><td>relevance:</td><td>{{ contributor.authorreply_relevance_rating }}% ({{ contributor.nr_authorreply_relevance_ratings }})</td></tr>
- <tr><td>importance:</td><td>{{ contributor.authorreply_importance_rating }}% ({{ contributor.nr_authorreply_importance_ratings }})</td></tr>
- <tr><td>clarity:</td><td>{{ contributor.authorreply_clarity_rating }}% ({{ contributor.nr_authorreply_clarity_ratings }})</td></tr>
- <tr><td>validity:</td><td>{{ contributor.authorreply_validity_rating }}% ({{ contributor.nr_authorreply_validity_ratings }})</td></tr>
- <tr><td>rigour:</td><td>{{ contributor.authorreply_rigour_rating }}% ({{ contributor.nr_authorreply_rigour_ratings }})</td></tr>
+ <tr><td>relevance:</td><td>{{ contributor.authorreply_relevance_rating }}% {{ contributor.authorreply_relevance_rating|rating_as_text }} ({{ contributor.nr_authorreply_relevance_ratings }})</td></tr>
+ <tr><td>importance:</td><td>{{ contributor.authorreply_importance_rating }}% {{ contributor.authorreply_importance_rating|rating_as_text }} ({{ contributor.nr_authorreply_importance_ratings }})</td></tr>
+ <tr><td>clarity:</td><td>{{ contributor.authorreply_clarity_rating }}% {{ contributor.authorreply_clarity_rating|rating_as_text }} ({{ contributor.nr_authorreply_clarity_ratings }})</td></tr>
+ <tr><td>validity:</td><td>{{ contributor.authorreply_validity_rating }}% {{ contributor.authorreply_validity_rating|rating_as_text }} ({{ contributor.nr_authorreply_validity_ratings }})</td></tr>
+ <tr><td>rigour:</td><td>{{ contributor.authorreply_rigour_rating }}% {{ contributor.authorreply_rigour_rating|rating_as_text }} ({{ contributor.nr_authorreply_rigour_ratings }})</td></tr>
</table>
</div>
</div>
diff --git a/scipost/templates/scipost/reset_password.html b/scipost/templates/scipost/reset_password.html
index 2c33bc500..e297cae08 100644
--- a/scipost/templates/scipost/reset_password.html
+++ b/scipost/templates/scipost/reset_password.html
@@ -4,7 +4,7 @@
{% block bodysup %}
<section>
- <h3>Reset password request for</h3>
+ <h3>Reset password request form</h3>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
--
GitLab