From 150d6ada6e06c557cf40a46f6de378324d35a90a Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 15 Apr 2019 13:03:19 +0200
Subject: [PATCH] Template style: app scipost
---
.../feeds/latest_publications_title.html | 2 +-
.../scipost/notification_center_modal.html | 2 +-
.../scipost/personal_page/account.html | 22 +++++++--------
.../scipost/personal_page/admin_actions.html | 28 +++++++++----------
.../personal_page/editorial_actions.html | 20 ++++++-------
.../scipost/personal_page/publications.html | 4 +--
.../scipost/personal_page/refereeing.html | 2 +-
.../scipost/personal_page/submissions.html | 10 +++----
scipost/templates/scipost/password_reset.html | 18 ++++++------
.../scipost/password_reset_confirm.html | 16 +++++------
10 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/scipost/templates/feeds/latest_publications_title.html b/scipost/templates/feeds/latest_publications_title.html
index 2e6854d42..f9cfe9939 100644
--- a/scipost/templates/feeds/latest_publications_title.html
+++ b/scipost/templates/feeds/latest_publications_title.html
@@ -1 +1 @@
-{{obj.title}}, by {{ obj.author_list }}
+{{ obj.title }}, by {{ obj.author_list }}
diff --git a/scipost/templates/partials/scipost/notification_center_modal.html b/scipost/templates/partials/scipost/notification_center_modal.html
index de268c868..280a6f3fa 100644
--- a/scipost/templates/partials/scipost/notification_center_modal.html
+++ b/scipost/templates/partials/scipost/notification_center_modal.html
@@ -36,7 +36,7 @@
</div>
<div class="actions">
<!-- <a href="javascript:;" class="mark-toggle show-unread" data-slug="{slug}"><i class="fa fa-circle" data-toggle="tooltip" data-placement="auto" title="Mark as read" aria-hidden="true"></i></a> -->
- <!-- <a href="javascript:;" class="mark-toggle show-read" data-slug="{slug}"><i class="fa fa-circle-o" data-toggle="tooltip" data-placement="auto" title="Mark as unread" aria-hidden="true"></i></a> -->
+ <!-- <a href="javascript:;" class="mark-toggle show-read" data-slug="{slug}"><i class="fa fa-circle-o" data-toggle="tooltip" data-placement="auto" title="Mark as unread" aria-hidden="true"></i></a> -->
<a href="{forward_link}" data-toggle='tooltip' data-placement="auto" title="Go to item"><i class="fa fa-share" aria-hidden="true"></i></a>
</div>
</li>
diff --git a/scipost/templates/partials/scipost/personal_page/account.html b/scipost/templates/partials/scipost/personal_page/account.html
index b122d87ad..f8088019d 100644
--- a/scipost/templates/partials/scipost/personal_page/account.html
+++ b/scipost/templates/partials/scipost/personal_page/account.html
@@ -2,17 +2,17 @@
{% load user_groups %}
{# Save all Permission groups into template variables #}
- {% is_edcol_admin request.user as is_edcol_admin %}
- {% is_scipost_admin request.user as is_scipost_admin %}
- {% is_editorial_college request.user as is_editorial_college %}
- {% is_advisory_board request.user as is_advisory_board %}
- {% is_vetting_editor request.user as is_vetting_editor %}
- {% is_ambassador request.user as is_ambassador %}
- {% is_junior_ambassador request.user as is_junior_ambassador %}
- {% is_registered_contributor request.user as is_registered_contributor %}
- {% is_tester request.user as is_tester %}
- {% is_production_officer request.user as is_production_officer %}
- {% recommend_new_totp_device request.user as recommend_totp %}
+{% is_edcol_admin request.user as is_edcol_admin %}
+{% is_scipost_admin request.user as is_scipost_admin %}
+{% is_editorial_college request.user as is_editorial_college %}
+{% is_advisory_board request.user as is_advisory_board %}
+{% is_vetting_editor request.user as is_vetting_editor %}
+{% is_ambassador request.user as is_ambassador %}
+{% is_junior_ambassador request.user as is_junior_ambassador %}
+{% is_registered_contributor request.user as is_registered_contributor %}
+{% is_tester request.user as is_tester %}
+{% is_production_officer request.user as is_production_officer %}
+{% recommend_new_totp_device request.user as recommend_totp %}
<div class="row">
<div class="col-12">
diff --git a/scipost/templates/partials/scipost/personal_page/admin_actions.html b/scipost/templates/partials/scipost/personal_page/admin_actions.html
index 5e05b436d..7edec4e96 100644
--- a/scipost/templates/partials/scipost/personal_page/admin_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/admin_actions.html
@@ -28,12 +28,12 @@
{% endif %}
</ul>
- {% if perms.scipost.can_manage_news %}
- <h3>News management</h3>
- <ul>
- <li><a href="{% url 'news:manage' %}">Manage News Items and Newsletters</a></li>
- </ul>
- {% endif %}
+ {% if perms.scipost.can_manage_news %}
+ <h3>News management</h3>
+ <ul>
+ <li><a href="{% url 'news:manage' %}">Manage News Items and Newsletters</a></li>
+ </ul>
+ {% endif %}
{% if perms.scipost.can_manage_registration_invitations %}
<h3>Notifications</h3>
@@ -65,19 +65,19 @@
{% if perms.scipost.can_view_profiles %}
<h3>Profiles</h3>
<ul>
- <li><a href="{% url 'profiles:profiles' %}">List/Manage Profiles</a></li>
+ <li><a href="{% url 'profiles:profiles' %}">List/Manage Profiles</a></li>
</ul>
{% endif %}
<h3>Ontology</h3>
<ul>
- <li><a href="{% url 'ontology:ontology' %}">View/Manage the Ontology</a></li>
+ <li><a href="{% url 'ontology:ontology' %}">View/Manage the Ontology</a></li>
</ul>
{% if perms.scipost.can_manage_organizations %}
<h3>Organizations</h3>
<ul>
- <li><a href="{% url 'organizations:organizations' %}">Manage Organizations</a></li>
+ <li><a href="{% url 'organizations:organizations' %}">Manage Organizations</a></li>
</ul>
{% endif %}
</div>
@@ -85,12 +85,12 @@
<div class="col-md-4">
<h3>Finances</h3>
<ul>
- {% if perms.scipost.can_manage_subsidies %}
- <li><a href="{% url 'finances:subsidies' %}">Manage Subsidies</a></li>
- {% endif %}
- {% if perms.scipost.can_view_timesheets %}
+ {% if perms.scipost.can_manage_subsidies %}
+ <li><a href="{% url 'finances:subsidies' %}">Manage Subsidies</a></li>
+ {% endif %}
+ {% if perms.scipost.can_view_timesheets %}
<li><a href="{% url 'finances:timesheets' %}">Production Team Timesheets</a></li>
- {% endif %}
+ {% endif %}
</ul>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
index 6dae5039e..3f19ecf7f 100644
--- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
@@ -88,17 +88,17 @@
</div>
{% endif %}
- <div class="col-md-4">
- {% if perms.scipost.can_manage_college_composition or perms.scipost.can_view_potentialfellowship_list %}
- <h3>Colleges and Fellowships</h3>
- <ul>
- <li><a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships: view{% if perms.scipost.can_manage_college_composition %} and manage{% endif %}</a></li>
- {% if perms.scipost.can_manage_college_composition %}
+ <div class="col-md-4">
+ {% if perms.scipost.can_manage_college_composition or perms.scipost.can_view_potentialfellowship_list %}
+ <h3>Colleges and Fellowships</h3>
+ <ul>
+ <li><a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships: view{% if perms.scipost.can_manage_college_composition %} and manage{% endif %}</a></li>
+ {% if perms.scipost.can_manage_college_composition %}
<li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
- {% endif %}
- </ul>
- {% endif %}
- </div>
+ {% endif %}
+ </ul>
+ {% endif %}
+ </div>
</div>
{% if active_assignments %}
diff --git a/scipost/templates/partials/scipost/personal_page/publications.html b/scipost/templates/partials/scipost/personal_page/publications.html
index d10602c7a..0d3830fdf 100644
--- a/scipost/templates/partials/scipost/personal_page/publications.html
+++ b/scipost/templates/partials/scipost/personal_page/publications.html
@@ -24,11 +24,11 @@
<li>
<div class="card bg-light card-publication" id="{{pub.doi_label}}">
{% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
- {% if request.user == pub.accepted_submission.submitted_by.user %}
+ {% if request.user == pub.accepted_submission.submitted_by.user %}
{% if not pub.pubfractions_confirmed_by_authors or not pub.pubfractions_sum_to_1 %}
<h4 class="m-2"><a href="{% url 'journals:allocate_orgpubfractions' doi_label=pub.doi_label %}"><span class="text-danger">Intervention needed:</span> review support fractions</a></h4>
{% endif %}
- {% endif %}
+ {% endif %}
</div>
</li>
{% empty %}
diff --git a/scipost/templates/partials/scipost/personal_page/refereeing.html b/scipost/templates/partials/scipost/personal_page/refereeing.html
index 8f94f600a..e48e788ae 100644
--- a/scipost/templates/partials/scipost/personal_page/refereeing.html
+++ b/scipost/templates/partials/scipost/personal_page/refereeing.html
@@ -111,7 +111,7 @@
{% for report in contributor.reports.non_draft.all %}
<li class="list-group-item">
{% comment %}
- Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
+ Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
{% endcomment %}
<div class="card-body px-0 {% block cardblock_class_block %}{% endblock %}">
<h3>Report on Submission <a href="{{ report.submission.get_absolute_url }}">{{ report.submission.title }}</a></h3>
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index f398614ed..dd7b6fcd8 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -29,17 +29,17 @@
{% if request.user.contributor == sub.submitted_by %}
<p class="card-text mt-1">
- <ul>
+ <ul>
{% if sub.open_for_resubmission %}
<li>To resubmit, go to the <a href="{% url 'submissions:resubmit_manuscript' %}">resubmission page</a></li>
{% endif %}
- {% if sub.under_consideration %}
+ {% if sub.under_consideration %}
{% if sub.editor_in_charge %}
<li><a href="{% url 'submissions:communication' sub.preprint.identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a></li>
{% endif %}
- <li><a href="{% url 'submissions:withdraw_manuscript' sub.preprint.identifier_w_vn_nr %}"><span class="text-danger">Withdraw</span></a> (leads to confirmation page)</li>
- {% endif %}
- </ul>
+ <li><a href="{% url 'submissions:withdraw_manuscript' sub.preprint.identifier_w_vn_nr %}"><span class="text-danger">Withdraw</span></a> (leads to confirmation page)</li>
+ {% endif %}
+ </ul>
</p>
{% endif %}
</div>
diff --git a/scipost/templates/scipost/password_reset.html b/scipost/templates/scipost/password_reset.html
index 608c44509..dea5c73c3 100644
--- a/scipost/templates/scipost/password_reset.html
+++ b/scipost/templates/scipost/password_reset.html
@@ -7,15 +7,15 @@
{% block content %}
-<div class="row justify-content-center">
+ <div class="row justify-content-center">
<div class="col-md-4">
- <h2>Password reset form</h2>
- <form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit" />
- </form>
- </div>
-</div>
+ <h2>Password reset form</h2>
+ <form method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="Submit" />
+ </form>
+ </div>
+ </div>
{% endblock %}
diff --git a/scipost/templates/scipost/password_reset_confirm.html b/scipost/templates/scipost/password_reset_confirm.html
index 589afa0ad..9f62c0789 100644
--- a/scipost/templates/scipost/password_reset_confirm.html
+++ b/scipost/templates/scipost/password_reset_confirm.html
@@ -6,18 +6,18 @@
{% block content %}
-<div class="row justify-content-center">
+ <div class="row justify-content-center">
<div class="col-md-8 col-lg-6">
- {% if validlink %}
+ {% if validlink %}
<form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-outline-secondary" type="submit" value="Submit">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-outline-secondary" type="submit" value="Submit">
</form>
- {% else %}
+ {% else %}
<p>This reset link is no longer valid!</p>
- {% endif %}
+ {% endif %}
</div>
-</div>
+ </div>
{% endblock content %}
--
GitLab