diff --git a/careers/templates/careers/jobopening_detail.html b/careers/templates/careers/jobopening_detail.html
index 168e83d0d2b8c6c0c471147c4b30c347e32d05e2..be3ecf728f663d209a243a6bc9ff2f1b114828ff 100644
--- a/careers/templates/careers/jobopening_detail.html
+++ b/careers/templates/careers/jobopening_detail.html
@@ -5,6 +5,7 @@
<span class="breadcrumb-item">{{ jobopening }}</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Job Opening Detail{% endblock meta_description %}
{% block pagetitle %}: Job Opening details{% endblock pagetitle %}
{% block content %}
@@ -24,19 +25,19 @@
{% if perms.careers.add_jobopening %}
<h1 class="highlight">Applications for this position</h1>
<div class="accordion" id="jobappAccordion">
- {% for jobapp in jobopening.jobapplication_set.all %}
- <div class="card">
- <div class="card-header">
- <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapse{{ forloop.counter }}">{{ jobapp.last_name }}, {{ jobapp.get_title_display }} {{ jobapp.first_name }}</button>
- </div>
- <div class="collapse" id="collapse{{ forloop.counter }}">
- <div class="card-body" data-parent="jobappAccordion">
- Link to application detail page as visible by candidate:
- <a href="{{ jobapp.get_absolute_url }}">{{ jobapp }}</a>
- {% include 'careers/_jobapplication_as_table.html' with jobapplication=jobapp %}
+ {% for jobapp in jobopening.jobapplication_set.all %}
+ <div class="card">
+ <div class="card-header">
+ <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapse{{ forloop.counter }}">{{ jobapp.last_name }}, {{ jobapp.get_title_display }} {{ jobapp.first_name }}</button>
+ </div>
+ <div class="collapse" id="collapse{{ forloop.counter }}">
+ <div class="card-body" data-parent="jobappAccordion">
+ Link to application detail page as visible by candidate:
+ <a href="{{ jobapp.get_absolute_url }}">{{ jobapp }}</a>
+ {% include 'careers/_jobapplication_as_table.html' with jobapplication=jobapp %}
+ </div>
</div>
</div>
- </div>
{% endfor %}
</div>
{% endif %}
diff --git a/careers/templates/careers/jobopening_list.html b/careers/templates/careers/jobopening_list.html
index 24ef019806e9a8e9a1d4eea6e79f5d18830ca5e9..ac0df9ab8d90035ea6cb90b94f5f04efa95acd6b 100644
--- a/careers/templates/careers/jobopening_list.html
+++ b/careers/templates/careers/jobopening_list.html
@@ -7,6 +7,7 @@
{{ block.super }}
{% endblock %}
+{% block meta_description %}{{ block.super }} Job Openings{% endblock meta_description %}
{% block pagetitle %}: Job Openings{% endblock pagetitle %}
{% block content %}
@@ -45,7 +46,7 @@
{{ job.short_description|automarkup }}
</div>
<div class="card-footer">
- <i class="fa fa-arrow-right"></i> <a href="{{ job.get_absolute_url }}">View full description/apply for this job</a>
+ {% include 'bi/arrow-right.html' %} <a href="{{ job.get_absolute_url }}">View full description/apply for this job</a>
</div>
</div>
{% empty %}
diff --git a/colleges/templates/colleges/college_detail.html b/colleges/templates/colleges/college_detail.html
index 6a23f0ea02ddd4b894439f3a67031b552e9744f7..e59a1b492a406952e91b6384c45cf416b01fd798 100644
--- a/colleges/templates/colleges/college_detail.html
+++ b/colleges/templates/colleges/college_detail.html
@@ -11,6 +11,7 @@
<span class="breadcrumb-item">{{ college }}</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} College detail {{ college }}{% endblock meta_description %}
{% block pagetitle %}: {{ college }}{% endblock pagetitle %}
{% block content %}
diff --git a/colleges/templates/colleges/college_list.html b/colleges/templates/colleges/college_list.html
index 2424e8f3077bd304fe0c9a58475691aba00ea5d8..2b0b2f9d3e961962b7e41d5944b234c5977ef7b5 100644
--- a/colleges/templates/colleges/college_list.html
+++ b/colleges/templates/colleges/college_list.html
@@ -10,6 +10,7 @@
<a href="{% url 'colleges:colleges' %}" class="breadcrumb-item">Colleges</a>
{% endblock %}
+{% block meta_description %}{{ block.super }} Colleges{% endblock meta_description %}
{% block pagetitle %}: Colleges{% endblock pagetitle %}
{% block content %}
@@ -67,7 +68,7 @@
{% if acad_field.colleges.all|length > 0 %}
{% for college in acad_field.colleges.all %}
{% if college.fellowships.all|length > 0 %}
- <a href={% url 'colleges:college_detail' slug=college.slug %}><button type="button" class="btn btn-primary btn-sm m-1"><small>{{ college.name }}</small></button></a>
+ <a href={% url 'colleges:college_detail' college=college.slug %}><button type="button" class="btn btn-primary btn-sm m-1"><small>{{ college.name }}</small></button></a>
{% else %}
<button type="button" class="btn btn-sm btn-outline-secondary m-1"><small><em>{{ acad_field }}</em></small></button>
{% endif %}
diff --git a/colleges/templates/colleges/fellowship_list.html b/colleges/templates/colleges/fellowship_list.html
index 4fb78ae0e7270b350d4cb6e1673686b6eec8eb36..4fdf630908c8f0160159d1ae317cd22f6bf08b2f 100644
--- a/colleges/templates/colleges/fellowship_list.html
+++ b/colleges/templates/colleges/fellowship_list.html
@@ -9,6 +9,7 @@
<span class="breadcrumb-item">Fellowships</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Fellowships{% endblock meta_description %}
{% block pagetitle %}: Fellowships{% endblock pagetitle %}
{% block content %}
diff --git a/colleges/urls.py b/colleges/urls.py
index b7da4a1c5a6584c933c7321c19d72c7bb33ebcef..3f162be74868248cc94b043b6e2c3ad7e6976162 100644
--- a/colleges/urls.py
+++ b/colleges/urls.py
@@ -13,7 +13,7 @@ from .converters import CollegeSlugConverter
register_converter(AcademicFieldSlugConverter, 'acad_field')
register_converter(SpecialtySlugConverter, 'specialty')
-register_converter(CollegeSlugConverter, 'college_slug')
+register_converter(CollegeSlugConverter, 'college')
app_name = 'colleges'
@@ -25,7 +25,7 @@ urlpatterns = [
name='colleges'
),
path(
- '<college_slug:slug>',
+ '<college:college>',
views.CollegeDetailView.as_view(),
name='college_detail'
),
diff --git a/colleges/views.py b/colleges/views.py
index 9cf454b20eee8aa25977cffcc70b9e10530657a7..1bfa87b3962083e1d51624fa04ea583db4d5729c 100644
--- a/colleges/views.py
+++ b/colleges/views.py
@@ -49,6 +49,13 @@ class CollegeDetailView(DetailView):
model = College
template_name = 'colleges/college_detail.html'
+ def get_object(self, queryset=None):
+ """
+ Bypass django.views.generic.detail.SingleObjectMixin:
+ since CollegeSlugConverter already found the College as a kwarg, just pass that object on.
+ """
+ return self.kwargs['college']
+
class FellowshipCreateView(PermissionsMixin, CreateView):
"""
diff --git a/commentaries/templates/commentaries/_commentary_summary.html b/commentaries/templates/commentaries/_commentary_summary.html
index 8127200426093f0a9a049eb6be288682a1b1aec1..14c975ee880e8028833fd97d5a16ab2b4049a8ae 100644
--- a/commentaries/templates/commentaries/_commentary_summary.html
+++ b/commentaries/templates/commentaries/_commentary_summary.html
@@ -25,14 +25,14 @@
<tr>
<td>DOI:</td>
<td>
- <a href="{{commentary.pub_DOI_link}}" target="_blank">{{ commentary.pub_DOI_link }}</a>
+ <a href="{{ commentary.pub_DOI_link }}" target="_blank" rel="noopener">{{ commentary.pub_DOI_link }}</a>
</td>
</tr>
{% elif commentary.type == 'preprint' %}
<tr>
<td>arxiv Link:</td>
<td>
- <a href="{{commentary.arxiv_link}}" target="_blank">{{ commentary.arxiv_link }}</a>
+ <a href="{{ commentary.arxiv_link }}" target="_blank" rel="noopener">{{ commentary.arxiv_link }}</a>
</td>
</tr>
{% endif %}
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 44796d7a0985032499afd747d188ae9f9c622caa..7c05fc8bf690458bcd4c0858b309bda2faadd322 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -2,6 +2,7 @@
{% load scipost_extras %}
+{% block meta_description %}{{ block.super }} Commentary on {{ commentary }} {% endblock meta_description %}
{% block pagetitle %}: Commentary detail{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/commentaries/templates/commentaries/commentary_list.html b/commentaries/templates/commentaries/commentary_list.html
index 6a535aca35f843b83db771c5e28216ee307ea60e..b8cfe7c22b4a9dc073d8711a6fc19bf84e404934 100644
--- a/commentaries/templates/commentaries/commentary_list.html
+++ b/commentaries/templates/commentaries/commentary_list.html
@@ -3,6 +3,7 @@
{% load bootstrap %}
{% load request_filters %}
+{% block meta_description %}{{ block.super }} Commentaries list{% endblock meta_description %}
{% block pagetitle %}: Commentaries{% endblock pagetitle %}
{% block content %}
diff --git a/commentaries/templates/commentaries/howto.html b/commentaries/templates/commentaries/howto.html
index 9d2bd935ed43ba6c88e140c07509d616db075707..1c46b2044a18ad1aa043dbe4157d9d0787120a44 100644
--- a/commentaries/templates/commentaries/howto.html
+++ b/commentaries/templates/commentaries/howto.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Commentaries howto{% endblock meta_description %}
{% block pagetitle %}: Commentaries{% endblock pagetitle %}
{% block content %}
diff --git a/comments/templates/comments/new_comment.html b/comments/templates/comments/new_comment.html
index 860ca4a6dfdf20bb506e50c7593c28e42d25edef..454bde0942f2e379470ed53bcebe1743c5055d55 100644
--- a/comments/templates/comments/new_comment.html
+++ b/comments/templates/comments/new_comment.html
@@ -7,7 +7,7 @@
<h2 class="highlight" id="contribute_comment">Contribute a Comment</h2>
{% if user_is_referee and submission %}
<h4 class="text-danger my-3">
- <i class="fa fa-exclamation-triangle"></i>
+ {% include 'bi/exclamation-triangle-fill.html' %}
You are an invited referee, please <a href="{% url 'submissions:submit_report' submission.preprint.identifier_w_vn_nr %}">submit a Report</a> instead.
</h4>
{% endif %}
diff --git a/finances/templates/finances/apex.html b/finances/templates/finances/apex.html
index 00eeeeee9a31d1aee359fdac0713e2bc0b30c1b9..68f381067d365464667bbeef4001f3dce7191831 100644
--- a/finances/templates/finances/apex.html
+++ b/finances/templates/finances/apex.html
@@ -8,6 +8,7 @@
<span class="breadcrumb-item">Average Publication Expenditures</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} APEX{% endblock meta_description %}
{% block pagetitle %}: Average Publication Expenditures{% endblock pagetitle %}
{% block content %}
diff --git a/finances/templates/finances/business_model.html b/finances/templates/finances/business_model.html
index cd1893dbe0791ddf9e8357f5453ad19b52d2561d..27fa8b3bce2aa7edb648a970344a9cce4f15b6de 100644
--- a/finances/templates/finances/business_model.html
+++ b/finances/templates/finances/business_model.html
@@ -8,6 +8,7 @@
<span class="breadcrumb-item">Business Model</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Business Model{% endblock meta_description %}
{% block pagetitle %}: Business Model{% endblock pagetitle %}
{% block content %}
diff --git a/finances/templates/finances/finances.html b/finances/templates/finances/finances.html
index 4a5852fe76eff9bf026ea5fc15ea2e33f6a31596..702ca3ac82e91876edb6d48e139537d61d45464c 100644
--- a/finances/templates/finances/finances.html
+++ b/finances/templates/finances/finances.html
@@ -12,6 +12,7 @@
{{ block.super }}
{% endblock %}
+{% block meta_description %}{{ block.super }} Finances{% endblock meta_description %}
{% block pagetitle %}: Finances{% endblock pagetitle %}
{% block content %}
diff --git a/finances/templates/finances/subsidy_detail.html b/finances/templates/finances/subsidy_detail.html
index 2a8ada9c629e6ec4a07bebc9aaaa7cadd19f82ec..e09fccf57f7c107542837e88aab29a8d77c3fffa 100644
--- a/finances/templates/finances/subsidy_detail.html
+++ b/finances/templates/finances/subsidy_detail.html
@@ -2,6 +2,7 @@
{% load bootstrap %}
+{% block meta_description %}{{ block.super }} Subsidy Detail{% endblock meta_description %}
{% block pagetitle %}: Subsidy details{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html
index dc9683b59a880137d7cb73a4fdb81bb8794e36b3..fbf81eeb400e28d409e9c5b2c962accc407b8cf4 100644
--- a/finances/templates/finances/subsidy_list.html
+++ b/finances/templates/finances/subsidy_list.html
@@ -1,5 +1,6 @@
{% extends 'finances/base.html' %}
+{% block meta_description %}{{ block.super }} Subsidies List{% endblock meta_description %}
{% block pagetitle %}: Subsidies{% endblock pagetitle %}
{% load static %}
@@ -33,14 +34,14 @@
<th>Type</th>
<th>Amount
{% if request.GET.ordering != 'asc' %}
- <a href="?order_by=amount&ordering=asc"><i class="fa fa-sort-asc"></i></a>
+ <a href="?order_by=amount&ordering=asc">{% include 'bi/sort-up.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-up.html' %}</a>
{% endif %}
{% if request.GET.ordering != 'desc' %}
- <a href="?order_by=amount&ordering=desc"><i class="fa fa-sort-desc"></i></a>
+ <a href="?order_by=amount&ordering=desc">{% include 'bi/sort-down.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-down.html' %}</a>
{% endif %}
</th>
{% if perms.scipost.can_manage_subsidies %}
@@ -49,26 +50,26 @@
{% endif %}
<th>From date
{% if request.GET.ordering != 'asc' %}
- <a href="?order_by=date&ordering=asc"><i class="fa fa-sort-asc"></i></a>
+ <a href="?order_by=date&ordering=asc">{% include 'bi/sort-up.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-up.html' %}</a>
{% endif %}
{% if request.GET.ordering != 'desc' %}
- <a href="?order_by=date&ordering=desc"><i class="fa fa-sort-desc"></i></a>
+ <a href="?order_by=date&ordering=desc">{% include 'bi/sort-down.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-down.html' %}</i></a>
{% endif %}
</th>
<th>Until
{% if request.GET.ordering != 'asc' %}
- <a href="?order_by=until&ordering=asc"><i class="fa fa-sort-asc"></i></a>
+ <a href="?order_by=until&ordering=asc">{% include 'bi/sort-up.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-up.html' %}</a>
{% endif %}
{% if request.GET.ordering != 'desc' %}
- <a href="?order_by=until&ordering=desc"><i class="fa fa-sort-desc"></i></a>
+ <a href="?order_by=until&ordering=desc">{% include 'bi/sort-down.html' %}</a>
{% else %}
- <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% url 'finances:subsidies' %}">{% include 'bi/sort-down.html' %}</a>
{% endif %}
</th>
{% if perms.scipost.can_manage_subsidies %}
@@ -88,16 +89,16 @@
<td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td>
{% if perms.scipost.can_manage_subsidies %}
<td>{{ subsidy.get_status_display }}</td>
- <td>{% if subsidy.attachments.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if subsidy.attachments.all|length > 0 %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
{% endif %}
<td>{{ subsidy.date }}</td>
<td class="bg-{{ subsidy.date_until_color_class }}">{{ subsidy.date_until }}</td>
{% if perms.scipost.can_manage_subsidies %}
<td>
- {% if subsidy.renewable == True %}<i class="fa fa-check-circle text-success"></i>{% elif subsidy.renewable == False %}<i class="fa fa-times-circle text-danger"></i>{% else %}<i class="fa fa-question-circle text-warning"></i>{% endif %}
+ {% if subsidy.renewable == True %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% elif subsidy.renewable == False %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% else %}<span class="text-warning">{% include 'bi/question-circle-fill.html' %}</span>{% endif %}
</td>
<td>
- {% if subsidy.renewed_by.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}
+ {% if subsidy.renewed_by.all|length > 0 %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}
</td>
<td class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</td>
{% endif %}
diff --git a/finances/templates/partials/finances/logs.html b/finances/templates/partials/finances/logs.html
index 4bfc5fd07e940480cff348a7ffbde6f55cea796f..e79315331e013aa3c04719345cf5253e540a06e6 100644
--- a/finances/templates/partials/finances/logs.html
+++ b/finances/templates/partials/finances/logs.html
@@ -18,7 +18,7 @@
<strong>Duration: {{ log.duration|duration }}</strong>
</div>
<div class="pl-2">
- <a class="text-danger" href="{% url 'finances:log_delete' log.slug %}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+ <a class="text-danger" href="{% url 'finances:log_delete' log.slug %}"><span aria-hidden="true">{% include 'bi/trash-fill.html' %}</a>
</div>
</div>
</div>
diff --git a/finances/templates/partials/finances/subsidy_details.html b/finances/templates/partials/finances/subsidy_details.html
index b054470a5975318f6405f87b892aebb60c2d327a..42c9cfefd5f5e05b0dc8cc9810f42d4217d5ab90 100644
--- a/finances/templates/partials/finances/subsidy_details.html
+++ b/finances/templates/partials/finances/subsidy_details.html
@@ -79,7 +79,7 @@
<tr>
<td><a href="{{ att.get_absolute_url }}" target="_blank">{{ att.name }}</a></td>
{% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}
- <td>{% if att.publicly_visible %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} <a href="{% url 'finances:subsidy_attachment_toggle_public_visibility' attachment_id=att.id %}" class="small">Make it {% if att.publicly_visible %}in{% endif %}visible</a></td>
+ <td>{% if att.publicly_visible %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %} <a href="{% url 'finances:subsidy_attachment_toggle_public_visibility' attachment_id=att.id %}" class="small">Make it {% if att.publicly_visible %}in{% endif %}visible</a></td>
{% if perms.scipost.can_manage_subsidies %}
<td><a href="{% url 'finances:subsidyattachment_update' pk=att.id %}"><span class="text-warning">Update</span></a></td>
<td><a href="{% url 'finances:subsidyattachment_delete' pk=att.id %}"><span class="text-danger">Delete</span></a></td>
diff --git a/forums/templates/forums/post_card.html b/forums/templates/forums/post_card.html
index e1bd70a9147dc82b09f25249f2dfd4a82eecf189..ae3ed8664046714a85ee535db83af010c08357fe 100644
--- a/forums/templates/forums/post_card.html
+++ b/forums/templates/forums/post_card.html
@@ -5,7 +5,7 @@
{{ post.subject }}
<div class="postInfo">
{{ post.posted_by.first_name }} {{ post.posted_by.last_name }} on {{ post.posted_on|date:"Y-m-d" }}
- - <a href="{{ post.get_absolute_url }}"><i class="fa fa-link" title="permalink to this Post"></i></a>
+ - <a href="{{ post.get_absolute_url }}"><span title="permalink to this Post">{% include 'bi/link.html' %}</span></a>
{% if post.parent and not post.motion %}
- regarding <a href="{{ post.parent.get_absolute_url }}">{{ post.parent }}</a>
{% endif %}
diff --git a/funders/templates/funders/funder_details.html b/funders/templates/funders/funder_details.html
index 96d41887d44d10e2e49b83eebfb0a8d5cfb62e21..9c829961e1173aeff749e6524f47cd797122d51a 100644
--- a/funders/templates/funders/funder_details.html
+++ b/funders/templates/funders/funder_details.html
@@ -1,5 +1,6 @@
{% extends 'funders/base.html' %}
+{% block meta_description %}{{ block.super }} Funder details {{ funder.name }}{% endblock meta_description %}
{% block pagetitle %}: Funder details{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/funders/templates/funders/funder_list.html b/funders/templates/funders/funder_list.html
index 67ba2a694befadadf24bc15fdd5899f3d4a57d30..a4595b5cc7efbf2305a9d9f8d6548b11f9e24199 100644
--- a/funders/templates/funders/funder_list.html
+++ b/funders/templates/funders/funder_list.html
@@ -1,5 +1,6 @@
{% extends 'funders/base.html' %}
+{% block meta_description %}{{ block.super }} Funders list{% endblock meta_description %}
{% block pagetitle %}: Funders list{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/helpdesk/models.py b/helpdesk/models.py
index 31a04016138c56939d07faa422e9874c6e9c48a7..d191cd36d6dfae1a552ac7a7f4df54a1c85635a5 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -5,6 +5,7 @@ __license__ = "AGPL v3"
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.db import models
+from django.template import Template
from django.urls import reverse
from django.utils import timezone
@@ -167,19 +168,15 @@ class Ticket(models.Model):
return self.status not in [TICKET_STATUS_RESOLVED, TICKET_STATUS_CLOSED]
@property
- def priority_icons(self):
+ def priority_level(self):
if self.priority == TICKET_PRIORITY_URGENT:
- return ('<i class="fa fa-lg fa-thermometer-full"></i> '
- '<i class="fa fa-exclamation"></i><i class="fa fa-exclamation"></i>'
- '<i class="fa fa-exclamation"></i>')
+ return 3
elif self.priority == TICKET_PRIORITY_HIGH:
- return ('<i class="fa fa-lg fa-thermometer-three-quarters"></i> '
- '<i class="fa fa-exclamation"></i><i class="fa fa-exclamation"></i>')
+ return 2
elif self.priority == TICKET_PRIORITY_MEDIUM:
- return ('<i class="fa fa-lg fa-thermometer-half"></i> '
- '<i class="fa fa-exclamation"></i>')
+ return 1
else:
- return '<i class="fa fa-lg fa-thermometer-quarter"></i>'
+ return 0
@property
def status_classes(self):
diff --git a/helpdesk/templates/helpdesk/_ticket_for_object_link.html b/helpdesk/templates/helpdesk/_ticket_for_object_link.html
index 1e995ce9a942ef845290fdd2cf2982eb044c7e24..6261e7b2a586de1d44c8f4925d335962ee48aea3 100644
--- a/helpdesk/templates/helpdesk/_ticket_for_object_link.html
+++ b/helpdesk/templates/helpdesk/_ticket_for_object_link.html
@@ -1 +1 @@
-<a href="{% url 'helpdesk:ticket_create' concerning_type_id=type_id concerning_object_id=id %}" target="_blank" class="float-right p-0"><i class="fa fa-sticky-note" style="font-size: 90%;" data-toggle="tooltip" data-html="true" title="Notice something wrong?<br/>Open a support ticket on this {{ model }}"></i></a>
+<a href="{% url 'helpdesk:ticket_create' concerning_type_id=type_id concerning_object_id=id %}" target="_blank" class="float-right p-0"><span style="font-size: 90%;" data-toggle="tooltip" data-html="true" title="Notice something wrong?<br/>Open a support ticket on this {{ model }}">{% include 'bi/sticky-fill.html' %}</span></a>
diff --git a/helpdesk/templates/helpdesk/queue_detail.html b/helpdesk/templates/helpdesk/queue_detail.html
index 0e9e6ed75a374fa0f998ed67e21bd8392d5d4892..2304c7100a12ef8f5c2be75191c3a4e835f8bf3a 100644
--- a/helpdesk/templates/helpdesk/queue_detail.html
+++ b/helpdesk/templates/helpdesk/queue_detail.html
@@ -32,13 +32,13 @@
<h4>Admin actions:</h4>
{% if perms.helpdesk.delete_queue or "delete_queue" in user_perms %}
- <a class="btn btn-sm btn-danger" role="button" href="{% url 'helpdesk:queue_delete' slug=queue.slug %}"><i class="fa fa-trash"></i> Delete this Queue</a>
+ <a class="btn btn-sm btn-danger" role="button" href="{% url 'helpdesk:queue_delete' slug=queue.slug %}">{% include 'bi/trash-fill.html' %} Delete this Queue</a>
{% endif %}
{% if perms.helpdesk.update_queue or "update_queue" in user_perms %}
- <a class="btn btn-sm btn-warning" role="button" href="{% url 'helpdesk:queue_update' slug=queue.slug %}"><i class="fa fa-edit"></i> Update this Queue</a>
+ <a class="btn btn-sm btn-warning" role="button" href="{% url 'helpdesk:queue_update' slug=queue.slug %}">{% include 'bi/pencil-square.html' %} Update this Queue</a>
{% endif %}
{% if perms.helpdesk.add_queue or request.user in queue.managing_group.users.all %}
- <a class="btn btn-sm btn-primary" href="{% url 'helpdesk:queue_create' parent_slug=queue.slug %}"><i class="fa fa-plus"></i> Add a sub-Queue to this Queue</a>
+ <a class="btn btn-sm btn-primary" href="{% url 'helpdesk:queue_create' parent_slug=queue.slug %}">{% include 'bi/plus-square-fill.html' %} Add a sub-Queue to this Queue</a>
{% endif %}
<hr/>
diff --git a/helpdesk/templates/helpdesk/ticket_card.html b/helpdesk/templates/helpdesk/ticket_card.html
index d52043986fe734ec9fec897e82bd7dd1e2d2f588..3b6b9fd20d7b31ba5d6e92c9e786379f57869ff9 100644
--- a/helpdesk/templates/helpdesk/ticket_card.html
+++ b/helpdesk/templates/helpdesk/ticket_card.html
@@ -35,7 +35,11 @@
</tr>
<tr>
<th>Priority</th>
- <td>{{ ticket.priority_icons|safe }} - {{ ticket.get_priority_display }}</td>
+ <td>
+ {% for a in "x"|ljust:ticket.priority_level %}
+ {% include 'bi/exclamation-square-fill.html' %}
+ {% endfor %}
+ - {{ ticket.get_priority_display }}</td>
</tr>
<tr>
<th>Status</th>
@@ -73,18 +77,18 @@
</ul>
{% if ticket.is_open %}
{% if request.user|is_in_group:ticket.queue.managing_group.name %}
- <a class="btn btn-sm btn-danger" role="button" href="{% url 'helpdesk:ticket_delete' pk=ticket.id %}"><i class="fa fa-trash"></i> Delete</a>
- <a class="btn btn-sm btn-warning" role="button" href="{% url 'helpdesk:ticket_update' pk=ticket.id %}"><i class="fa fa-edit"></i> Update</a>
+ <a class="btn btn-sm btn-danger" role="button" href="{% url 'helpdesk:ticket_delete' pk=ticket.id %}">{% include 'bi/trash-fill.html' %} Delete</a>
+ <a class="btn btn-sm btn-warning" role="button" href="{% url 'helpdesk:ticket_update' pk=ticket.id %}">{% include 'bi/pencil-square.html' %} Update</a>
{% if not ticket.assigned_to %}
- <a class="btn btn-sm btn-info" role="button" href="{% url 'helpdesk:ticket_assign' pk=ticket.id %}"><i class="fa fa-arrow-circle-right"></i> Assign this ticket</a>
+ <a class="btn btn-sm btn-info" role="button" href="{% url 'helpdesk:ticket_assign' pk=ticket.id %}">{% include 'bi/arrow-right-circle-fill.html' %} Assign this ticket</a>
{% else %}
- <a class="btn btn-sm btn-info" role="button" href="{% url 'helpdesk:ticket_assign' pk=ticket.id %}"><i class="fa fa-arrow-circle-right"></i> Reassign this ticket <span class="text-small text-muted">[currently: {{ ticket.assigned_to.username }}]</span></a>
+ <a class="btn btn-sm btn-info" role="button" href="{% url 'helpdesk:ticket_assign' pk=ticket.id %}">{% include 'bi/arrow-right-circle-fill.html' %} Reassign this ticket <span class="text-small text-muted">[currently: {{ ticket.assigned_to.username }}]</span></a>
{% endif %}
<br/><br/>
{% endif %}
- <a class="btn btn-sm btn-success" role="button" href="{% url 'helpdesk:ticket_followup' pk=ticket.id %}"><i class="fa fa-reply"></i> Reply/Followup</a>
- <a class="btn btn-sm btn-primary" role="button" href="{% url 'helpdesk:ticket_mark_resolved' pk=ticket.id %}"><i class="fa fa-check-square"></i> Mark as resolved</a>
- <a class="btn btn-sm btn-secondary" role="button" href="{% url 'helpdesk:ticket_mark_closed' pk=ticket.id %}"><i class="fa fa-times"></i> Close this Ticket</a>
+ <a class="btn btn-sm btn-success" role="button" href="{% url 'helpdesk:ticket_followup' pk=ticket.id %}">{% include 'bi/reply-fill.html' %} Reply/Followup</a>
+ <a class="btn btn-sm btn-primary" role="button" href="{% url 'helpdesk:ticket_mark_resolved' pk=ticket.id %}">{% include 'bi/check-square.html' %} Mark as resolved</a>
+ <a class="btn btn-sm btn-secondary" role="button" href="{% url 'helpdesk:ticket_mark_closed' pk=ticket.id %}">{% include 'bi/x-square-fill.html' %} Close this Ticket</a>
{% endif %}
</td>
</tr>
diff --git a/helpdesk/templates/helpdesk/tickets_table.html b/helpdesk/templates/helpdesk/tickets_table.html
index f2debace1897540adc8a02d76d9403a1584b66b5..998b03e6c1d08aa97af9caa74c17372b5438ab5c 100644
--- a/helpdesk/templates/helpdesk/tickets_table.html
+++ b/helpdesk/templates/helpdesk/tickets_table.html
@@ -23,7 +23,9 @@
</td>
<td>{{ ticket.defined_on|date:"Y-m-d" }}</td>
<td data-toggle="tooltip" title="{{ ticket.priority }}">
- {{ ticket.priority_icons|safe }}
+ {% for a in "x"|ljust:ticket.priority_level %}
+ {% include 'bi/exclamation-square-fill.html' %}
+ {% endfor %}
</td>
{% with classes=ticket.status_classes %}
<td>
diff --git a/invitations/templates/partials/invitations/registrationinvitation_table.html b/invitations/templates/partials/invitations/registrationinvitation_table.html
index 86d34bdb51f96ac62e9c3d1e10d74b1b60a13364..7e85f2ad88c30b9ad88276e434e90543ed9e2862 100644
--- a/invitations/templates/partials/invitations/registrationinvitation_table.html
+++ b/invitations/templates/partials/invitations/registrationinvitation_table.html
@@ -17,7 +17,7 @@
{% for invitation in invitations %}
<tr>
<td>
- <small><i class="fa fa-paperclip" data-toggle="tooltip" data-html="true" data-title="<ul style='margin-bottom:0; padding: 0 10px 0 20px; min-height: 20px;'>{% for cit in invitation.citation_notifications.all %}<li>{% if cit.submission %}{{ cit.submission.preprint.identifier_w_vn_nr }}{% endif %}{% if cit.publication %}{{ cit.publication.doi_label }}{% endif %}</li>{% endfor %}</ul>"></i></small>
+ <span data-toggle="tooltip" data-html="true" data-title="<ul style='margin-bottom:0; padding: 0 10px 0 20px; min-height: 20px;'>{% for cit in invitation.citation_notifications.all %}<li>{% if cit.submission %}{{ cit.submission.preprint.identifier_w_vn_nr }}{% endif %}{% if cit.publication %}{{ cit.publication.doi_label }}{% endif %}</li>{% endfor %}</ul>">{% include 'bi/paperclip.html' %}</span>
{{ invitation.last_name }}, {{ invitation.first_name }}
</td>
<td>{{ invitation.email }}</td>
diff --git a/journals/templates/journals/_publication_citations.html b/journals/templates/journals/_publication_citations.html
index 1e1bb7443e830602db0f47d3c0a1758fa80d55b9..68e05ac720d3e0f0467fe723091959ba6a8e7cee 100644
--- a/journals/templates/journals/_publication_citations.html
+++ b/journals/templates/journals/_publication_citations.html
@@ -2,7 +2,7 @@
{% for cite in publication.citedby %}
<li>
{{cite.first_author_given_name}} {{cite.first_author_surname}}{% if cite.multiauthors %} <em>et al.</em>{% endif %}, <em>{{cite.article_title}}</em><br>
- {{cite.journal_abbreviation}}{% if cite.volume %} <strong>{{cite.volume}}</strong>{% endif %}, {{cite.first_page|default_if_none:''}} {{cite.item_number|default_if_none:''}} ({{cite.year}}) <a href="https://doi.org/{{cite.doi}}" target="_blank">[Crossref]</a>
+ {{cite.journal_abbreviation}}{% if cite.volume %} <strong>{{cite.volume}}</strong>{% endif %}, {{cite.first_page|default_if_none:''}} {{cite.item_number|default_if_none:''}} ({{cite.year}}) <a href="https://doi.org/{{cite.doi}}" target="_blank" rel="noopener">[Crossref]</a>
</li>
{% endfor %}
</ul>
diff --git a/journals/templates/journals/about.html b/journals/templates/journals/about.html
index c58c2e5ab9743bcd4be7278de146716d70b30219..eb3f82fb2e31d941fce03beb59bde868b6b78740 100644
--- a/journals/templates/journals/about.html
+++ b/journals/templates/journals/about.html
@@ -3,6 +3,7 @@
{% load automarkup %}
{% load scipost_extras %}
+{% block meta_description %}{{ block.super }} About Journal {{ journal.name }}{% endblock meta_description %}
{% block pagetitle %}{{block.super}}: About {{ journal.name }}{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/journals/templates/journals/authoring.html b/journals/templates/journals/authoring.html
index 1e20d1d8836c13d1867dd5d8290a1be18871fd28..14b695996b109d2c58ff0ef14885b2d576d92e1e 100644
--- a/journals/templates/journals/authoring.html
+++ b/journals/templates/journals/authoring.html
@@ -2,7 +2,8 @@
{% load scipost_extras %}
-{% block pagetitle %}{{block.super}}: Authoring guidelines{% endblock pagetitle %}
+{% block meta_description %}{{ block.super }} Authoring Guidelines{% endblock meta_description %}
+{% block pagetitle %}{{ block.super }}: Authoring guidelines{% endblock pagetitle %}
{% block link_class_physics_info %}active{% endblock %}
diff --git a/journals/templates/journals/base.html b/journals/templates/journals/base.html
index 6e42122c7c0767a01347cd5ac20d65f4c5070f91..4aa6045677136c27e31cae96fca8f706c9c97b16 100644
--- a/journals/templates/journals/base.html
+++ b/journals/templates/journals/base.html
@@ -8,6 +8,7 @@
{% endblock headsup %}
{% endif %}
+{% block meta_description %}{{ block.super }} Journals{% endblock meta_description %}
{% block pagetitle %}: {{ journal }}{% endblock pagetitle %}
{% block body_class %}{{ block.super }} journals{% endblock %}
@@ -55,7 +56,7 @@
</p>
{% endif %}
<p>
- All content in {{ journal }} is deposited and permanently preserved in the CLOCKSS archive <a href="https://www.clockss.org/clockss/Home" target="_blank"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" alt="CLOCKSS logo" width="40"></a>
+ All content in {{ journal }} is deposited and permanently preserved in the CLOCKSS archive <a href="https://www.clockss.org/clockss/Home" target="_blank" rel="noopener"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" alt="CLOCKSS logo" width="40"></a>
</p>
</div>
</div>
diff --git a/journals/templates/journals/crossmark_policy.html b/journals/templates/journals/crossmark_policy.html
index c7aabe3a1d6538a65022630675ba90c091e3906e..daf6e7bd2bb91f9fa62dee53a2c0430dc0b27ffa 100644
--- a/journals/templates/journals/crossmark_policy.html
+++ b/journals/templates/journals/crossmark_policy.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Crossmark Policy{% endblock meta_description %}
{% block pagetitle %}: SciPost Journals: Crossmark Policy{% endblock pagetitle %}
{% block breadcrumb %}
@@ -18,7 +19,7 @@
<div class="row">
<div class="col-12">
<h2 id="Crossmark Policy">Crossmark Policy</h2>
- <p><a target="_blank" href="//www.crossref.org/services/crossmark/">Crossmark</a> is a multi-publisher initiative from Crossref to provide a standard way for readers to locate the current version of a piece of content.</p>
+ <p><a target="_blank" rel="noopener" href="//www.crossref.org/services/crossmark/">Crossmark</a> is a multi-publisher initiative from Crossref to provide a standard way for readers to locate the current version of a piece of content.</p>
<p>By applying the Crossmark logo SciPost is committing to maintaining the content it publishes and to alerting readers to changes if and when they occur. Clicking on the Crossmark logo will tell you the current status of a document and may also give you additional publication record information about the document.</p>
<p>Please refer to our <a href="{% url 'journals:journals_terms_and_conditions' %}">Journals Terms and Conditions</a> for details about our Corrections and Retractions policy.</p>
</div>
diff --git a/journals/templates/journals/issue_list.html b/journals/templates/journals/issue_list.html
index 69e388ea90e9a6569e4f22ab1f21d7fff3af2ae7..dfc665dcf4469545b123c50abff8a73cd6d4338e 100644
--- a/journals/templates/journals/issue_list.html
+++ b/journals/templates/journals/issue_list.html
@@ -1,5 +1,6 @@
{% extends 'scipost/_personal_page_base.html' %}
+{% block meta_description %}{{ block.super }} Issues{% endblock meta_description %}
{% block pagetitle %}{{block.super}}: Issues Admin{% endblock pagetitle %}
{% block breadcrumb_items %}
@@ -38,9 +39,9 @@
<td>
{% if journal.get_latest_issue %}
{% if journal.get_latest_issue.is_current %}
- <i class="fa fa-check text-success"></i> Yes
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> Yes
{% else %}
- <i class="fa fa-exclamation-triangle text-warning"></i> No
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> No
{% endif %}
{% endif %}
</td>
@@ -71,9 +72,9 @@
<td>{{ issue.publications.count }}</td>
<td>
{% if issue.is_current %}
- <i class="fa fa-check text-success"></i> Yes
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> Yes
{% else %}
- <i class="fa fa-exclamation-triangle text-warning"></i> No
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> No
{% endif %}
</td>
<td><a href="{% url 'journals:update_issue' issue.id %}">Edit</a></td>
diff --git a/journals/templates/journals/journal_issue_detail.html b/journals/templates/journals/journal_issue_detail.html
index fdc1a239d773adac97896580e817725f553a8f24..950c4505edeeb1ec74dea59992ea0906d307f146 100644
--- a/journals/templates/journals/journal_issue_detail.html
+++ b/journals/templates/journals/journal_issue_detail.html
@@ -1,11 +1,12 @@
{% extends 'journals/base.html' %}
-{% block pagetitle %}{{block.super}}: issue detail{% endblock pagetitle %}
+{% block meta_description %}{{ block.super }} Issue Detail{% endblock meta_description %}
+{% block pagetitle %}{{ block.super }}: issue detail{% endblock pagetitle %}
{% block breadcrumb_items %}
- {{block.super}}
- <a href="{{journal.get_absolute_url}}" class="breadcrumb-item">{{journal}}</a>
- <span class="breadcrumb-item active">{{issue.short_str}}</span>
+ {{ block.super }}
+ <a href="{{ journal.get_absolute_url }}" class="breadcrumb-item">{{ journal }}</a>
+ <span class="breadcrumb-item active">{{ issue.short_str }}</span>
{% endblock %}
{% block link_class_physics_issues %}active{% endblock %}
@@ -16,10 +17,10 @@
<div class="col-12">
<h2 class="text-blue m-0 p-0 py-2">{{ issue }}</h2>
{% if prev_issue %}
- <h4 class="d-inline-block"><a href="{{prev_issue.get_absolute_url}}"><i class="fa fa-long-arrow-left"></i> Previous issue | {{prev_issue.short_str}}</a></h4>
+ <h4 class="d-inline-block"><a href="{{ prev_issue.get_absolute_url }}">{% include 'bi/arrow-left.html' %} Previous issue | {{ prev_issue.short_str }}</a></h4>
{% endif %}
{% if next_issue %}
- <h4 class="float-right d-inline-block"><a href="{{next_issue.get_absolute_url}}">{{next_issue.short_str}} | Next issue <i class="fa fa-long-arrow-right"></i></a></h4>
+ <h4 class="float-right d-inline-block"><a href="{{ next_issue.get_absolute_url }}">{{ next_issue.short_str }} | Next issue {% include 'bi/arrow-right.html' %}</a></h4>
{% endif %}
</div>
</div>
diff --git a/journals/templates/journals/journal_issues.html b/journals/templates/journals/journal_issues.html
index a15ad5825f6e8ac288cece994b2bba33105c6b12..738ba4116a088643e9d6c23fb7c5461f179ef3f0 100644
--- a/journals/templates/journals/journal_issues.html
+++ b/journals/templates/journals/journal_issues.html
@@ -1,18 +1,19 @@
{% extends 'journals/base.html' %}
-{% block pagetitle %}{{block.super}}: issues{% endblock pagetitle %}
+{% block meta_description %}{{ block.super }} Issues{% endblock meta_description %}
+{% block pagetitle %}{{ block.super }}: issues{% endblock pagetitle %}
{% block link_class_physics_issues %}active{% endblock %}
{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item active">{{journal}}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item active">{{ journal }}</span>
{% endblock %}
{% block content %}
{% with header_text='Issues' %}
- {{block.super}}
+ {{ block.super }}
{% endwith %}
<div class="row">
@@ -20,7 +21,7 @@
<ul>
{% for issue in journal.get_issues %}
<li>
- <a href="{{issue.get_absolute_url}}">{{issue}}</a>
+ <a href="{{ issue.get_absolute_url }}">{{ issue }}</a>
{% if issue.proceedings %}
{% include 'partials/proceedings/proceedings_li.html' with proceedings=issue.proceedings %}
{% endif %}
diff --git a/journals/templates/journals/journal_list.html b/journals/templates/journals/journal_list.html
index 1dfe55d84f776440ae1a92fccbdef4358861572f..9a002f1013e5ebdb73bbd069d4776a0312528685 100644
--- a/journals/templates/journals/journal_list.html
+++ b/journals/templates/journals/journal_list.html
@@ -9,6 +9,7 @@
<style>{% for journal in object_list %}{% if journal.style %}{{ journal.style }}{% endif %}{% endfor %}</style>
{% endblock headsup %}
+{% block meta_description %}{{ block.super }} {% if acad_field %} in {{ acad_field.name }}{% endif %}{% endblock meta_description %}
{% block pagetitle %}: Journals{% if acad_field %} in {{ acad_field.name }}{% endif %}{% endblock pagetitle %}
{% block breadcrumb %}
diff --git a/journals/templates/journals/journal_recent.html b/journals/templates/journals/journal_recent.html
index 0f86765af2b715e30dbfa25c0b24a328f6241149..d2cca3095ba962240413d641520e21861a37165f 100644
--- a/journals/templates/journals/journal_recent.html
+++ b/journals/templates/journals/journal_recent.html
@@ -1,5 +1,6 @@
{% extends 'journals/base.html' %}
+{% block meta_description %}{{ block.super }} Recent{% endblock meta_description %}
{% block pagetitle %}{{block.super}}: recent{% endblock pagetitle %}
{% block link_class_physics_recent %}active{% endblock %}
diff --git a/journals/templates/journals/journals_terms_and_conditions.html b/journals/templates/journals/journals_terms_and_conditions.html
index c4889de601bafcc3526f9154b6cdd03feea52d5c..7415d20f949fe5bab2078c9642ca7c69b6b2a12f 100644
--- a/journals/templates/journals/journals_terms_and_conditions.html
+++ b/journals/templates/journals/journals_terms_and_conditions.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Terms and Conditions{% endblock meta_description %}
{% block pagetitle %}: SciPost Journals: terms and conditions{% endblock pagetitle %}
diff --git a/journals/templates/journals/publication_authors_form.html b/journals/templates/journals/publication_authors_form.html
index 1766585f99e9dba3ec820f892749724a2478b3f3..62ed2172810bd95b9780e8715ee7fe1d304828b4 100644
--- a/journals/templates/journals/publication_authors_form.html
+++ b/journals/templates/journals/publication_authors_form.html
@@ -9,7 +9,7 @@
<div class="container">
<nav class="breadcrumb hidden-sm-down">
<a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <a href="{{ publication.get_absolute_url }}" class="breadcrumb-item">{{ publication.citation }}</a>
<span class="breadcrumb-item active">Author ordering</span>
</nav>
@@ -31,10 +31,10 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ formset.management_form }}
- <ul class="fa-ul sortable-list d-inline-block">
+ <ul class="sortable-list d-inline-block">
{% for form in formset %}
<li>
- <i class="fa fa-sort handle"></i>
+ <span class="handle">{% include 'bi/sort-up.html' %}</span>
{{ form.instance.first_name }} {{ form.instance.last_name }}
<div class="d-none">{{ form }}</div>
</li>
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 19c28c88e369576d64ad7eb98439507f264e0d4c..f0127743cadfa853b4533bd95aaa66f7be76a3a8 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -6,6 +6,7 @@
{% load scipost_extras %}
{% load user_groups %}
+{% block meta_description %}{{ block.super }} Publication Detail {{ publication.citation }} {{ publication.title }}{% endblock meta_description %}
{% block pagetitle %}: {{ publication.citation }} - {{ publication.title }}{% endblock pagetitle %}
{% block body_class %}{{ block.super }} publication{% endblock %}
@@ -92,7 +93,7 @@
<div>
{% for topic in publication.topics.all %}
- <span class="label label-secondary"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'journals:publication_remove_topic' doi_label=publication.doi_label slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</span>
+ <span class="label label-secondary"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'journals:publication_remove_topic' doi_label=publication.doi_label slug=topic.slug %}"><span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span></a>{% endif %}</span>
{% empty %}
<div>No Topic has yet been associated to this Publication</div>
{% endfor %}
diff --git a/journals/templates/journals/publication_list.html b/journals/templates/journals/publication_list.html
index e6c4b03e559e9fdafe51b192608f47c8ee3aa260..3d04a6e1c20cd97ad409ac0e7fb0707bc6923bb8 100644
--- a/journals/templates/journals/publication_list.html
+++ b/journals/templates/journals/publication_list.html
@@ -6,6 +6,7 @@
{% block body_class %}{{block.super}} sidebar-left{% endblock %}
+{% block meta_description %}{{ block.super }} Publication List{% endblock meta_description %}
{% block pagetitle %}: Publications{% endblock pagetitle %}
{% block page_header %}<h1 class="highlight">Recent SciPost Publications</h1>{% endblock page_header %}
diff --git a/journals/templates/journals/refereeing.html b/journals/templates/journals/refereeing.html
index 2159620fd48c30e813857fef42796f64296d5c92..6a72a64e947948731a55a74ec3a04016b9bf8329 100644
--- a/journals/templates/journals/refereeing.html
+++ b/journals/templates/journals/refereeing.html
@@ -2,7 +2,8 @@
{% load scipost_extras %}
-{% block pagetitle %}{{block.super}}: Refereeing guidelines{% endblock pagetitle %}
+{% block meta_description %}{{ block.super }} Refereeing Guidelines{% endblock meta_description %}
+{% block pagetitle %}{{ block.super }}: Refereeing guidelines{% endblock pagetitle %}
{% block link_class_physics_info %}active{% endblock %}
diff --git a/journals/templates/journals/volume_list.html b/journals/templates/journals/volume_list.html
index cd613b43a5fc3395770e3978a3f378ba2eea4e71..dd32d57f20949647fd7e7fc12982824c2a552539 100644
--- a/journals/templates/journals/volume_list.html
+++ b/journals/templates/journals/volume_list.html
@@ -1,5 +1,6 @@
{% extends 'scipost/_personal_page_base.html' %}
+{% block meta_description %}{{ block.super }} Volumes List{% endblock meta_description %}
{% block pagetitle %}{{block.super}}: Volumes Admin{% endblock pagetitle %}
{% block breadcrumb_items %}
@@ -38,9 +39,9 @@
<td>
{% if journal.get_latest_volume %}
{% if journal.get_latest_volume.is_current %}
- <i class="fa fa-check text-success"></i> Yes
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> Yes
{% else %}
- <i class="fa fa-exclamation-triangle text-warning"></i> No
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> No
{% endif %}
{% endif %}
</td>
@@ -69,9 +70,9 @@
<td>{{ volume.issues.count }}</td>
<td>
{% if volume.is_current %}
- <i class="fa fa-check text-success"></i> Yes
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> Yes
{% else %}
- <i class="fa fa-exclamation-triangle text-warning"></i> No
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> No
{% endif %}
</td>
<td><a href="{% url 'journals:update_volume' volume.id %}">Edit</a></td>
diff --git a/journals/templates/partials/journals/publication_li_content.html b/journals/templates/partials/journals/publication_li_content.html
index 505dde17df870f7bbbe04661f19709391ec35821..3bc7ae2ce545e31f102ecf159281ca59c872efe3 100644
--- a/journals/templates/partials/journals/publication_li_content.html
+++ b/journals/templates/partials/journals/publication_li_content.html
@@ -1,11 +1,11 @@
<div class="li publication">
- <h5 class="subject">
+ <h3 class="specialties">
<a href="{% url 'journals:publications' %}?field={{ publication.acad_field.slug }}" class="muted-link">{{ publication.acad_field }}</a>:
{% for specialty in publication.specialties.all %}
- <a href="{% url 'journals:publications' %}?specialty={{ specialty.slug }}" class="muted-link">{{ specialty }}</a>
+ <a href="{% url 'journals:publications' %}?specialty={{ specialty.slug }}" class="muted-link p-1">{{ specialty }}</a>
{% if not forloop.last %}<strong> • </strong>{% endif %}
{% endfor %}
- </h5>
+ </h3>
<h3 class="title"><a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a></h3>
<p class="authors">{{ publication.author_list }}</p>
diff --git a/journals/templates/partials/journals/publication_preparation.html b/journals/templates/partials/journals/publication_preparation.html
index c43fdc1a83c05870fd3eb8feb262f2f344c6a782..4b7c6b05967a466eb1dd0deca4c6fb4bb69d885e 100644
--- a/journals/templates/partials/journals/publication_preparation.html
+++ b/journals/templates/partials/journals/publication_preparation.html
@@ -1,17 +1,17 @@
{% load publication_administration %}
<h3>Publication preparation</h3>
-<ul class="fa-ul">
- <li><i class="fa-li fa fa-check-square text-success"></i><a href="{% url 'journals:update_publication' publication.accepted_submission.preprint.identifier_w_vn_nr %}">Create/update Publication object</a></li>
- <li><i class="fa-li fa {% if publication|has_all_author_relations %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:add_author' publication.doi_label %}">Create all author relations</a></li>
- <li><i class="fa-li fa {% if publication|authors_in_right_order %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:update_author_ordering' doi_label=publication.doi_label %}">Update Author ordering</a></li>
- <li><i class="fa-li fa {% if publication|author_affiliations_complete %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:author_affiliations' doi_label=publication.doi_label %}">Manage Author Affiliations</a></li>
- <li><i class="fa-li fa {% if publication.has_abstract_jats %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:abstract_jats' publication.doi_label %}">Create/update abstract (JATS version)</a></li>
- <li><i class="fa-li fa {% if publication.has_citation_list %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:create_citation_list_metadata' publication.doi_label %}">Create/update citation metadata</a></li>
- <li><i class="fa-li fa {% if publication.has_funding_statement %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:create_funding_info_metadata' publication.doi_label %}">Create/update funding info metadata</a></li>
- <li><i class="fa-li fa {% if publication.grants.exists %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:update_grants' publication.doi_label %}">Create/update grants</a></li>
- <li><i class="fa-li fa {% if publication.has_xml_metadata %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:create_metadata_xml' publication.doi_label %}">Create/update Crossref metadata</a> <em>(please do after citation and funding info are added)</em></li>
- <li><i class="fa-li fa {% if publication.references.exists %}fa-check-square text-success{% else %}fa-square{% endif %}"></i><a href="{% url 'journals:update_references' doi_label=publication.doi_label %}">Create/update references</a></li>
+<ul>
+ <li><span class="text-success">{% include 'bi/check-square-fill.html' %}</span><a href="{% url 'journals:update_publication' publication.accepted_submission.preprint.identifier_w_vn_nr %}">Create/update Publication object</a></li>
+ <li>{% if publication|has_all_author_relations %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:add_author' publication.doi_label %}">Create all author relations</a></li>
+ <li>{% if publication|authors_in_right_order %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:update_author_ordering' doi_label=publication.doi_label %}">Update Author ordering</a></li>
+ <li>{% if publication|author_affiliations_complete %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:author_affiliations' doi_label=publication.doi_label %}">Manage Author Affiliations</a></li>
+ <li>{% if publication.has_abstract_jats %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:abstract_jats' publication.doi_label %}">Create/update abstract (JATS version)</a></li>
+ <li>{% if publication.has_citation_list %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:create_citation_list_metadata' publication.doi_label %}">Create/update citation metadata</a></li>
+ <li>{% if publication.has_funding_statement %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:create_funding_info_metadata' publication.doi_label %}">Create/update funding info metadata</a></li>
+ <li>{% if publication.grants.exists %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:update_grants' publication.doi_label %}">Create/update grants</a></li>
+ <li>{% if publication.has_xml_metadata %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:create_metadata_xml' publication.doi_label %}">Create/update Crossref metadata</a> <em>(please do after citation and funding info are added)</em></li>
+ <li>{% if publication.references.exists %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/square.html' %}{% endif %}<a href="{% url 'journals:update_references' doi_label=publication.doi_label %}">Create/update references</a></li>
</ul>
<h3>Tools</h3>
diff --git a/journals/templates/partials/journals/references.html b/journals/templates/partials/journals/references.html
index dd8d4652a76b7e293e6a827bdd9bfb158bc210dc..a97d2457ab7ae06f2942ddb31ec4a78fa816536a 100644
--- a/journals/templates/partials/journals/references.html
+++ b/journals/templates/partials/journals/references.html
@@ -15,9 +15,9 @@
{% endif %}
<div class="reference">
{% if reference.link and reference.identifier %}
- <a href="{{ reference.link }}" target="_blank">{{ reference.identifier }}</a>
+ <a href="{{ reference.link }}" target="_blank" rel="noopener">{{ reference.identifier }}</a>
{% elif reference.link %}
- <a href="{{ reference.link }}" target="_blank">link</a>
+ <a href="{{ reference.link }}" target="_blank" rel="noopener">link</a>
{% elif reference.identifier %}
<span>{{ reference.identifier }}</span>
{% endif %}
diff --git a/journals/urls/general.py b/journals/urls/general.py
index 947c8c97f0ea8a800938238a147a24d50137c6ae..c9d0269d07f52c9b89f1478a4f869eb8409bcb58 100644
--- a/journals/urls/general.py
+++ b/journals/urls/general.py
@@ -3,13 +3,16 @@ __license__ = "AGPL v3"
from django.conf.urls import url
-from django.urls import path, reverse_lazy
+from django.urls import path, re_path, register_converter, reverse_lazy
from django.views.generic import TemplateView, RedirectView
from submissions.constants import SUBMISSIONS_COMPLETE_REGEX
from journals.regexes import PUBLICATION_DOI_LABEL_REGEX
from journals import views as journals_views
+from ontology.converters import AcademicFieldSlugConverter
+
+register_converter(AcademicFieldSlugConverter, 'acad_field')
app_name = 'urls.general'
@@ -27,6 +30,11 @@ urlpatterns = [
journals_views.JournalListView.as_view(),
name='journals'
),
+ path( # patch to preserve old links
+ '<acad_field:acad_field>/',
+ journals_views.JournalListView.as_view(),
+ name='journals_in_acad_spec'
+ ),
url(r'^publications$', journals_views.PublicationListView.as_view(), name='publications'),
url(r'scipost_physics', RedirectView.as_view(url=reverse_lazy('scipost:landing_page',
args=['SciPostPhys']))),
diff --git a/journals/views.py b/journals/views.py
index 63181e6c99cc9c8213161a9361da73db1755399e..65ee4cd36ebb091533041cf443a78fda958cc8cb 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -146,15 +146,23 @@ class JournalListView(ListView):
def get_queryset(self):
qs = super().get_queryset()
+ # for url /journals/?field=[acad_field_slug]
if self.request.GET.get('field'):
qs = qs.filter(college__acad_field__slug=self.request.GET.get('field'))
+ # for url /journals/[acad_field_slug]
+ if 'acad_field' in self.kwargs:
+ qs = qs.filter(college__acad_field=self.kwargs['acad_field'])
return qs
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
+ # for url /journals/?field=[acad_field_slug]
if self.request.GET.get('field'):
context['acad_field'] = get_object_or_404(
AcademicField, slug=self.request.GET.get('field'))
+ # for url /journals/[acad_field_slug]
+ if 'acad_field' in self.kwargs:
+ context['acad_field'] = self.kwargs['acad_field']
return context
diff --git a/mailing_lists/templates/mailing_lists/mailchimplist_form.html b/mailing_lists/templates/mailing_lists/mailchimplist_form.html
index 4d847516a6fee4465f1dc71984e61765ff0f0e87..a6303ca6ec34b321ce5022064b6d6def023dca86 100644
--- a/mailing_lists/templates/mailing_lists/mailchimplist_form.html
+++ b/mailing_lists/templates/mailing_lists/mailchimplist_form.html
@@ -38,7 +38,7 @@
<h2>Synchronizing done</h2>
<p>
Response bulk ID: <code>{{request.GET.bulkid}}</code><br>
- Check <a href="//us1.api.mailchimp.com/playground" target="_blank">MailChimp's Playground</a> to see the response status.
+ Check <a href="//us1.api.mailchimp.com/playground" target="_blank" rel="noopener">MailChimp's Playground</a> to see the response status.
</div>
{% endif %}
</div>
diff --git a/markup/templates/markup/base.html b/markup/templates/markup/base.html
index 1e4b463f7f188bdf37226fd71f33f69bd3ffac30..c63cd20b27819d01b8c6e96723a6af9e29e75a4f 100644
--- a/markup/templates/markup/base.html
+++ b/markup/templates/markup/base.html
@@ -1,5 +1,7 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Markup{% endblock meta_description %}
+
{% block breadcrumb %}
<div class="container-outside header">
<div class="container">
diff --git a/markup/templates/markup/help.html b/markup/templates/markup/help.html
index f954733cf1c694ad4e39712ec164ff498ad49f47..e8865210956073e8f034f71d8694c2dfe8b16d19 100644
--- a/markup/templates/markup/help.html
+++ b/markup/templates/markup/help.html
@@ -1,5 +1,6 @@
{% extends 'markup/base.html' %}
+{% block meta_description %}{{ block.super }} Help{% endblock meta_description %}
{% block pagetitle %}: Markup help{% endblock pagetitle %}
{% block breadcrumb_items %}
@@ -123,7 +124,7 @@
<br>
<h2 class="highlight" id="Plain">Plain text 
- <em><small><i class="fa fa-arrow-right"></i> See our <a href="{% url 'markup:plaintext_help' %}">plain text-specific</a> help page</small></em>
+ <em><small>{% include 'bi/arrow-right.html' %} See our <a href="{% url 'markup:plaintext_help' %}">plain text-specific</a> help page</small></em>
</h2>
{% for suggestion in PlainTextSuggestions %}
<h4 id="{{ suggestion.id }}">Example: {{ suggestion.title }}</h4>
@@ -142,7 +143,7 @@
<br>
<h2 class="highlight" id="Markdown">Markdown 
- <em><small><i class="fa fa-arrow-right"></i> See our <a href="{% url 'markup:markdown_help' %}">Markdown-specific</a> help page</small></em></h2>
+ <em><small>{% include 'bi/arrow-right.html' %} See our <a href="{% url 'markup:markdown_help' %}">Markdown-specific</a> help page</small></em></h2>
{% for suggestion in MarkdownSuggestions %}
<h4 id="{{ suggestion.id }}">Example: {{ suggestion.title }}</h4>
<div class="row">
@@ -160,7 +161,7 @@
<br>
<h2 class="highlight" id="reStructuredText">reStructuredText 
- <em><small><i class="fa fa-arrow-right"></i> See our <a href="{% url 'markup:restructuredtext_help' %}">reStructuredText-specific</a> help page</small></em></h2>
+ <em><small>{% include 'bi/arrow-right.html' %} See our <a href="{% url 'markup:restructuredtext_help' %}">reStructuredText-specific</a> help page</small></em></h2>
{% for suggestion in ReSTSuggestions %}
<h4 id="{{ suggestion.id }}">Example: {{ suggestion.title }}</h4>
<div class="row">
diff --git a/markup/templates/markup/markdown_help.html b/markup/templates/markup/markdown_help.html
index a5211f716156d850e6678eaae4195f1afa2d0f8c..702234c52cedfd52076a2ebba7ac26f2f60c2d61 100644
--- a/markup/templates/markup/markdown_help.html
+++ b/markup/templates/markup/markdown_help.html
@@ -1,11 +1,12 @@
{% extends 'markup/base.html' %}
+{% block meta_description %}{{ block.super }} Markdown Help{% endblock meta_description %}
{% block pagetitle %}: Markup help{% endblock pagetitle %}
{% block breadcrumb_items %}
{{ block.super }}
<span class="breadcrumb-item"><a href="{% url 'markup:help' %}">Help</a></span>
- <span class="breadcrumb-item">Markdown</span>
+ <span class="breadcrumb-item">Markdown</span>
{% endblock %}
{% load automarkup %}
diff --git a/markup/templates/markup/plaintext_help.html b/markup/templates/markup/plaintext_help.html
index b18ae6f588d84347b98bd6e385dc6af810a9c434..d43f812aa467ecd4366e27b9babbc115c5904edf 100644
--- a/markup/templates/markup/plaintext_help.html
+++ b/markup/templates/markup/plaintext_help.html
@@ -1,5 +1,6 @@
{% extends 'markup/base.html' %}
+{% block meta_description %}{{ block.super }} Plaintext Help{% endblock meta_description %}
{% block pagetitle %}: Markup help{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/markup/templates/markup/restructuredtext_help.html b/markup/templates/markup/restructuredtext_help.html
index e6c4fcb272553bf050593b9a9aa4412f9bf7513d..b48f3977180a5bcd0b526bc6d0c2677e8979f44b 100644
--- a/markup/templates/markup/restructuredtext_help.html
+++ b/markup/templates/markup/restructuredtext_help.html
@@ -1,5 +1,6 @@
{% extends 'markup/base.html' %}
+{% block meta_description %}{{ block.super }} ReStructuredText Help{% endblock meta_description %}
{% block pagetitle %}: Markup help{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/news/templates/news/news_manage.html b/news/templates/news/news_manage.html
index 27320e9761ab1dcc01b92a82bbf35ee01e3f9755..8c268e90352b95c4e90d0eccc458a7c487a92393 100644
--- a/news/templates/news/news_manage.html
+++ b/news/templates/news/news_manage.html
@@ -80,8 +80,8 @@
<tr>
<td>{{ ni.headline }}</td>
<td>{{ ni.date }}</td>
- <td><i class="fa fa-{{ ni.published|yesno:'check text-success,times text-danger' }}"></i> {{ ni.published|yesno:'Yes,No' }}</td>
- <td><i class="fa fa-{{ ni.on_homepage|yesno:'check text-success,times text-danger' }}"></i> {{ ni.on_homepage|yesno:'Yes,No' }}</td>
+ <td>{% if ni.published %}{% include 'bi/check-square-fill.html' %}{% else %}{% include 'bi/x-square-fill.html' %}{% endif %} {{ ni.published|yesno:'Yes,No' }}</td>
+ <td>{% if ni.on_homepage %}{% include 'bi/check-square-fill.html' %}{% else %}{% include 'bi/x-square-fill.html' %}{% endif %} {{ ni.on_homepage|yesno:'Yes,No' }}</td>
<td>
<a href="{% url 'news:newsitem_update' pk=ni.id %}">Update</a> ·
<a href="{% url 'news:newsitem_delete' pk=ni.id %}" class="text-danger">Delete</a>
diff --git a/news/templates/news/newsitem_list.html b/news/templates/news/newsitem_list.html
index cfb456fd118eb5536bd831dacceda329449249c1..82f87d2b409a8a2fd65f4934577ddccb3b819171 100644
--- a/news/templates/news/newsitem_list.html
+++ b/news/templates/news/newsitem_list.html
@@ -1,5 +1,6 @@
{% extends 'news/base.html' %}
+{% block meta_description %}{{ block.super }} News{% endblock meta_description %}
{% block pagetitle %}: News{% endblock pagetitle %}
{% load request_filters %}
diff --git a/news/templates/news/newsletter_detail.html b/news/templates/news/newsletter_detail.html
index b701a312dd615b10e2468a80fa89c83e822cd6e4..39d96effab0304907ab6d46135c8474ba2e9d5e4 100644
--- a/news/templates/news/newsletter_detail.html
+++ b/news/templates/news/newsletter_detail.html
@@ -2,6 +2,7 @@
{% load bootstrap %}
+{% block meta_description %}{{ block.super }} Newsletter{% endblock meta_description %}
{% block pagetitle %}: NewsLetter{% endblock pagetitle %}
{% block content %}
diff --git a/news/templates/news/newsletter_update_ordering.html b/news/templates/news/newsletter_update_ordering.html
index b3b226c77ddc712806fc87b392b73ec99c4b0a56..5ea154b102eeb5db4b58dcc4fe1c1738eb330285 100644
--- a/news/templates/news/newsletter_update_ordering.html
+++ b/news/templates/news/newsletter_update_ordering.html
@@ -29,10 +29,10 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ ni_formset.management_form }}
- <ul class="fa-ul sortable-list d-inline-block">
+ <ul class="sortable-list d-inline-block">
{% for ni_form in ni_formset %}
<li>
- <i class="fa fa-sort"></i>
+ <span class="handle">{% include 'bi/sort-up.html' %}</span>
{{ ni_form.instance.newsitem }}
<div class="d-none">{{ ni_form }}</div>
</li>
diff --git a/ontology/templates/ontology/_topic_card.html b/ontology/templates/ontology/_topic_card.html
index 3402c1f2f34cc305c1ee50beb37126cd6e8e6a1f..74116fa7007ede7d75672a2da8e59beb24bffbc3 100644
--- a/ontology/templates/ontology/_topic_card.html
+++ b/ontology/templates/ontology/_topic_card.html
@@ -16,7 +16,7 @@
<ul class="list list-inline mb-0">
<li class="list-inline-item"><strong>Tags</strong>:</li>
{% for tag in topic.tags.all %}
- <li class="list-inline-item">{{ tag }}{% if perms.scipost.can_manage_ontology %} <a href="{% url 'ontology:topic_remove_tag' slug=topic.slug tag_id=tag.id %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</li>
+ <li class="list-inline-item">{{ tag }}{% if perms.scipost.can_manage_ontology %} <a href="{% url 'ontology:topic_remove_tag' slug=topic.slug tag_id=tag.id %}"><span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span></a>{% endif %}</li>
{% endfor %}
{% if perms.scipost.can_manage_ontology %}
<form class="p-2" action="{% url 'ontology:topic_add_tags' slug=topic.slug %}" method="post">
@@ -39,7 +39,7 @@
<h5>asymmetric:</h5>
<ul>
{% for rel in relations_asym %}
- <li>{% if rel.A != topic %}<a href="{% url 'ontology:topic_details' slug=rel.A.slug %}">{{ rel.A}}</a>{% else %}{{ rel.A }}{% endif %} <em>{{ rel.get_relation_display }}</em> {% if rel.B != topic %}<a href="{% url 'ontology:topic_details' slug=rel.B.slug %}">{{ rel.B }}</a>{% else %}{{ rel.B }}{% endif %} {% if perms.scipost.can_manage_ontology %}<a href="{% url 'ontology:delete_relation_asym' relation_id=rel.id slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</li>
+ <li>{% if rel.A != topic %}<a href="{% url 'ontology:topic_details' slug=rel.A.slug %}">{{ rel.A}}</a>{% else %}{{ rel.A }}{% endif %} <em>{{ rel.get_relation_display }}</em> {% if rel.B != topic %}<a href="{% url 'ontology:topic_details' slug=rel.B.slug %}">{{ rel.B }}</a>{% else %}{{ rel.B }}{% endif %} {% if perms.scipost.can_manage_ontology %}<a href="{% url 'ontology:delete_relation_asym' relation_id=rel.id slug=topic.slug %}"><span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span></a>{% endif %}</li>
{% empty %}
<li>No relations have been defined</li>
{% endfor %}
diff --git a/ontology/templates/ontology/base.html b/ontology/templates/ontology/base.html
index 417a11f108d902a907fdd87ab750feb7b39bfa38..9906caa98ec295333de025b73f79e7f1caf38946 100644
--- a/ontology/templates/ontology/base.html
+++ b/ontology/templates/ontology/base.html
@@ -11,3 +11,5 @@
</div>
</div>
{% endblock %}
+
+{% block meta_description %}{{ block.super }} Ontology{% endblock meta_description %}
diff --git a/ontology/templates/ontology/topic_detail.html b/ontology/templates/ontology/topic_detail.html
index 11240da45ba1fac14effeca4083f4eb4b8b631e4..f8f6b9617bdaf6eb4bd3b056d0995737899e5f03 100644
--- a/ontology/templates/ontology/topic_detail.html
+++ b/ontology/templates/ontology/topic_detail.html
@@ -8,6 +8,7 @@
<span class="breadcrumb-item">{{ topic }}</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Topic detail {{ topic }}{% endblock meta_description %}
{% block pagetitle %}: Topic details{% endblock pagetitle %}
{% block content %}
diff --git a/ontology/templates/ontology/topic_list.html b/ontology/templates/ontology/topic_list.html
index a7454565bb4fe776eb1be82af5c4f732d0f30ed6..eb5b691a9debcc900a699b8f8251f624d4623bbb 100644
--- a/ontology/templates/ontology/topic_list.html
+++ b/ontology/templates/ontology/topic_list.html
@@ -1,5 +1,6 @@
{% extends 'ontology/base.html' %}
+{% block meta_description %}{{ block.super }} Topics list{% endblock meta_description %}
{% block pagetitle %}: Topics{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/organizations/templates/organizations/_organization_card.html b/organizations/templates/organizations/_organization_card.html
index 4f7798d7b2173f49def92858b9e175eab9d63db3..52cc8894f52b88dc653bd5e27081dcfe0c7e62fe 100644
--- a/organizations/templates/organizations/_organization_card.html
+++ b/organizations/templates/organizations/_organization_card.html
@@ -64,7 +64,7 @@
<strong class="text-danger">Without a Funder Registry instance, we cannot record funding acknowledgements to this Organization with Crossref.</strong>
<p>Are you a representative of this Organization? We advise you to:</p>
<ul>
- <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank">Crossref's Funder Registry</a>;</li>
+ <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank" rel="noopener">Crossref's Funder Registry</a>;</li>
<li>After inclusion, <a href="mailto:admin@scipost.org?subject=Inclusion of {{ organization|urlencode }} {% if organization.acronym %}({{ organization.acronym|urlencode }}){% endif %} in the Funder Registry">contact our administration</a> with this information so that we can update our records.</li>
</ul>
</li>
@@ -75,7 +75,7 @@
<div class="tab-pane show active pt-4" id="publications-{{ org.id }}" role="tabpanel" aria-labelledby="publications-{{ org.id }}-tab">
<h3>Publications associated to this Organization
- <span class="text-muted small">(with PubFractions <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization"></i>)</span>:</h3>
+ <span class="text-muted small">(with PubFractions <span data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization">{% include 'bi/info-circle-fill.html' %}</span>)</span>:</h3>
{% for pubyear in pubyears %}
<h4>{{ pubyear }} <span class="text-muted small">(PubFractions {{ org|pubfractions_in_year:pubyear }})</span></h4>
<ul>
@@ -341,7 +341,7 @@
<td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
<td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <td>{% if contactrole.contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if contactrole.contact.user.is_active %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
<td>
<ul class="list-unstyled">
{% if perms.scipost.can_manage_organizations %}
diff --git a/organizations/templates/organizations/_organization_details_contents.html b/organizations/templates/organizations/_organization_details_contents.html
index cb5205c9df6251772fa7652606b83eaeacade304..f4092a249ed73b7876bdb8b6f28b11a1d6a9bdd3 100644
--- a/organizations/templates/organizations/_organization_details_contents.html
+++ b/organizations/templates/organizations/_organization_details_contents.html
@@ -25,10 +25,10 @@
<td>Status</td><td>{{ org.get_status_display }}</td>
</tr>
<tr>
- <td>GRID id (link)</td><td>{% if org.grid_json.id %}<a href="https://grid.ac/institutes/{{ org.grid_json.id }}" target="_blank">{{ org.grid_json.id }}</a>{% else %}No GRID id found{% endif %}</td>
+ <td>GRID id (link)</td><td>{% if org.grid_json.id %}<a href="https://grid.ac/institutes/{{ org.grid_json.id }}" target="_blank" rel="noopener">{{ org.grid_json.id }}</a>{% else %}No GRID id found{% endif %}</td>
</tr>
<tr>
- <td>Crossref Org ID (link)</td><td>{% if org.crossref_json.org_id %}<a href="https://crossref.org" target="_blank">{{ org.crossref_json.org_id }}{% else %}No Crossref Org ID found{% endif %}</td>
+ <td>Crossref Org ID (link)</td><td>{% if org.crossref_json.org_id %}<a href="https://crossref.org" target="_blank" rel="noopener">{{ org.crossref_json.org_id }}{% else %}No Crossref Org ID found{% endif %}</td>
</tr>
{% if org.parent %}
<tr>
diff --git a/organizations/templates/organizations/contact_detail.html b/organizations/templates/organizations/contact_detail.html
index 5e67b506086f42094091ba2300d97e535526e24f..3651fe238ac5438dcf10c175d9087451cd56b363 100644
--- a/organizations/templates/organizations/contact_detail.html
+++ b/organizations/templates/organizations/contact_detail.html
@@ -26,7 +26,7 @@
</tr>
<tr>
<td>Account active?</td>
- <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if contact.user.is_active %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
</tr>
<tr>
<td>Account created</td>
diff --git a/organizations/templates/organizations/dashboard.html b/organizations/templates/organizations/dashboard.html
index 7dd20300b6983d13dd85d5a4b4496f4e7087ff4a..efda3f2a5484c9138d006780a3ea6c6b00071568 100644
--- a/organizations/templates/organizations/dashboard.html
+++ b/organizations/templates/organizations/dashboard.html
@@ -212,7 +212,7 @@
</ul>
</td>
{% if perms.scipost.can_manage_organizations %}
- <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if contact.user.is_active %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
{% endif %}
</tr>
{% empty %}
diff --git a/organizations/templates/organizations/organization_detail.html b/organizations/templates/organizations/organization_detail.html
index 2e0f4d9971161a6686aea743bd96a0ed147ab005..c3171d395bfef7505cd7170147d286eaa04f95cb 100644
--- a/organizations/templates/organizations/organization_detail.html
+++ b/organizations/templates/organizations/organization_detail.html
@@ -3,6 +3,7 @@
{% load bootstrap %}
{% load static %}
+{% block meta_description %}{{ block.super }} Organization detail {{ organization.name }}{% endblock meta_description %}
{% block pagetitle %}: Organization details{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/organizations/templates/organizations/organization_list.html b/organizations/templates/organizations/organization_list.html
index 806115274d1da17a993365cae552f89ccc9a1226..b57b35220f423c5f2ccc580a69367a5a7132e24f 100644
--- a/organizations/templates/organizations/organization_list.html
+++ b/organizations/templates/organizations/organization_list.html
@@ -1,5 +1,6 @@
{% extends 'organizations/base.html' %}
+{% block meta_description %}{{ block.super }} Organizations list{% endblock meta_description %}
{% block pagetitle %}: Organizations{% endblock pagetitle %}
{% load bootstrap %}
@@ -104,16 +105,16 @@
<tr>
<th><a href="{% add_get_parameters order_by='country' %}">Country</a></th>
<th><a href="{% add_get_parameters order_by='name' %}">Name</a> <small>[acronym]</small></th>
- <th>NAP <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Number of associated publications<br/>For details, click on the Organization and consult the Associated Publications tab"></i>
+ <th>NAP <span data-toggle="tooltip" data-html="true" title="" data-original-title="Number of associated publications<br/>For details, click on the Organization and consult the Associated Publications tab">{% include 'bi/info-circle-fill.html' %}</span>
{% if request.GET.ordering != 'asc' %}
- <a href="{% add_get_parameters order_by='nap' ordering='asc' %}"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% add_get_parameters order_by='nap' ordering='asc' %}">{% include 'bi/sort-up.html' %}</a>
{% else %}
- <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% url 'organizations:organizations' %}">{% include 'bi/sort-up.html' %}</a>
{% endif %}
{% if request.GET.ordering != 'desc' %}
- <a href="{% add_get_parameters order_by='nap' ordering='desc' %}"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% add_get_parameters order_by='nap' ordering='desc' %}">{% include 'bi/sort-down.html' %}</a>
{% else %}
- <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% url 'organizations:organizations' %}">{% include 'bi/sort-down.html' %}</a>
{% endif %}
</th>
<th>SciPost sponsor?</th>
diff --git a/petitions/templates/petitions/petition.html b/petitions/templates/petitions/petition.html
index 09dd1ad232eae9649c4230947289d2bf703c5f57..7e71884630773294329fcc7ff98f751002ca9762 100644
--- a/petitions/templates/petitions/petition.html
+++ b/petitions/templates/petitions/petition.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Petition {{ petition.headline }}{% endblock meta_description %}
{% block pagetitle %}: Petition{% endblock pagetitle %}
{% load bootstrap %}
diff --git a/proceedings/templates/proceedings/proceedings_details.html b/proceedings/templates/proceedings/proceedings_details.html
index 06487e1b2f9b3af7d3b33e06417c82be3cddec33..c6dd2a3f4fa037bbd972b34acaa19975d8ef6baf 100644
--- a/proceedings/templates/proceedings/proceedings_details.html
+++ b/proceedings/templates/proceedings/proceedings_details.html
@@ -6,6 +6,7 @@
<span class="breadcrumb-item">Proceedings details</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Proceedings details {{ proceedings }}{% endblock meta_description %}
{% block pagetitle %}: Proceedings details{% endblock pagetitle %}
{% block content %}
diff --git a/production/templates/production/partials/production_events.html b/production/templates/production/partials/production_events.html
index aa90da95765affc08f8c2f369176708e9e9acb50..5dce7476873fd0ff9fbab73f9f759410874a9df4 100644
--- a/production/templates/production/partials/production_events.html
+++ b/production/templates/production/partials/production_events.html
@@ -21,8 +21,8 @@
{% if not non_editable %}
{% if event.noted_by == request.user.production_user and event.editable %}
<div class="pl-2">
- <a href="{% url 'production:update_event' event.id %}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
- <a class="text-danger" href="{% url 'production:delete_event' event.id %}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+ <a href="{% url 'production:update_event' event.id %}"><span aria-hidden="true">{% include 'bi/pencil-square.html' %}</span></a>
+ <a class="text-danger" href="{% url 'production:delete_event' event.id %}"><span aria-hidden="true">{% include 'bi/trash-fill.html' %}</span></a>
</div>
{% endif %}
{% endif %}
diff --git a/production/templates/production/production.html b/production/templates/production/production.html
index 754ab55232cacbf5c8c94c3b9ea5ac5f03250b2c..6869c06c68387c4180341a19f2ebd7d2fdb6b91a 100644
--- a/production/templates/production/production.html
+++ b/production/templates/production/production.html
@@ -85,25 +85,25 @@
</td>
<td>
{% if stream.supervisor %}
- <i class="fa fa-check text-success"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>
{{ stream.supervisor }}
{% else %}
- <i class="fa fa-times text-danger"></i>
+ <span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% endif %}
</td>
<td>
{% if stream.officer %}
- <i class="fa fa-check text-success"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>
{{ stream.officer }}
{% else %}
- <i class="fa fa-times text-danger"></i>
+ <span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% endif %}
<br>
{% if stream.invitations_officer %}
- <i class="fa fa-check text-success"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>
{{ stream.invitations_officer }}
{% else %}
- <i class="fa fa-times text-danger"></i>
+ <span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% endif %}
</td>
</tr>
diff --git a/profiles/templates/profiles/_profile_card.html b/profiles/templates/profiles/_profile_card.html
index 0a7d8253cdb46d0155fa90b0abc98a2acd4d39e8..590c1c268b5afa6e98cf4d91a17941a7f53a4b4b 100644
--- a/profiles/templates/profiles/_profile_card.html
+++ b/profiles/templates/profiles/_profile_card.html
@@ -41,13 +41,12 @@
<td>{% if profile_mail.primary %}<strong>{% endif %}{{ profile_mail.email }}{% if profile_mail.primary %}</strong>{% endif %}</td>
<td>{{ profile_mail.primary|yesno:'Primary,Alternative' }}</td>
<td>
- <i class="fa {{ profile_mail.still_valid|yesno:'fa-check-circle text-success,fa-times-circle text-danger' }}"></i>
-
+ {% if profile_mail.still_valid %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}
</td>
<td class="d-flex">
<form method="post" action="{% url 'profiles:toggle_email_status' profile_mail.id %}">{% csrf_token %}<button type="submit" class="btn btn-link py-0">{{ profile_mail.still_valid|yesno:'Deprecate,Mark valid' }}</button></form>
<form method="post" action="{% url 'profiles:email_make_primary' profile_mail.id %}">{% csrf_token %}<button type="submit" class="btn btn-link py-0">Make primary</button></form>
- <a type="button" class="btn py-0" data-toggle="modal" data-target="#confirmDeleteEmailModal"><i class="fa fa-trash text-danger"></i></a>
+ <a type="button" class="btn py-0" data-toggle="modal" data-target="#confirmDeleteEmailModal"><span class="text-danger">{% include 'bi/trash-fill.html' %}</span></a>
<div class="modal" id="confirmDeleteEmailModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
@@ -84,8 +83,8 @@
{% endfor %}
</td>
</tr>
- <tr><td>ORCID ID</td><td><a href="//orcid.org/{{ profile.orcid_id }}" target="_blank">{{ profile.orcid_id }}</a></td></tr>
- <tr><td>Webpage</td><td><a href="{{ profile.webpage }}" target="_blank">{{ profile.webpage }}</a></td></tr>
+ <tr><td>ORCID ID</td><td><a href="//orcid.org/{{ profile.orcid_id }}" target="_blank" rel="noopener">{{ profile.orcid_id }}</a></td></tr>
+ <tr><td>Webpage</td><td><a href="{{ profile.webpage }}" target="_blank" rel="noopener">{{ profile.webpage }}</a></td></tr>
<tr><td>Accepts SciPost emails</td><td>{{ profile.accepts_SciPost_emails }}</td></tr>
<tr><td>Accepts refereeing requests</td><td>{{ profile.accepts_refereeing_requests }}</td></tr>
<tr><td>Contributor</td><td>{% if profile.contributor %}Yes, id: {{ profile.contributor.pk }}, status: {{ profile.contributor.get_status_display }}, user active: {{ profile.contributor.user.is_active }} (<a href="{% url 'scipost:contributor_info' contributor_id=profile.contributor.id %}" target="_blank">info link</a>){% else %}No{% endif %}</td></tr>
@@ -190,7 +189,7 @@
<div class="card-body">
<ul>
{% for inv in profile.refereeinvitation_set.all %}
- <li>{{ inv.submission.title }}<br/>(invited {{ inv.date_invited }}; fulfilled: {% if inv.fulfilled %}<i class="fa fa-check-square text-success"></i>{% else %}<i class="fa fa-times-circle"></i>{% endif %})</li>
+ <li>{{ inv.submission.title }}<br/>(invited {{ inv.date_invited }}; fulfilled: {% if inv.fulfilled %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/x-circle-fill.html' %}{% endif %})</li>
{% empty %}
<li>No refereeing invitation found</li>
{% endfor %}
diff --git a/profiles/templates/profiles/profile_detail.html b/profiles/templates/profiles/profile_detail.html
index f7289b4341aa19bf458e556ef1ddae866c1c580c..2324d32e01d97ad771ee3a62aeee2e3e611d60bf 100644
--- a/profiles/templates/profiles/profile_detail.html
+++ b/profiles/templates/profiles/profile_detail.html
@@ -9,6 +9,7 @@
{% load scipost_extras %}
+{% block meta_description %}{{ block.super }} Profile Details{% endblock meta_description %}
{% block pagetitle %}: Profile details{% endblock pagetitle %}
{% block content %}
diff --git a/profiles/templates/profiles/profile_form.html b/profiles/templates/profiles/profile_form.html
index 41782a8c9a33b6b63f82da8a84c176dc55ee2975..1511c824b851fb994a9069d75a4e5c5d199ba549 100644
--- a/profiles/templates/profiles/profile_form.html
+++ b/profiles/templates/profiles/profile_form.html
@@ -16,7 +16,7 @@
<h4>Matching profiles found for this {{ from_type }}</h4>
<ul>
{% for matching_profile in matching_profiles %}
- <li><a href="{{ matching_profile.get_absolute_url }}" target="_blank">{{ matching_profile }}</a> (id {{ matching_profile.id }}, {{ matching_profile.email }}) <a href="{% url 'profiles:profile_match' profile_id=matching_profile.id from_type=from_type pk=pk %}"><i class="fa fa-arrow-right"></i> Match this {{ from_type }} to this Profile</a>
+ <li><a href="{{ matching_profile.get_absolute_url }}" target="_blank">{{ matching_profile }}</a> (id {{ matching_profile.id }}, {{ matching_profile.email }}) <a href="{% url 'profiles:profile_match' profile_id=matching_profile.id from_type=from_type pk=pk %}">{% include 'bi/arrow-right.html' %} Match this {{ from_type }} to this Profile</a>
</li>
{% endfor %}
</ul>
diff --git a/profiles/templates/profiles/profile_list.html b/profiles/templates/profiles/profile_list.html
index f5353c5b323aa0635f5939e33057c92ebd39ad8d..28e2a2d3d60c94a80aba51cb0adbd793bde89ab8 100644
--- a/profiles/templates/profiles/profile_list.html
+++ b/profiles/templates/profiles/profile_list.html
@@ -13,6 +13,7 @@
{% endblock %}
+{% block meta_description %}{{ block.super }} Profiles List{% endblock meta_description %}
{% block pagetitle %}: Profiles{% endblock pagetitle %}
{% block content %}
@@ -26,34 +27,34 @@
<ul>
{% if is_scipost_admin or is_edcol_admin %}
{% if nr_contributors_w_duplicate_names > 0 %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> <a href="{% url 'scipost:contributor_duplicates' %}?kind=names">Handle Contributors with duplicate names ({{ nr_contributors_w_duplicate_names }} to handle)</a></li>
+ <li><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span><a href="{% url 'scipost:contributor_duplicates' %}?kind=names">Handle Contributors with duplicate names ({{ nr_contributors_w_duplicate_names }} to handle)</a></li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> No name-duplicate Contributors found</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> No name-duplicate Contributors found</li>
{% endif %}
{% if nr_contributors_w_duplicate_emails > 0 %}
<li><a href="{% url 'scipost:contributor_duplicates' %}?kind=emails">Handle Contributors with duplicate emails ({{ nr_contributors_w_duplicate_emails }} to handle)</a></li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> No email-duplicate Contributors found</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> No email-duplicate Contributors found</li>
{% endif %}
{% if next_contributor_wo_profile %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='contributor' pk=next_contributor_wo_profile.id %}">the next</a> Contributor without one ({{ nr_contributors_wo_profile }} to handle)</li>
+ <li><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='contributor' pk=next_contributor_wo_profile.id %}">the next</a> Contributor without one ({{ nr_contributors_wo_profile }} to handle)</li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> All registered Contributors have a Profile</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> All registered Contributors have a Profile</li>
{% endif %}
{% if nr_potential_duplicate_profiles > 0 %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> <a href="{% url 'profiles:duplicates' %}">Check for duplicate Profiles ({{ nr_potential_duplicate_profiles }} to handle)</a></li>
+ <li><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> <a href="{% url 'profiles:duplicates' %}">Check for duplicate Profiles ({{ nr_potential_duplicate_profiles }} to handle)</a></li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> No potential duplicate Profiles detected</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> No potential duplicate Profiles detected</li>
{% endif %}
{% if next_reginv_wo_profile %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='registrationinvitation' pk=next_reginv_wo_profile.id %}">the next</a> Registration Invitation without one ({{ nr_reginv_wo_profile }} to handle)</li>
+ <li><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='registrationinvitation' pk=next_reginv_wo_profile.id %}">the next</a> Registration Invitation without one ({{ nr_reginv_wo_profile }} to handle)</li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> All Registration Invitations have a Profile</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> All Registration Invitations have a Profile</li>
{% endif %}
{% if next_refinv_wo_profile %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='refereeinvitation' pk=next_refinv_wo_profile.id %}">the next</a> Referee Invitation without one ({{ nr_refinv_wo_profile }} to handle)</li>
+ <li><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='refereeinvitation' pk=next_refinv_wo_profile.id %}">the next</a> Referee Invitation without one ({{ nr_refinv_wo_profile }} to handle)</li>
{% else %}
- <li><i class="fa fa-check-circle text-success"></i> All Referee Invitations have a Profile</li>
+ <li><span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> All Referee Invitations have a Profile</li>
{% endif %}
{% endif %}
<li><a href="{% url 'profiles:profile_create' %}">Add a Profile</a></li>
@@ -159,7 +160,7 @@
<div class="single d-inline" data-specialty="{{ specialty.code }}" data-toggle="tooltip" data-placement="bottom" title="{{ specialty }}">{{ specialty.code }}</div>
{% endfor %}
</td>
- <td>{% if profile.has_active_contributor %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if profile.has_active_contributor %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
</tr>
{% empty %}
<tr>
diff --git a/scipost/managers.py b/scipost/managers.py
index 8fe31e821eacc7ed6574fad3811bafdfbdb38ba6..789a4593d0a3c111b61483509685addd5e6c16c8 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -80,7 +80,7 @@ class ContributorQuerySet(models.QuerySet):
user__is_staff=True).annotate(lower_email=Lower('user__email'))
duplicates = qs.values('lower_email').annotate(
Count('id')).filter(id__count__gt=1).values_list('lower_email', flat=True)
- return qs.filter(user__email__in=duplicates)
+ return qs.filter(lower_email__in=duplicates)
class UnavailabilityPeriodManager(models.Manager):
diff --git a/scipost/static/fa/css/font-awesome.min.css b/scipost/static/fa/css/font-awesome.min.css
deleted file mode 100644
index 540440ce89f2a408aa699b65100e18f15e0f09ca..0000000000000000000000000000000000000000
--- a/scipost/static/fa/css/font-awesome.min.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
deleted file mode 100644
index d386fdc261998c310d6be0e87726063c7352b5f0..0000000000000000000000000000000000000000
--- a/scipost/static/scipost/SciPost.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-General style sheet for SciPost
-*/
-
-@import url(//fonts.googleapis.com/css?family=Merriweather+Sans);
-
-.pubtitleli {
- padding: 3px 5px;
- background-color: #f4f4f4;
- border-radius: 4px;
-}
-
-ol {
- list-style-type: none;
- counter-reset: item;
- margin: 0;
- padding: 0;
-}
-ol > li {
- display: table;
- counter-increment: item;
- margin-bottom: 0.6em;
-}
-ol > li:before {
- content: counters(item, ".") ". ";
- display: table-cell;
- padding-right: 0.6em;
-}
-li ol > li {
- margin: 0;
-}
-li ol > li:before {
- content: counters(item, ".") " ";
-}
-
-.markup-preview {
- border: 1px solid black;
- white-space: pre-wrap;
- word-wrap: break-word;
- padding: 1rem;
- border-radius: 1.4px;
-}
-
-.opinionsDisplay {
- font-family: 'Merriweather Sans';
- font-size: 10px;
- margin: 0px 4px;
- padding: 1px;
- display: inline-block;
- box-shadow: 1px 1px 1px #888888;
- background: linear-gradient(to right,#fcfcfc, #f0f0f0);
-}
-.opinionsDisplay ul {
- color: #ffffff;
- display: inline-block;
- font-family: 'Merriweather Sans';
- margin: 0px;
- padding: 2px 1px;
-}
-.opinionsDisplay_old ul {
- border-radius: 2px;
- color: #ffffff;
- display: inline-block;
- margin: 0px;
- padding: 0px;
-}
-.opinionsDisplay ul li {
- border: 1px solid black;
- display: inline-block;
- font-family: 'Merriweather Sans';
- font-size: 8px;
- margin: 1px 2px;
- padding: 3px 6px;
-}
-.opinionsDisplay_old ul li {
- display: inline-block;
- background-color: #204080;
- margin: 1px 3px;
- padding: 2px 4px;
-}
-.opinionsDisplay form {
- display: inline-block;
- font-family: 'Merriweather Sans';
- font-size: 8px;
- margin: 2px;
-}
-.opinionsDisplay form input[type=submit] {
- color: #ffffff;
- font-family: 'Merriweather Sans';
- font-size: 8px;
-}
-.opinionsDisplay form input[type=submit].agree {
- background-color: #000099;
-}
-.opinionsDisplay form input[type=submit].notsure {
- background-color: #555555;
-}
-.opinionsDisplay form input[type=submit].disagree {
- background-color: #990000;
-}
-
-/* Styling of sphinxdoc-generated docs */
-.pagination-top {
- background-color: #dddddd;
- color: black;
- margin: 10px;
- padding: 10px;
-}
-.pagination-top a {
- color: #666666;
- target: _parent;
-}
-.pagination-top a:hover {
- color: #aaaaaa;
- text-decoration: underline;
-}
-
-/* Overrides for Select2 widget */
-.select2-selection--single {
- min-height: 32px;
- height: auto !important;
-}
-
-.sphinx {
- color: black;
- margin: 10px;
- padding: 10px;
-}
-.sphinx a {
- color: #666666;
- target: _parent;
-}
-.sphinx a:hover {
- color: #aaaaaa;
- text-decoration: underline;
-}
-.sphinx a.headerlink {
- font-size: 0.8em;
- padding: 0 4px 0 4px;
- text-decoration: none;
- visibility: hidden;
-}
-.sphinx *:hover > a.headerlink { visibility: visible; }
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index 76ee64bc04ec7947408e9cb5f63c06609fec4578..724a2794c3a7cff653531f25ac35a07ede562462 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -29,6 +29,9 @@ $container-lg: 1500px;
//
$scipost-light: #C3D7EE;
$scipost-lightblue: #6885c3;
+$scipost-blue55: #5b7abe;
+$scipost-blue50: #496bb6;
+$scipost-blue45: #4161a4;
$scipost-lightestblue: #d3e3f6;
$scipost-darkblue: #002b49;
$scipost-orange: #f6a11a;
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 5de4f5179fc141cadeabe788412fe537b873bbf4..399e4b7dc18b1e2b0b7852125ab318dea790546b 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -1,3 +1,152 @@
+/*
+General style sheet for SciPost
+*/
+
+@import url(//fonts.googleapis.com/css?family=Merriweather+Sans&display=swap);
+
+.bi::before {
+ display: inline-block;
+}
+
+.pubtitleli {
+ padding: 3px 5px;
+ background-color: #f4f4f4;
+ border-radius: 4px;
+}
+
+ol {
+ list-style-type: none;
+ counter-reset: item;
+ margin: 0;
+ padding: 0;
+}
+ol > li {
+ display: table;
+ counter-increment: item;
+ margin-bottom: 0.6em;
+}
+ol > li:before {
+ content: counters(item, ".") ". ";
+ display: table-cell;
+ padding-right: 0.6em;
+}
+li ol > li {
+ margin: 0;
+}
+li ol > li:before {
+ content: counters(item, ".") " ";
+}
+
+.markup-preview {
+ border: 1px solid black;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+ padding: 1rem;
+ border-radius: 1.4px;
+}
+
+.opinionsDisplay {
+ font-family: 'Merriweather Sans';
+ font-size: 10px;
+ margin: 0px 4px;
+ padding: 1px;
+ display: inline-block;
+ box-shadow: 1px 1px 1px #888888;
+ background: linear-gradient(to right,#fcfcfc, #f0f0f0);
+}
+.opinionsDisplay ul {
+ color: #ffffff;
+ display: inline-block;
+ font-family: 'Merriweather Sans';
+ margin: 0px;
+ padding: 2px 1px;
+}
+.opinionsDisplay_old ul {
+ border-radius: 2px;
+ color: #ffffff;
+ display: inline-block;
+ margin: 0px;
+ padding: 0px;
+}
+.opinionsDisplay ul li {
+ border: 1px solid black;
+ display: inline-block;
+ font-family: 'Merriweather Sans';
+ font-size: 8px;
+ margin: 1px 2px;
+ padding: 3px 6px;
+}
+.opinionsDisplay_old ul li {
+ display: inline-block;
+ background-color: #204080;
+ margin: 1px 3px;
+ padding: 2px 4px;
+}
+.opinionsDisplay form {
+ display: inline-block;
+ font-family: 'Merriweather Sans';
+ font-size: 8px;
+ margin: 2px;
+}
+.opinionsDisplay form input[type=submit] {
+ color: #ffffff;
+ font-family: 'Merriweather Sans';
+ font-size: 8px;
+}
+.opinionsDisplay form input[type=submit].agree {
+ background-color: #000099;
+}
+.opinionsDisplay form input[type=submit].notsure {
+ background-color: #555555;
+}
+.opinionsDisplay form input[type=submit].disagree {
+ background-color: #990000;
+}
+
+/* Styling of sphinxdoc-generated docs */
+.pagination-top {
+ background-color: #dddddd;
+ color: black;
+ margin: 10px;
+ padding: 10px;
+}
+.pagination-top a {
+ color: #666666;
+ target: _parent;
+}
+.pagination-top a:hover {
+ color: #aaaaaa;
+ text-decoration: underline;
+}
+
+/* Overrides for Select2 widget */
+.select2-selection--single {
+ min-height: 32px;
+ height: auto !important;
+}
+
+.sphinx {
+ color: black;
+ margin: 10px;
+ padding: 10px;
+}
+.sphinx a {
+ color: #666666;
+ target: _parent;
+}
+.sphinx a:hover {
+ color: #aaaaaa;
+ text-decoration: underline;
+}
+.sphinx a.headerlink {
+ font-size: 0.8em;
+ padding: 0 4px 0 4px;
+ text-decoration: none;
+ visibility: hidden;
+}
+.sphinx *:hover > a.headerlink { visibility: visible; }
+
+
.adminLinks {
background-color: #ffefef;
border: 1px solid red;
diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss
index 457310334816eb66cdb91fb1d38ebe29e4755e2d..01832e51956a696b49b5ac46dd74d0d5c6c3f0b5 100644
--- a/scipost/static/scipost/assets/css/_grid.scss
+++ b/scipost/static/scipost/assets/css/_grid.scss
@@ -52,7 +52,7 @@ footer.secondary {
text-align: center;
a {
- color: $scipost-lightblue;
+ color: $scipost-blue50;
}
}
diff --git a/scipost/static/scipost/assets/css/_list_group.scss b/scipost/static/scipost/assets/css/_list_group.scss
index 3eba4ebb4a87c24b1c427517cb1a7e39cfefce2f..86c6255bb6a954247494870bc8e4d86c6bec4d0c 100644
--- a/scipost/static/scipost/assets/css/_list_group.scss
+++ b/scipost/static/scipost/assets/css/_list_group.scss
@@ -24,10 +24,6 @@ ul.events-list {
}
-.fa-li {
- line-height: 1.25 !important;
-}
-
ul.references {
list-style: none;
padding-left: 0;
@@ -70,8 +66,14 @@ li,
.commentary,
.submission,
.publication {
+ .specialties {
+ margin-bottom: 0;
+ padding-top: 5px;
+ color: $text-muted;
+ font-size: 1em;
+ }
.subject {
- margin-bottom: 0;
+ margin-bottom: 1;
padding-top: 5px;
color: $text-muted;
}
@@ -80,6 +82,7 @@ li,
margin-bottom: 0;
padding-top: 5px;
padding-bottom: 5px;
+ font-weight: bold;
}
.authors {
@@ -109,7 +112,7 @@ ul.news-list {
margin: 0;
padding: 0;
- h4 {
+ h3 {
margin: 0.25rem 0;
a {
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 91db376be0767225bf4716859bed3d5cb84a38f8..d1973870c101f64aa8d2e9d88cc1689e7ed38fe3 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -10,6 +10,8 @@
.separator,
.nav-link {
display: inline-block;
+ font-size: 0.9rem;
+ font-weight: bold;
}
}
@@ -21,7 +23,7 @@
}
.main-nav {
- background-color: $scipost-lightblue;
+ background-color: $scipost-blue50;
letter-spacing: 0.3px;
.container {
@@ -45,6 +47,7 @@
.nav-item .dropdown-toggle::after {
margin-left: 0.2em;
vertical-align: 0.1255em;
+ font-weight: bold;
}
.dropdown-menu {
@@ -72,7 +75,7 @@
white-space: normal;
a {
- color: $scipost-lightblue;
+ color: $scipost-blue50;
transition: 0.08s;
&:hover {
diff --git a/scipost/static/scipost/assets/css/_typography.scss b/scipost/static/scipost/assets/css/_typography.scss
index 7d62daefdfa4ca2bc7b1af926362b6004c4dd9de..987e8efd78de1c1e48be2fcec59840b5cb972d6b 100644
--- a/scipost/static/scipost/assets/css/_typography.scss
+++ b/scipost/static/scipost/assets/css/_typography.scss
@@ -3,7 +3,7 @@
*
*/
a {
- color: $scipost-lightblue;
+ color: $scipost-blue50;
text-decoration: none;
cursor: pointer;
outline: none;
diff --git a/scipost/static/scipost/assets/js/activate_qr.js b/scipost/static/scipost/assets/js/activate_qr.js
new file mode 100644
index 0000000000000000000000000000000000000000..d3d347a69666a8bfad0672f08e1fd04574b4c9af
--- /dev/null
+++ b/scipost/static/scipost/assets/js/activate_qr.js
@@ -0,0 +1,10 @@
+import QRCode from 'qrcode';
+
+$(function (){
+ $.each($('[data-toggle="qr"]'), function(index, value) {
+ var el = $(value);
+ QRCode.toDataURL(el.data('qr-value'), function(err, url) {
+ el.attr({src: url});
+ });
+ });
+});
diff --git a/scipost/static/scipost/assets/js/dynamic_loading.js b/scipost/static/scipost/assets/js/dynamic_loading.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/scipost/static/scipost/assets/js/scripts.js b/scipost/static/scipost/assets/js/scripts.js
index 9f832ddb6d8fa4aa67cb50833481f8cbba463f8f..c1fe8b8ea6442a8cf8f55b61b54d66b099092131 100644
--- a/scipost/static/scipost/assets/js/scripts.js
+++ b/scipost/static/scipost/assets/js/scripts.js
@@ -1,8 +1,6 @@
require('jquery-ui/ui/widgets/sortable');
require('jquery-ui/ui/disable-selection');
-import QRCode from 'qrcode';
-
function hide_all_alerts() {
$(".alert").remove('.no-dismiss').fadeOut(300);
}
@@ -15,23 +13,6 @@ var activate_tooltip = function() {
});
}
-var activate_qr = function() {
- $.each($('[data-toggle="qr"]'), function(index, value) {
- var el = $(value);
- console.log(el.data('qr-value'));
- // var str;
- QRCode.toDataURL(el.data('qr-value'), function(err, url) {
- el.attr({src: url});
- });
- // console.log(str);
- // el.attr({src: str});
- // QRCode.toCanvas(el, el.data('qr-value'), function(err) {
- // console.log(err);
- // })
- });
-};
-
-
var select_form_table = function(table_el) {
$(table_el + ' tbody tr input[type="checkbox"]').on('change', function() {
if ( $(this).prop('checked') ) {
@@ -94,7 +75,6 @@ function init_page() {
});
activate_tooltip();
- activate_qr();
sort_form_list('form ul.sortable-list');
sort_form_list('table.sortable-rows > tbody');
select_form_table('.table-selectable');
@@ -111,7 +91,7 @@ function dynamic_load_tab( target_tab ) {
var target = $(tab.attr('href'));
$(target)
.show()
- .html('<div class="loading"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div>');
+ .html('<div class="loading">Loading...</div>');
$.get(url).done(function(data) {
$(target).html(data).promise().done(function() {
@@ -139,7 +119,7 @@ $(function(){
$(target)
.show()
- .html('<div class="loading"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i></div>');
+ .html('<div class="loading">Loading...</div>');
$.get(url + '?json=1').done(function(data) {
$(target).html(data).promise().done(function() {
diff --git a/scipost/static/scipost/formset.js_deprec20191117 b/scipost/static/scipost/formset.js_deprec20191117
deleted file mode 100644
index e944b74a779fecef708f2b55528da23b79f17139..0000000000000000000000000000000000000000
--- a/scipost/static/scipost/formset.js_deprec20191117
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Copyright (c) 2009, Stanislaus Madueke
- * All rights reserved.
- *
- * Licensed under the New BSD License
- * See: http://www.opensource.org/licenses/bsd-license.php
- *
- *
- * Modified version specific for SciPost.org
- */
-;(function($) {
- $.fn.formset = function(opts)
- {
- var options = $.extend({}, $.fn.formset.defaults, opts),
- flatExtraClasses = options.extraClasses.join(' '),
- totalForms = $('#id_' + options.prefix + '-TOTAL_FORMS'),
- maxForms = $('#id_' + options.prefix + '-MAX_NUM_FORMS'),
- minForms = $('#id_' + options.prefix + '-MIN_NUM_FORMS'),
- childElementSelector = 'input,select,textarea,label,div',
- $$ = $(this),
-
- applyExtraClasses = function(row, ndx) {
- if (options.extraClasses) {
- row.removeClass(flatExtraClasses);
- row.addClass(options.extraClasses[ndx % options.extraClasses.length]);
- }
- },
-
- updateElementIndex = function(elem, prefix, ndx) {
- var idRegex = new RegExp(prefix + '-(\\d+|__prefix__)-'),
- replacement = prefix + '-' + ndx + '-';
- if (elem.attr("for")) elem.attr("for", elem.attr("for").replace(idRegex, replacement));
- if (elem.attr('id')) elem.attr('id', elem.attr('id').replace(idRegex, replacement));
- if (elem.attr('name')) elem.attr('name', elem.attr('name').replace(idRegex, replacement));
- },
-
- hasChildElements = function(row) {
- return row.find(childElementSelector).length > 0;
- },
-
- showAddButton = function() {
- return maxForms.length == 0 || // For Django versions pre 1.2
- (maxForms.val() == '' || (maxForms.val() - totalForms.val() > 0));
- },
-
- /**
- * Indicates whether delete link(s) can be displayed - when total forms > min forms
- */
- showDeleteLinks = function() {
- return minForms.length == 0 || // For Django versions pre 1.7
- (minForms.val() == '' || (totalForms.val() - minForms.val() > 0));
- },
-
- insertDeleteLink = function(row) {
- var delCssSelector = $.trim(options.deleteCssClass).replace(/\s+/g, '.'),
- addCssSelector = $.trim(options.addCssClass).replace(/\s+/g, '.');
-
- if (row.is('TR')) {
- // If the forms are laid out in table rows, insert
- // the remove button into the last table cell:
- row.children(':last').append('<a class="' + options.deleteCssClass +'" href="javascript:void(0)">' + options.deleteText + ' <i class="fa fa-trash" aria-hidden="true"></i></a>');
- } else if (row.is('UL') || row.is('OL')) {
- // If they're laid out as an ordered/unordered list,
- // insert an <li> after the last list item:
- row.append('<li><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText +' <i class="fa fa-trash" aria-hidden="true"></i></a></li>');
- } else {
- // Otherwise, just insert the remove button as the
- // last child element of the form's container:
- row.append('<a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText +' <i class="fa fa-trash" aria-hidden="true"></i></a>');
- }
- // Check if we're under the minimum number of forms - not to display delete link at rendering
- if (!showDeleteLinks()){
- row.find('a.' + delCssSelector).hide();
- }
-
- row.find('a.' + delCssSelector).click(function() {
- var row = $(this).parents('.' + options.formCssClass),
- del = row.find('input:hidden[id $= "-DELETE"]'),
- buttonRow = row.siblings("a." + addCssSelector + ', .' + options.formCssClass + '-add'),
- forms;
- if (del.length) {
- // We're dealing with an inline formset.
- // Rather than remove this form from the DOM, we'll mark it as deleted
- // and hide it, then let Django handle the deleting:
- del.val('on');
- row.addClass('to_be_deleted');
- forms = $('.' + options.formCssClass).not(':hidden');
- } else {
- row.remove();
- // Update the TOTAL_FORMS count:
- forms = $('.' + options.formCssClass).not('.formset-custom-template');
- totalForms.val(forms.length);
- }
- for (var i=0, formCount=forms.length; i<formCount; i++) {
- // Apply `extraClasses` to form rows so they're nicely alternating:
- applyExtraClasses(forms.eq(i), i);
- if (!del.length) {
- // Also update names and IDs for all child controls (if this isn't
- // a delete-able inline formset) so they remain in sequence:
- forms.eq(i).find(childElementSelector).each(function() {
- updateElementIndex($(this), options.prefix, i);
- });
- }
- }
- // Check if we've reached the minimum number of forms - hide all delete link(s)
- if (!showDeleteLinks()){
- $('a.' + delCssSelector).each(function(){$(this).hide();});
- }
- // Check if we need to show the add button:
- if (buttonRow.is(':hidden') && showAddButton()) buttonRow.show();
- // If a post-delete callback was provided, call it with the deleted form:
- if (options.removed) options.removed(row);
- return false;
- });
- };
-
- $$.each(function(i) {
- var row = $(this),
- del = row.find('input:checkbox[id $= "-DELETE"]');
-
- if (del.length) {
- // If you specify "can_delete = True" when creating an inline formset,
- // Django adds a checkbox to each form in the formset.
- // Replace the default checkbox with a hidden field:
- if (del.is(':checked')) {
- // If an inline formset containing deleted forms fails validation, make sure
- // we keep the forms hidden (thanks for the bug report and suggested fix Mike)
- row.prepend('<input type="hidden" name="' + del.attr('name') +'" id="' + del.attr('id') +'" value="on" />');
- row.addClass('to_be_deleted');
- } else {
- row.prepend('<input type="hidden" name="' + del.attr('name') +'" id="' + del.attr('id') +'" />');
- }
- // Remove the old Bootstap row of the form
- del.parents('.form-group').remove();
- }
- if (hasChildElements(row)) {
- row.addClass(options.formCssClass);
- if (row.is(':visible')) {
- insertDeleteLink(row);
- applyExtraClasses(row, i);
- }
- }
- });
-
- if ($$.length) {
- var hideAddButton = !showAddButton(),
- addButton, template;
- if (options.formTemplate) {
- // If a form template was specified, we'll clone it to generate new form instances:
- template = (options.formTemplate instanceof $) ? options.formTemplate : $(options.formTemplate);
- template.removeAttr('id').addClass(options.formCssClass + ' formset-custom-template');
- template.find(childElementSelector).each(function() {
- updateElementIndex($(this), options.prefix, '__prefix__');
- });
- insertDeleteLink(template);
- } else {
- // Otherwise, use the last form in the formset; this works much better if you've got
- // extra (>= 1) forms (thnaks to justhamade for pointing this out):
- template = $('.' + options.formCssClass + ':last').clone(true).removeAttr('id');
- template.find('input:hidden[id $= "-DELETE"]').remove();
- // Clear all cloned fields, except those the user wants to keep (thanks to brunogola for the suggestion):
- template.find(childElementSelector).not(options.keepFieldValues).each(function() {
- var elem = $(this);
- // If this is a checkbox or radiobutton, uncheck it.
- // This fixes Issue 1, reported by Wilson.Andrew.J:
- if (elem.is('input:checkbox') || elem.is('input:radio')) {
- elem.attr('checked', false);
- } else {
- elem.val('');
- }
- });
- }
- // FIXME: Perhaps using $.data would be a better idea?
- options.formTemplate = template;
-
- if ($$.is('TR')) {
- // If forms are laid out as table rows, insert the
- // "add" button in a new table row:
- var numCols = $$.eq(0).children().length, // This is a bit of an assumption :|
- buttonRow = $('<tr><td colspan="' + numCols + '"><a class="' + options.addCssClass + '" href="javascript:void(0)">' + options.addText + ' <i class="fa fa-plus" aria-hidden="true"></i></a></tr>')
- .addClass(options.formCssClass + '-add');
- $$.parent().append(buttonRow);
- if (hideAddButton) buttonRow.hide();
- addButton = buttonRow.find('a');
- } else {
- // Otherwise, insert it immediately after the last form:
- $$.filter(':last').after('<div class="form-group row pt-2"><div class="col-12"><a class="' + options.addCssClass + '" href="javascript:void(0)">' + options.addText + ' <i class="fa fa-plus" aria-hidden="true"></i></a></div></div>');
- addButton = $$.filter(':last').next();
- if (hideAddButton) addButton.hide();
- }
- addButton.click(function() {
- var formCount = parseInt(totalForms.val()),
- row = options.formTemplate.clone(true).removeClass('formset-custom-template'),
- buttonRow = $($(this).parents('tr.' + options.formCssClass + '-add').get(0) || this),
- delCssSelector = $.trim(options.deleteCssClass).replace(/\s+/g, '.');
- applyExtraClasses(row, formCount);
- row.insertBefore(buttonRow).show();
- row.find(childElementSelector).each(function() {
- updateElementIndex($(this), options.prefix, formCount);
- });
- totalForms.val(formCount + 1);
- // Check if we're above the minimum allowed number of forms -> show all delete link(s)
- if (showDeleteLinks()){
- $('a.' + delCssSelector).each(function(){$(this).show();});
- }
- // Check if we've exceeded the maximum allowed number of forms:
- if (!showAddButton()) buttonRow.hide();
- // If a post-add callback was supplied, call it with the added form:
- if (options.added) options.added(row);
- return false;
- });
- }
-
- return $$;
- };
-
- /* Setup plugin defaults */
- $.fn.formset.defaults = {
- prefix: 'form', // The form prefix for your django formset
- formTemplate: null, // The jQuery selection cloned to generate new form instances
- addText: 'add another', // Text for the add link
- deleteText: 'remove', // Text for the delete link
- addCssClass: 'add-row', // CSS class applied to the add link
- deleteCssClass: 'delete-row', // CSS class applied to the delete link
- formCssClass: 'dynamic-form', // CSS class applied to each form in a formset
- extraClasses: [], // Additional CSS classes, which will be applied to each form in turn
- keepFieldValues: '', // jQuery selector for fields whose values should be kept when the form is cloned
- added: null, // Function called each time a new form is added
- removed: null // Function called each time a form is deleted
- };
-})(jQuery);
diff --git a/scipost/static/scipost/update-conflict.js b/scipost/static/scipost/update-conflict.js
index 4e1b5671e3087e916796978b94b02cf354ebc900..a28bd5cd3a42f01bbee372c7cb1b9401ece75a4a 100644
--- a/scipost/static/scipost/update-conflict.js
+++ b/scipost/static/scipost/update-conflict.js
@@ -34,9 +34,9 @@
},
}).done(function( data ) {
if ( data['status'] == 'verified' ) {
- $("#conflict-" + data['id'] + " .status").html('<i class="fa-li fa fa-check-circle text-success" aria-hidden="true"></i> Verified by Admin');
+ $("#conflict-" + data['id'] + " .status").html('<span class="text-success" aria-hidden="true">OK</span> Verified by Admin');
} else if ( data['status'] == 'deprecated' ) {
- $("#conflict-" + data['id'] ).fadeTo("fast", 0.3).find('.status').html('<i class="fa-li fa fa-times-circle text-danger" aria-hidden="true"></i> <em>Deleted</em>');
+ $("#conflict-" + data['id'] ).fadeTo("fast", 0.3).find('.status').html('<span class="text-danger" aria-hidden="true">X</span> <em>Deleted</em>');
}
});
}
diff --git a/scipost/templates/partials/scipost/personal_page/account.html b/scipost/templates/partials/scipost/personal_page/account.html
index 438ff86459f2d85ed6ddf6d6ca83e697e90b8c3a..77c5fd85490e43f5bede1fdef2bb4dc72700ef2d 100644
--- a/scipost/templates/partials/scipost/personal_page/account.html
+++ b/scipost/templates/partials/scipost/personal_page/account.html
@@ -60,7 +60,7 @@
{% if recommend_totp %}
<div class="border border-danger p-2 mb-3">
<h3>
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
Please increase your account's security</h3>
<div>
Your account grants access to sensitive, confidential information.
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index 366a074f8fa601f7329c317afd7572461e338aaa..0a80b51c6243d1883eac655dab058bf3f4925308 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -31,7 +31,7 @@
<p class="card-text mt-1">
<ul>
{% if sub.open_for_resubmission %}
- <li><a href="{% url 'submissions:submit_choose_journal' acad_field=sub.acad_field.slug %}?thread_hash={{ sub.thread_hash }}"><i class="fa fa-arrow-right"></i> resubmit</a></li>
+ <li><a href="{% url 'submissions:submit_choose_journal' acad_field=sub.acad_field.slug %}?thread_hash={{ sub.thread_hash }}">{% include 'bi/arrow-right.html' %} resubmit</a></li>
{% endif %}
{% if sub.under_consideration %}
{% if sub.editor_in_charge %}
diff --git a/scipost/templates/scipost/EdCol_by-laws.html b/scipost/templates/scipost/EdCol_by-laws.html
index eaf4e7f027922a63eda74aea24c029c869af1924..d77e3d7e1a3f04487dcb937e206676e15b2bd8b4 100644
--- a/scipost/templates/scipost/EdCol_by-laws.html
+++ b/scipost/templates/scipost/EdCol_by-laws.html
@@ -4,6 +4,7 @@
{% load scipost_extras %}
+{% block meta_description %}{{ block.super }} Editorial College By-laws{% endblock meta_description %}
{% block pagetitle %}: Editorial College By-laws{% endblock pagetitle %}
{% block breadcrumb %}
diff --git a/scipost/templates/scipost/ExpSustDrive2018.html b/scipost/templates/scipost/ExpSustDrive2018.html
index bc3143d967fd8f925f70c5a688d1055a486a56b3..72755ac1494f27e4492d98a27b5de33bb15ebe9a 100644
--- a/scipost/templates/scipost/ExpSustDrive2018.html
+++ b/scipost/templates/scipost/ExpSustDrive2018.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Expansion and Sustainability Drive 2018{% endblock meta_description %}
{% block pagetitle %}: Expansion and Sustainability Drive 2018{% endblock pagetitle %}
{% load static %}
@@ -17,7 +18,7 @@
Since our original <a href="{% url 'scipost:call' %}" target="_blank">call for openness</a> in scientific publishing, things have been developing extremely well with SciPost. One quick glance at our <a href="{% url 'journals:publications' %}" target="_blank">publishing activities</a> (our list of publications now numbers more than 100, including some <a href="https://scipost.org/SciPostPhys?tab=most-cited" target="_blank">highly-cited ones</a>) is hopefully enough to convince you that we are well on our way to implementing a healthier infrastructure for scientific publishing.
</p>
<p>
- Separately, in a sure sign that <i>The Times They Are A Changin'</i>, big players are moving towards implementing Open Access very similarly to our vision (including the European Commission with its recent <a href="https://ted.europa.eu/udl?uri=TED:NOTICE:141558-2018:TEXT:EN:HTML&tabId=1" target="_blank">Call for Tenders</a>, though you should read recent blog posts <a href="https://jscaux.org/blog/post/2018/04/02/ectender/" target="_blank">here</a> and <a href="https://jscaux.org/blog/post/2018/04/27/ECTenderInterview/" target="_blank">here</a> for how this relates to SciPost).
+ Separately, in a sure sign that <i>The Times They Are A Changin'</i>, big players are moving towards implementing Open Access very similarly to our vision (including the European Commission with its recent <a href="https://ted.europa.eu/udl?uri=TED:NOTICE:141558-2018:TEXT:EN:HTML&tabId=1" target="_blank" rel="noopener">Call for Tenders</a>, though you should read recent blog posts <a href="https://jscaux.org/blog/post/2018/04/02/ectender/" target="_blank" rel="noopener">here</a> and <a href="https://jscaux.org/blog/post/2018/04/27/ECTenderInterview/" target="_blank" rel="noopener">here</a> for how this relates to SciPost).
</p>
<p>
We are very thankful for the immense support we have received from the scientific community during our initial phase. In view of this success, the time is now ripe for us to be bold, and unleash the next steps in our implementation plans. Read on to see how you can concretely help us bring forth a new age in publishing.
@@ -38,7 +39,7 @@
<p>Hello</p>
{% endfor %}
<p>
- At SciPost, our ambitions for Open Access publishing are uncompromised, as can be seen from our <a href="{% url 'scipost:about' %}#guiding_principles" target="_blank">guiding principles</a> or our short <a href="https://youtu.be/Pgvd7EvehCI" target="_blank">intro video</a>. In particular, we implement the <a href="https://jscaux.org/blog/post/2018/05/05/genuine-open-access/" target="_blank">Genuine Open Access</a> principles (which include an explicit non profit requirement), are resolutely quality-oriented and international in outlook.
+ At SciPost, our ambitions for Open Access publishing are uncompromised, as can be seen from our <a href="{% url 'scipost:about' %}#guiding_principles" target="_blank">guiding principles</a> or our short <a href="https://youtu.be/Pgvd7EvehCI" target="_blank" rel="noopener">intro video</a>. In particular, we implement the <a href="https://jscaux.org/blog/post/2018/05/05/genuine-open-access/" target="_blank" rel="noopener">Genuine Open Access</a> principles (which include an explicit non profit requirement), are resolutely quality-oriented and international in outlook.
</p>
<h4>The two pillars of our expansion and sustainability drive</h4>
<p>
@@ -65,13 +66,13 @@
Are you sympathetic towards what we are aiming to achieve? You can help us accelerate our growth with these easy steps:
</p>
<ul>
- <li><i>Is your field insufficiently represented in our current <a href="{% url 'scipost:about' %}#editorial_college_physics">Editorial College</a>?</i><br/>We are looking for world-class researchers to become Fellows. Send us your nominations at <a href="mailto:admin@scipost.org">admin@scipost.org</a>.<br/>Are you a professorial-level researcher working as editor for non-<a href="https://jscaux.org/blog/post/2018/05/05/genuine-open-access/" target="_blank">Genuine OA</a>-compliant publishers? Looking to invest your expertise in a more community-friendly alternative? Get in touch.<br/>Please note that in view of our development plans, we also welcome nominations in fields beyond Physics.</li>
+ <li><i>Is your field insufficiently represented in our current <a href="{% url 'scipost:about' %}#editorial_college_physics">Editorial College</a>?</i><br/>We are looking for world-class researchers to become Fellows. Send us your nominations at <a href="mailto:admin@scipost.org">admin@scipost.org</a>.<br/>Are you a professorial-level researcher working as editor for non-<a href="https://jscaux.org/blog/post/2018/05/05/genuine-open-access/" target="_blank" rel="noopener">Genuine OA</a>-compliant publishers? Looking to invest your expertise in a more community-friendly alternative? Get in touch.<br/>Please note that in view of our development plans, we also welcome nominations in fields beyond Physics.</li>
<br/>
<li</li>
<li><i>Is your institution or funding agency not listed on our <a href="{% url 'sponsors:sponsors' %}" target="_blank">Sponsors page</a>?</i><br/>Encourage them (through a librarian, Open Access officer, director, ...) to join by personally emailing them directly using this <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'petitions/petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">email template</a>. Experience shows that such personal testimonies and statements of support from active scientists constitute the most persuasive means to convince institutions to support us.
<br/>Funders which have been acknowledged in SciPost publications are listed at <a href="https://scipost.org/organizations/" target="_blank">this link</a>; clicking on a funder will show how many publications they are related to, which have been produced at no direct cost to them by our cost-slashing operations. Seeing this might also help convincing them to become Sponsors.</li>
<br/>
- <li><i>Are people in your surroundings and social network not yet sufficiently aware of SciPost?</i><br/>You can point them to our <a href="https://youtu.be/Pgvd7EvehCI" target="_blank">intro video</a> and mention this drive on social media using the <a href="https://twitter.com/hashtag/SciPostDrive2018">#SciPostDrive2018</a> and <a href="https://twitter.com/hashtag/SciPost">#SciPost</a> hashtags.
+ <li><i>Are people in your surroundings and social network not yet sufficiently aware of SciPost?</i><br/>You can point them to our <a href="https://youtu.be/Pgvd7EvehCI" target="_blank" rel="noopener">intro video</a> and mention this drive on social media using the <a href="https://twitter.com/hashtag/SciPostDrive2018">#SciPostDrive2018</a> and <a href="https://twitter.com/hashtag/SciPost">#SciPost</a> hashtags.
</li>
<br/>
<li><i>Do you or people you know have the means to make a difference?</i><br/>All donations will be used to support running, maintaining and developing our infrastructure.
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 3577d150ee737f7f93f1374f683b79ad4a2e2a53..33b853252f867c1d02abc6056b749850c71b528c 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -2,6 +2,7 @@
{% load static %}
+{% block meta_description %}{{ block.super }} Frequently Asked Questions{% endblock meta_description %}
{% block pagetitle %}: Frequently asked questions{% endblock pagetitle %}
{% block breadcrumb_items %}
@@ -24,7 +25,7 @@
all the way to post-publication commenting, is offered by SciPost.
</p>
<p>
- Thus, simply stated: share your preprint on <a target="_blank" href="https://www.arxiv.org">arXiv</a>, publish it in <a href="https://scipost.org">SciPost</a>.
+ Thus, simply stated: share your preprint on <a target="_blank" rel="noopener" href="https://www.arxiv.org">arXiv</a>, publish it in <a href="https://scipost.org">SciPost</a>.
</p><!-- End SciPost -->
<!-- SciPost Journals -->
@@ -105,7 +106,7 @@
</a>
<div id="journals_citable" class="collapse" role="journals_citable">
<p>Yes. All SciPost publications will obtain a unique DOI, enabling citations and metrics as per other journals.
- Membership of <a target="_blank" href="//crossref.org">Crossref</a> means that SciPost papers directly benefit from a set of citation metrics.</p>
+ Membership of <a target="_blank" rel="noopener" href="//crossref.org">Crossref</a> means that SciPost papers directly benefit from a set of citation metrics.</p>
</div>
</div>
@@ -134,7 +135,7 @@
<h3>Under what license do SciPost Journals publish articles?</h3>
</a>
<div id="journals_license" class="collapse" role="journals_license">
- <p>All SciPost contents are licensed under the <a target="_blank" href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0) License</a>. Under this license, the copyright remains the property of the authors, who then agree to make their articles available for reuse without permission or fees, for virtually any purpose. Anyone may copy, distribute or reuse these articles as long as the author(s) and original source are properly cited. This is the standard license used worldwide in open access journals. You can read more about the details in the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.</p>
+ <p>All SciPost contents are licensed under the <a target="_blank" rel="noopener" href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0) License</a>. Under this license, the copyright remains the property of the authors, who then agree to make their articles available for reuse without permission or fees, for virtually any purpose. Anyone may copy, distribute or reuse these articles as long as the author(s) and original source are properly cited. This is the standard license used worldwide in open access journals. You can read more about the details in the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.</p>
</div>
</div>
@@ -247,7 +248,7 @@
</a>
<div id="scipost_who" class="collapse" role="tabpanel">
<ul>
- <li>SciPost was founded by <a target="_blank" href="//jscaux.org/">J.-S. Caux</a>, Professor of Theoretical Physics at the University of Amsterdam.</li>
+ <li>SciPost was founded by <a target="_blank" rel="noopener" href="//jscaux.org/">J.-S. Caux</a>, Professor of Theoretical Physics at the University of Amsterdam.</li>
<li>The legal entity behind SciPost is <a href="{% url 'scipost:foundation' %}">Stichting SciPost</a>, a not-for-profit Foundation established in Amsterdam. Its (non-remunerated) personnel consists in Prof. J.-S. Caux (chairman), Dr J. van Mameren (secretary) and Dr J. van Wezel (treasurer). The portal is run by a team of volunteer officers coordinated by the Foundation.</li>
</ul>
</div>
@@ -287,7 +288,7 @@
</a>
<div id="scipost_funded" class="collapse" role="tabpanel">
<p>SciPost operates non-commercially and purely not-for-profit, incurring minimal costs. Contributors, who are by definition all academically employed, provide all the content and perform all editorial tasks as part of their normal institutional academic duties. Operations are kept running by a team of volunteer officers, themselves academically employed.</p>
- <p>The startup phase was supported by a grant from the <a target="_blank" href="https://www.nwo.nl/en">NWO</a> in the Netherlands. Long-term operations will be financed by donations from national funding agencies, universities, societies, foundations and individuals. More information on our cost-slashing consortial scheme can be found on our <a href="{% url 'sponsors:sponsors' %}">sponsors page</a>. You can also take a look at our <a href="{% static 'sponsors/SciPost_Sponsors_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'sponsors/SciPost_Sponsorship_Agreement.pdf' %}">Sponsorship Agreement template</a> for more information. You might even consider petitioning your local librarian/director/... to consider sponsoring us, which you can easily do using this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
+ <p>The startup phase was supported by a grant from the <a target="_blank" rel="noopener" href="https://www.nwo.nl/en">NWO</a> in the Netherlands. Long-term operations will be financed by donations from national funding agencies, universities, societies, foundations and individuals. More information on our cost-slashing consortial scheme can be found on our <a href="{% url 'sponsors:sponsors' %}">sponsors page</a>. You can also take a look at our <a href="{% static 'sponsors/SciPost_Sponsors_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'sponsors/SciPost_Sponsorship_Agreement.pdf' %}">Sponsorship Agreement template</a> for more information. You might even consider petitioning your local librarian/director/... to consider sponsoring us, which you can easily do using this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
</p>
</div>
</div>
diff --git a/scipost/templates/scipost/PlanSciPost.html b/scipost/templates/scipost/PlanSciPost.html
index 31f60b7da8c5afad67f74034a4fa5f1a2da47a88..8f795b1fd7e858dbffb354840055a599be514f0b 100644
--- a/scipost/templates/scipost/PlanSciPost.html
+++ b/scipost/templates/scipost/PlanSciPost.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Plan SciPost{% endblock meta_description %}
{% block pagetitle %}: Plan SciPost{% endblock pagetitle %}
{% load static %}
@@ -15,7 +16,7 @@
<div class="col-12">
<h1 class="highlight">Plan Scipost</h1>
<p class="ml-2 mr-2">At SciPost, we believe that cleaning up the business of scientific publishing requires building new infrastructure. We also believe that this business is most appropriately left in the hands of scientists themselves. Our achievements so far in the field of Physics have demonstrated the success and further potential of this approach.</p>
- <p class="ml-2 mr-2">Increasing numbers of governments, funding agencies, universities and other academic instances have taken position in favour of a faster, larger-scale transition to Open Access (see in particular the recently-announced <a href="https://www.coalition-s.org" target="_blank">Plan S</a>). SciPost applauds these encouraging and empowering statements.</p>
+ <p class="ml-2 mr-2">Increasing numbers of governments, funding agencies, universities and other academic instances have taken position in favour of a faster, larger-scale transition to Open Access (see in particular the recently-announced <a href="https://www.coalition-s.org" target="_blank" rel="noopener">Plan S</a>). SciPost applauds these encouraging and empowering statements.</p>
<p class="ml-2 mr-2">Our initiative volunteers to provide the missing element in the proposed solutions: <strong>the infrastructure</strong>.</p>
<h2 class="highlight">Our vision for the future</h2>
@@ -31,7 +32,7 @@
<h3>Current situation and triggers for expansion</h3>
<p class="ml-2 mr-2 mt-2">
- The Physics side of our operations is by now established, with our <a href="{% url 'journals:journals' %}?field=physics">Physics Journals</a> published under the auspices of the <a href="{% url 'colleges:college_detail' slug='physics' %}">Editorial College (Physics)</a>. We will continue expanding this side of our operations according to the increase in the number of submissions we receive.</p>
+ The Physics side of our operations is by now established, with our <a href="{% url 'journals:journals' %}?field=physics">Physics Journals</a> published under the auspices of the <a href="{% url 'colleges:college_detail' college='physics' %}">Editorial College (Physics)</a>. We will continue expanding this side of our operations according to the increase in the number of submissions we receive.</p>
<p class="ml-2 mr-2">On the infrastructure side, we have made great strides. Our platform is not just a website: we have conceived, designed and implemented a fully-featured system to handle all aspects of the publication business, from manuscript submission all the way to professional metadata curation. Since our systems were implemented from the start in a field-agnostic way, we are now in perfect position to enable other fields to profit from our development work.
</p>
@@ -83,7 +84,7 @@
</thead>
<tbody>
<tr>
- <td>At least 3 Advisory Board members</td><td><i class="fa fa-circle"</i></td>
+ <td>At least 3 Advisory Board members</td><td>{% include 'bi/circle-fill.html' %}</td>
</tr>
<tr>
<td>Specializations defined</td><td></td>
diff --git a/scipost/templates/scipost/_public_info_as_table.html b/scipost/templates/scipost/_public_info_as_table.html
index bf5fa544ec48235a7fbf6bdd6a5a2c2fc1245cec..8fac7ba20b3cde67aef0ddb36c87263e1b363bd0 100644
--- a/scipost/templates/scipost/_public_info_as_table.html
+++ b/scipost/templates/scipost/_public_info_as_table.html
@@ -11,6 +11,6 @@
<tr class="text-muted"><td>Date joined / last login</td><td>{{ contributor.user.date_joined }} / {{ contributor.user.last_login }}</td></tr>
<tr class="text-muted"><td>Status</td><td>{{ contributor.get_status_display }}</td></tr>
<tr class="text-muted"><td>User active?</td><td>{{ contributor.user.is_active }}</td></tr>
- <tr class="text-muted"><td>Id</td><td>{{ contributor.id }}{% if contributor.profile %} <a href="{% url 'profiles:profile_detail' pk=contributor.profile.id %}">View Profile <i class="fa fa-arrow-right"></i></a>{% endif %}</td></tr>
+ <tr class="text-muted"><td>Id</td><td>{{ contributor.id }}{% if contributor.profile %} <a href="{% url 'profiles:profile_detail' pk=contributor.profile.id %}">View Profile {% include 'bi/arrow-right.html' %}</a>{% endif %}</td></tr>
{% endif %}
</table>
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index 90ae2ed4ddec97780376c1d9e93b978d8cf1a61d..e161bc84f19044fee02cb2bcdbd82b9e6a0cef45 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base_about.html' %}
+{% block meta_description %}{{ block.super }} About{% endblock meta_description %}
{% block pagetitle %}: About{% endblock pagetitle %}
{% load static %}
@@ -73,12 +74,12 @@
<tr>
<td>[OA]</td>
<td><strong>Open Access</strong></td>
- <td>All articles are published open access and an explicit open access licence is used which is preferably <a href="https://creativecommons.org/share-your-work/public-domain/freeworks/" target="_blank">Approved for Free Cultural Works</a>.</td>
+ <td>All articles are published open access and an explicit open access licence is used which is preferably <a href="https://creativecommons.org/share-your-work/public-domain/freeworks/" target="_blank" rel="noopener">Approved for Free Cultural Works</a>.</td>
</tr>
<tr>
<td>[OC]</td>
<td><strong>Open Citations</strong></td>
- <td>The Journal makes its citation metadata openly accessibly by actively participating in the <a href="https://i4oc.org" target="_blank">Initiative for Open Citations.</a></td>
+ <td>The Journal makes its citation metadata openly accessibly by actively participating in the <a href="https://i4oc.org" target="_blank" rel="noopener">Initiative for Open Citations.</a></td>
</tr>
<tr>
<td>[FF]</td>
@@ -101,7 +102,7 @@
<td>The editorial processes of the Journal are run by the community, and all editorial decisions are taken by active professional scientists, using exclusively academic scholarship-based criteria.</td>
</tr>
</table>
- <p>These principles are an extension and sharpening up of the <a href="https://www.fairopenaccess.org/" target="_blank">Fair Open Access Principles</a>, the most important difference being the insistence on the non profit business model.</p>
+ <p>These principles are an extension and sharpening up of the <a href="https://www.fairopenaccess.org/" target="_blank" rel="noopener">Fair Open Access Principles</a>, the most important difference being the insistence on the non profit business model.</p>
</div>
@@ -115,7 +116,7 @@
<div class="col-md-4 col-lg-3">
<h3><a href="{% url 'scipost:foundation' %}">The SciPost Foundation</a></h3>
<ul>
- <li>Chairman: Prof. <a href="https://jscaux.org" target="_blank">J.-S. Caux</a></li>
+ <li>Chairman: Prof. <a href="https://jscaux.org" target="_blank" rel="noopener">J.-S. Caux</a></li>
<li>Secretary: Dr J. van Mameren</li>
<li>Treasurer: Dr J. van Wezel</li>
</ul>
@@ -161,25 +162,25 @@
<div class="row justify-content-center">
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="//www.nikhef.nl/~h02/">J. J. Engelen</a><br/>(U. van Amsterdam)</li>
- <li>Prof. <a target="_blank" href="//www.asc.ox.ac.uk/person/18">P. Fendley</a><br/>(Oxford; <a href="https://www.asc.ox.ac.uk/all-souls-college-oxford">All Souls College</a>)</li>
- <li>Prof. <a target="_blank" href="//www.ru.nl/highenergyphysics/ehep/persons/sijbrand_de_jong/">S. J. de Jong</a><br/>(Radboud Univ. Nijmegen)</li>
- <li>Prof. <a target="_blank" href="//www.ens-lyon.fr/PHYSIQUE/presentation/annuaire/maillet-jean-michel">J. M. Maillet</a><br/>(ENS Lyon)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.nikhef.nl/~h02/">J. J. Engelen</a><br/>(U. van Amsterdam)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.asc.ox.ac.uk/person/18">P. Fendley</a><br/>(Oxford; <a href="https://www.asc.ox.ac.uk/all-souls-college-oxford">All Souls College</a>)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.ru.nl/highenergyphysics/ehep/persons/sijbrand_de_jong/">S. J. de Jong</a><br/>(Radboud Univ. Nijmegen)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.ens-lyon.fr/PHYSIQUE/presentation/annuaire/maillet-jean-michel">J. M. Maillet</a><br/>(ENS Lyon)</li>
</ul>
</div>
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="https://www.rug.nl/staff/p.rudolf/research">P. Rudolf</a><br/>(Groningen)</li>
- <li>Prof. <a target="_blank" href="//www.ru.nl/ssi/members/theo_rasing/">T. Rasing</a><br/>(Radboud U. Nijmegen)</li>
- <li>Prof. <a target="_blank" href="//atomchip.org/general-information/people/schmiedmayer/">J. Schmiedmayer</a><br/>(TU Vienna)</li>
- <li>Prof. <a target="_blank" href="//www.professoren.tum.de/en/spohn-herbert/">H. Spohn</a><br/>(TU Munich)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="https://www.rug.nl/staff/p.rudolf/research">P. Rudolf</a><br/>(Groningen)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.ru.nl/ssi/members/theo_rasing/">T. Rasing</a><br/>(Radboud U. Nijmegen)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//atomchip.org/general-information/people/schmiedmayer/">J. Schmiedmayer</a><br/>(TU Vienna)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.professoren.tum.de/en/spohn-herbert/">H. Spohn</a><br/>(TU Munich)</li>
</ul>
</div>
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="//www.comp.phys.ethz.ch/people/troyer.html">M. Troyer</a><br/>(ETH Zurich)</li>
- <li>Prof. <a target="_blank" href="//www.uva.nl/over-de-uva/organisatie/medewerkers/content/v/e/e.p.verlinde/e.p.verlinde.html">E. P. Verlinde</a><br/>(U. van Amsterdam)</li>
- <li>Prof. <a target="_blank" href="//staff.fnwi.uva.nl/j.t.m.walraven/walraven/JookWalraven.htm">J. T. M. Walraven</a><br/>(U. van Amsterdam)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.comp.phys.ethz.ch/people/troyer.html">M. Troyer</a><br/>(ETH Zurich)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//www.uva.nl/over-de-uva/organisatie/medewerkers/content/v/e/e.p.verlinde/e.p.verlinde.html">E. P. Verlinde</a><br/>(U. van Amsterdam)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="//staff.fnwi.uva.nl/j.t.m.walraven/walraven/JookWalraven.htm">J. T. M. Walraven</a><br/>(U. van Amsterdam)</li>
</ul>
</div>
</div>
@@ -192,7 +193,7 @@
<div class="row justify-content-center">
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="https://www.ru.nl/english/people/rutjes-f/">F.P.J.T. Rutjes</a><br/>(Radboud U. Nijmegen)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="https://www.ru.nl/english/people/rutjes-f/">F.P.J.T. Rutjes</a><br/>(Radboud U. Nijmegen)</li>
</ul>
</div>
</div>
@@ -205,17 +206,17 @@
<div class="row justify-content-center">
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="https://en.wikipedia.org/wiki/Douglas_N._Arnold">D. N. Arnold</a><br/>(U. of Minnesota)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="https://en.wikipedia.org/wiki/Douglas_N._Arnold">D. N. Arnold</a><br/>(U. of Minnesota)</li>
</ul>
</div>
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="https://staff.fnwi.uva.nl/e.m.opdam/">E. Opdam</a><br/>(U. van Amsterdam)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="https://staff.fnwi.uva.nl/e.m.opdam/">E. Opdam</a><br/>(U. van Amsterdam)</li>
</ul>
</div>
<div class="col-lg-3 col-md-4">
<ul>
- <li>Prof. <a target="_blank" href="https://math.berkeley.edu/~reshetik/">N. Reshetikhin</a><br/>(UC Berkeley)</li>
+ <li>Prof. <a target="_blank" rel="noopener" href="https://math.berkeley.edu/~reshetik/">N. Reshetikhin</a><br/>(UC Berkeley)</li>
</ul>
</div>
</div>
diff --git a/scipost/templates/scipost/bare_base.html b/scipost/templates/scipost/bare_base.html
index 4762a6c297f03e4a6220e7bded2d9190971e6666..1021d431c7858126be5d84193637a93e9de6aead 100644
--- a/scipost/templates/scipost/bare_base.html
+++ b/scipost/templates/scipost/bare_base.html
@@ -7,20 +7,17 @@
{% load static %}
- <link href="https://fonts.googleapis.com/css?family=Merriweather+Sans:300,400,700" rel="stylesheet">
- <link rel="stylesheet" type="text/css" href="{% static 'scipost/SciPost.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'fa/css/font-awesome.min.css' %}" />
- <link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
-
+ {% render_bundle 'vendors~homepage~main~qr' %}
+ {% render_bundle 'vendors~main' %}
{% render_bundle 'main' %}
<link rel="shortcut icon" href="{% static 'scipost/images/scipost_favicon.png' %}"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <title>SciPost{% block pagetitle %}{% endblock pagetitle %}</title>
+ <meta name="description" content="{% block meta_description %}SciPost{% endblock meta_description %}">
- <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
+ <title>SciPost{% block pagetitle %}{% endblock pagetitle %}</title>
{% block headsup %}
{% endblock headsup %}
diff --git a/scipost/templates/scipost/call.html b/scipost/templates/scipost/call.html
index ac7c9fd20ea4f7d54b0875f7f7a16b03b0db6fb3..69008d32d31ef142ec4cd737e1d8679ed10ef125 100644
--- a/scipost/templates/scipost/call.html
+++ b/scipost/templates/scipost/call.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Call{% endblock meta_description %}
{% block pagetitle %}: A call for openness{% endblock pagetitle %}
{% load static %}
diff --git a/scipost/templates/scipost/contributor_info.html b/scipost/templates/scipost/contributor_info.html
index 8e224e515b8b22828388d5a606e84add10af08c8..6b9285e8036e3b94d25d52a5df487ee4cbe4bf2f 100644
--- a/scipost/templates/scipost/contributor_info.html
+++ b/scipost/templates/scipost/contributor_info.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Contributor info {{ contributor }}{% endblock meta_description %}
{% block pagetitle %}: Contributor {{ contributor }}{% endblock pagetitle %}
{% block content %}
diff --git a/scipost/templates/scipost/feeds.html b/scipost/templates/scipost/feeds.html
index 1e89138d1d21a44a534b3acebb8309a16b0d514f..ec414d950e9f553f8f56f67ec1671dc72e5f5735 100644
--- a/scipost/templates/scipost/feeds.html
+++ b/scipost/templates/scipost/feeds.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Feeds{% endblock meta_description %}
{% block pagetitle %}: Feeds{% endblock pagetitle %}
{% load static %}
diff --git a/scipost/templates/scipost/footer.html b/scipost/templates/scipost/footer.html
index d4dd3b686a74b48de42c0f33cf817e13bc7d7bf2..4eccb22feaaf6fea36d71739984cccd7a5190c66 100644
--- a/scipost/templates/scipost/footer.html
+++ b/scipost/templates/scipost/footer.html
@@ -21,7 +21,7 @@
<li><a href="{% url 'helpdesk:helpdesk' %}">Helpdesk</a></li>
{% endif %}
<li><a href="mailto:techsupport@scipost.org">Write to tech support</a></li>
- <li><a href="https://scipost-codebases.org" target="_blank"><i class="fa fa-code-fork"></i> scipost-codebases.org</a></li>
+ <li><a href="https://scipost-codebases.org" target="_blank" rel="noopener">{% include 'bi/code-square.html' %} scipost-codebases.org</a></li>
</ul>
</div>
@@ -38,11 +38,8 @@
<li><a href="{% url 'news:news' %}">News</a></li>
<li><a href="{% url 'scipost:feeds' %}">Feeds</a></li>
<li>
- <a href="//twitter.com/scipost_dot_org" target="_blank" title="Twitter">
- <i class="fa fa-twitter" aria-hidden="true"></i>
- </a>
- <a href="{% url 'scipost:feeds' %}" title="RSS feeds">
- <i class="fa fa-rss ml-2" aria-hidden="true"></i>
+ <a href="//twitter.com/scipost_dot_org" target="_blank" rel="noopener" title="Twitter">
+ Twitter
</a>
</li>
</ul>
@@ -52,10 +49,10 @@
<div class="row">
<div class="col-12">
<br>
- <a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank" class="m-2">
+ <a rel="license noopener" href="//creativecommons.org/licenses/by/4.0/" target="_blank" class="m-2">
<img alt="Creative Commons License" style="border-width:0" src="//licensebuttons.net/l/by/4.0/80x15.png" />
</a>
- Except where otherwise noted, all content on SciPost.org is licensed under a <a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>.
+ Except where otherwise noted, all content on SciPost.org is licensed under a <a rel="license noopener" href="//creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>.
</div>
</div>
</div>
diff --git a/scipost/templates/scipost/foundation.html b/scipost/templates/scipost/foundation.html
index 98bb0769bba34e86d97260c6e059b548efce9773..a6bda41647ed77211a0d8f300caf92e23913a8f4 100644
--- a/scipost/templates/scipost/foundation.html
+++ b/scipost/templates/scipost/foundation.html
@@ -2,6 +2,7 @@
{% load static %}
+{% block meta_description %}{{ block.super }} Foundation{% endblock meta_description %}
{% block pagetitle %}: Foundation {% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html
index 779dfb59eddb6ebafed566ec7e79d706333e7a30..9f27397d006ff6436050b011b73a757e190e2e92 100644
--- a/scipost/templates/scipost/header.html
+++ b/scipost/templates/scipost/header.html
@@ -10,7 +10,7 @@
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" id="header-search-button" href="{% url 'scipost:search' %}">
- <i class="fa fa-search"></i>
+ {% include 'bi/search.html' %}
Search
</a>
@@ -19,10 +19,10 @@
<input type="text" name="q" placeholder="Search term" value="{{ request.GET.q }}">
<div class="btn-group">
<button type="submit" class="btn btn-link">
- <i class="fa fa-search"></i>
+ {% include 'bi/search.html' %}
</button>
<a class="btn btn-link close-form" id="header-search-close-btn">
- <i class="fa fa-times"></i>
+ {% include 'bi/x-circle-fill.html' %}
</a>
</div>
</form>
diff --git a/scipost/templates/scipost/howto.html b/scipost/templates/scipost/howto.html
index b609c8913671dfd82ee1a7fffecd04be783272de..e23d7dbaf1ce573e75340b8e183975fd6ce44881 100644
--- a/scipost/templates/scipost/howto.html
+++ b/scipost/templates/scipost/howto.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Howto{% endblock meta_description %}
{% block pagetitle %}: Howto Guides{% endblock pagetitle %}
{% block content %}
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 2341aa7ff4a23752ec8dd79210e9d6d9b5b341ba..ad19780f1cbb78113d384f856121e4ecac712834 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -5,6 +5,9 @@
{% block body_class %}{{ block.super }} homepage{% endblock %}
+{% block meta_description %}{{ block.super }} homepage{% endblock meta_description %}
+{% block pagetitle %}Homepage{% endblock pagetitle %}
+
{% block footer_script %}
{% render_bundle 'homepage' 'js' %}
{% endblock %}
@@ -63,7 +66,7 @@
<ul id="fader">
{% for sponsor in current_sponsors %}
{% if sponsor.logo %}
- <li class="item"><img height="100" class="rounded" src="{{ sponsor.logo.url }}" alt="{{ sponsor.name }} logo"></li>
+ <li class="item"><img class="rounded" src="{{ sponsor.logo.url }}" alt="{{ sponsor.name }} logo"></li>
{% endif %}
{% endfor %}
</ul>
@@ -73,11 +76,11 @@
<div class="col-lg-6 logos">
<h1>SciPost participates in</h1>
<br/>
- <a href="//www.crossref.org" target="_blank"><img src="//assets.crossref.org/logo/crossref-logo-200.svg" width="100" alt="Crossref logo"></a>
- <a href="//www.doaj.org" target="_blank"><img src="{% static 'scipost/images/doaj_logo_200.jpg' %}" width="90" alt="DOAJ logo"></a>
- <a href="//www.clockss.org" target="_blank"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" width="80" alt="Clockss logo"></a>
- <a href="//i4oc.org/" target="_blank"><img width="100" src="{% static 'scipost/images/I4OC.png' %}" alt="I4OC logo"></a>
- <a href="//freejournals.org" target="_blank"><img width="100" src="{% static 'scipost/images/FJN-logo-long.png' %}" alt="FJN logo"></a>
+ <a href="//www.crossref.org" target="_blank" rel="noopener"><img src="//assets.crossref.org/logo/crossref-logo-200.svg" width="100" alt="Crossref logo"></a>
+ <a href="//www.doaj.org" target="_blank" rel="noopener"><img src="{% static 'scipost/images/doaj_logo_200.jpg' %}" width="90" alt="DOAJ logo"></a>
+ <a href="//www.clockss.org" target="_blank" rel="noopener"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" width="80" alt="Clockss logo"></a>
+ <a href="//i4oc.org/" target="_blank" rel="noopener"><img width="100" src="{% static 'scipost/images/I4OC.png' %}" alt="I4OC logo"></a>
+ <a href="//freejournals.org" target="_blank" rel="noopener"><img width="100" src="{% static 'scipost/images/FJN-logo-long.png' %}" alt="FJN logo"></a>
</div>
</div>
</div>
diff --git a/scipost/templates/scipost/index_sidebar.html b/scipost/templates/scipost/index_sidebar.html
index 3493021bdec64cecd3923ff5b46d71865abd0018..86622a447be09a34ef794fde1eb08eade5202a24 100644
--- a/scipost/templates/scipost/index_sidebar.html
+++ b/scipost/templates/scipost/index_sidebar.html
@@ -17,7 +17,7 @@
<div class="p-3 my-3 bg-light" id="news">
<h2 class="title">
News
- <small><a href="{% url 'scipost:feeds' %}"><i class="fa fa-rss"></i></a></small>
+ <small><a href="{% url 'scipost:feeds' %}">{% include 'bi/rss-fill.html' %}</a></small>
</h2>
<a href="{% url 'news:news' %}">View all news and announcements.</a>
<hr class="sm">
diff --git a/scipost/templates/scipost/index_sidebar_2.html b/scipost/templates/scipost/index_sidebar_2.html
index ffa8488cda199354395dc73f2c6655e6decba580..9f9fa347306f604ed1880486e6218385320c9b15 100644
--- a/scipost/templates/scipost/index_sidebar_2.html
+++ b/scipost/templates/scipost/index_sidebar_2.html
@@ -26,19 +26,18 @@
<div id="news">
<h2 class="title">
News
- <small><a href="{% url 'scipost:feeds' %}"><i class="fa fa-rss"></i></a></small>
+ <button class="btn btn-link btn-sm m-0 mb-1" href="{% url 'scipost:feeds' %}" aria-label="RSS feeds">{% include 'bi/rss-fill.html' %}</button>
</h2>
- <!-- <a href="{% url 'news:news' %}">View all news and announcements.</a> -->
<ul class="news-list">
{% for news in news_items %}
<li>
- <h4><a href="{% url 'news:news' %}#news_{{news.id}}">{{ news.headline }}</a></h4>
+ <h3><a href="{% url 'news:news' %}#news_{{ news.id }}">{{ news.headline }}</a></h3>
<div class="text-muted">{{ news.date|date:'j F Y' }}</div>
<p>
{{ news.blurb_short }}
<br>
<br>
- <a href="{% url 'news:news' %}#news_{{news.id}}" class="my-1">Read more →</a>
+ <a href="{% url 'news:news' %}#news_{{ news.id }}" class="my-1">Read more →</a>
</p>
</li>
{% endfor %}
@@ -59,6 +58,6 @@
We invite <a href="{% url 'organizations:organizations' %}">organizations benefitting from SciPost's activities</a> to join our growing <a href="{% url 'sponsors:sponsors' %}">list of Sponsors</a>. Look at our <a href="{% static 'sponsors/SciPost_Sponsors_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'sponsors/SciPost_Sponsorship_Agreement.pdf' %}">Sponsorship Agreement template</a>.
</p>
<p>
- <span style="color: red;">Scientists, please help us out:</span> Please petition your local librarian/director/... to consider sponsoring us. You can use this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
+ <strong>Scientists, please help us out:</strong> Please petition your local librarian/director/... to consider sponsoring us. You can use this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
</p>
</div><!-- End Sponsors -->
diff --git a/scipost/templates/scipost/login.html b/scipost/templates/scipost/login.html
index f276e17b3702ced379f8aa92fc3f83ddc30de5cf..0c22c81d816cb773f25deafcb7607aff62abe2d6 100644
--- a/scipost/templates/scipost/login.html
+++ b/scipost/templates/scipost/login.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Login{% endblock meta_description %}
{% block pagetitle %}: login{% endblock pagetitle %}
{% load bootstrap %}
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index cf0c8205382731871b19f3aaf34807dff31ef88e..06eab2733b1d1d2b920276bad714c7fa344009d4 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -11,15 +11,15 @@
<nav class="navbar navbar-expand-lg main-nav">
<div class="container">
- <button class="navbar-toggler p-0 border-0" type="button" data-toggle="collapse" data-target="#main-navbar">
- <i class="fa fa-bars navbar-toggler-icon"></i>
+ <button class="navbar-toggler p-0 border-0" type="button" data-toggle="collapse" data-target="#main-navbar" aria-label="Navbar toggler">
+ <span class="navbar-toggler-icon">{% include 'bi/list.html' %}</span>
</button>
<div class="collapse navbar-collapse mt-lg-0 mt-3" id="main-navbar">
<ul class="navbar-nav mr-auto">
<li class="nav-item{% if request.path == '/' %} active{% endif %}">
- <a href="{% url 'scipost:index' %}" class="nav-link">
- <i class="fa fa-home d-none d-lg-inline-block" aria-hidden="true" style="min-width: 16px;"></i>
+ <a href="{% url 'scipost:index' %}" class="nav-link" aria-label="SciPost Home">
+ <span class="d-none d-lg-inline-block" aria-hidden="true" style="min-width: 16px;">{% include 'bi/house-fill.html' %}</span>
<span class="d-lg-none d-inline-block">Home</span>
</a>
</li>
@@ -29,10 +29,10 @@
<div class="dropdown-menu mega-menu mega-menu-2" aria-labelledby="JournalsDropdown">
<div class="row">
<div class="col-md-6">
- <div class="dropdown-item"><a href="{% url 'journals:journals' %}">Journals homepage</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
+ <div class="dropdown-item"><a href="{% url 'journals:journals' %}">Journals homepage</a></div>
</div>
<div class="col-md-6">
- <div class="dropdown-item"><a href="{% url 'journals:publications' %}">View all publications</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
+ <div class="dropdown-item"><a href="{% url 'journals:publications' %}">View all publications</a></div>
</div>
</div>
<div class="dropdown-divider"></div>
@@ -76,13 +76,13 @@
<div class="dropdown-menu mega-menu mega-menu-2" aria-labelledby="SubmissionsDropdown">
<div class="row">
<div class="col-md-6">
- <div class="dropdown-item"><a href="{% url 'submissions:submissions' %}">View all Submissions</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
+ <div class="dropdown-item"><a href="{% url 'submissions:submissions' %}">View all Submissions</a></div>
</div>
<div class="col-md-6">
- <div class="dropdown-item"><a href="{% url 'submissions:submit_manuscript' %}">Submit a manuscript</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
- <div class="dropdown-item"><a href="{% url 'submissions:author_guidelines' %}">Author guidelines</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
- <div class="dropdown-item"><a href="{% url 'submissions:referee_guidelines' %}">Referee guidelines</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
- <div class="dropdown-item"><a href="{% url 'colleges:colleges' %}">Editorial Colleges</a> <i class="fa fa-angle-right" aria-hidden="true"></i></div>
+ <div class="dropdown-item"><a href="{% url 'submissions:submit_manuscript' %}">Submit a manuscript</a></div>
+ <div class="dropdown-item"><a href="{% url 'submissions:author_guidelines' %}">Author guidelines</a></div>
+ <div class="dropdown-item"><a href="{% url 'submissions:referee_guidelines' %}">Referee guidelines</a></div>
+ <div class="dropdown-item"><a href="{% url 'colleges:colleges' %}">Editorial Colleges</a></div>
</div>
</div>
<div class="dropdown-divider"></div>
@@ -120,11 +120,9 @@
<div class="dropdown-menu" aria-labelledby="MoreDropdown">
<div class="dropdown-item">
<a href="{% url 'commentaries:commentaries' %}">Commentaries</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'theses:theses' %}">Theses</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
</div>
</li>
@@ -134,56 +132,46 @@
<div class="dropdown-menu" aria-labelledby="AboutDropdown">
<div class="dropdown-item">
<a href="{% url 'scipost:about' %}">About SciPost</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'scipost:foundation' %}">The Foundation</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'careers:jobopenings' %}">Careers@SciPost</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-divider"></div>
<div class="dropdown-item">
<a href="{% url 'scipost:FAQ' %}">FAQ</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'news:news' %}">News</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'scipost:feeds' %}">Feeds</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-divider"></div>
<div class="dropdown-item">
<a href="{% url 'finances:business_model' %}">Our Business Model</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'organizations:organizations' %}">Organizations<br/><span class="small">benefitting from our activities</span></a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'sponsors:sponsors' %}">Sponsors</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<div class="dropdown-item">
<a href="{% url 'finances:finances' %}">Finances</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
</div>
@@ -200,32 +188,28 @@
Logged in as {% if user.last_name %}{% if user.contributor %}{{ user.contributor.profile.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</a>
{% if request.user.contributor and not request.user.contributor.is_currently_available %}
- <button type="button" class="btn btn-link p-0 text-warning" data-toggle="tooltip" data-title="You are currently unavailable.<br>Check your availability on your Personal Page if this should not be the case." data-html="true"><i class="fa fa-warning"></i></button>
+ <button type="button" class="btn btn-link p-0 text-warning" data-toggle="tooltip" data-title="You are currently unavailable.<br>Check your availability on your Personal Page if this should not be the case." data-html="true">{% include 'bi/exclamation-triangle-fill.html' %}</button>
{% endif %}
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="PersonalDropdown">
{% if user.contributor %}
<div class="dropdown-item">
<a href="{% url 'scipost:personal_page' %}">Personal Page</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
{% if is_editorial_college %}
<div class="dropdown-item">
<a href="{% url 'submissions:pool' %}">Submissions Pool</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
{% endif %}
{% endif %}
{% if perms.scipost.can_view_production %}
<div class="dropdown-item">
<a href="{% url 'production:production' %}">Production</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
{% endif %}
{% if perms.scipost.can_manage_organizations or user.org_contact %}
<div class="dropdown-item">
<a href="{% url 'organizations:dashboard' %}">Orgs dashboard</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
{% endif %}
<div class="dropdown-divider"></div>
@@ -239,13 +223,12 @@
<div class="dropdown-divider"></div>
<div class="dropdown-item">
<a href="{% url 'scipost:logout' %}?next={{ request.path }}">Logout</a>
- <i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
</div>
</li>
<li class="nav-item">
-  <a href="{% url 'helpdesk:ticket_create' %}" target="_blank" class="nav-link"><i class="fa fa-sticky-note" style="font-size: 80%;" data-toggle="tooltip" data-html="true" title="Notice something wrong?<br/>Open a support ticket"></i></a>
+  <a href="{% url 'helpdesk:ticket_create' %}" target="_blank" class="nav-link"><span style="font-size: 80%;" data-toggle="tooltip" data-html="true" title="Notice something wrong?<br/>Open a support ticket">{% include 'bi/sticky-fill.html' %}</span></a>
</li>
{% else %}
diff --git a/scipost/templates/scipost/privacy_policy.html b/scipost/templates/scipost/privacy_policy.html
index 4200b4bafcaed9c95b55c6a25b3d06b664446155..33df8c88d3fcd08e4056e4c535d5ad1ecb6e72c7 100644
--- a/scipost/templates/scipost/privacy_policy.html
+++ b/scipost/templates/scipost/privacy_policy.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Privacy Policy{% endblock meta_description %}
{% block pagetitle %}: privacy policy{% endblock pagetitle %}
{% block breadcrumb %}
diff --git a/scipost/templates/scipost/quick_tour.html b/scipost/templates/scipost/quick_tour.html
index ce5b42172ae5f7e68750049f99db9c2f4b3ae69b..219238038923d2de6af387c696b47c7afcee0db2 100644
--- a/scipost/templates/scipost/quick_tour.html
+++ b/scipost/templates/scipost/quick_tour.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} Quick Tour{% endblock meta_description %}
{% block pagetitle %}: Quick Tour{% endblock pagetitle %}
{% load static %}
diff --git a/scipost/templates/scipost/register.html b/scipost/templates/scipost/register.html
index 196e29844789bc2bd2547f60def455b1a8ac93a9..9d4e9a101e87c79e514801cd1f943c3f5f247e08 100644
--- a/scipost/templates/scipost/register.html
+++ b/scipost/templates/scipost/register.html
@@ -2,6 +2,7 @@
{% load bootstrap %}
+{% block meta_description %}{{ block.super }} Register{% endblock meta_description %}
{% block pagetitle %}: register{% endblock pagetitle %}
{% block content %}
diff --git a/scipost/templates/scipost/terms_and_conditions.html b/scipost/templates/scipost/terms_and_conditions.html
index 30c5ff15f00450a0340bf290d3236ad7b8d4a919..51da0868fd4837e423bc95efc28398e4001ee95c 100644
--- a/scipost/templates/scipost/terms_and_conditions.html
+++ b/scipost/templates/scipost/terms_and_conditions.html
@@ -1,5 +1,6 @@
{% extends 'scipost/base.html' %}
+{% block meta_description %}{{ block.super }} terms and conditions{% endblock meta_description %}
{% block pagetitle %}: terms and conditions{% endblock pagetitle %}
{% block breadcrumb %}
diff --git a/scipost/templates/scipost/totpdevice_form.html b/scipost/templates/scipost/totpdevice_form.html
index 737b997c4b022ded4d9f5b6efd6a11c982c78166..eb16396210dbaa4cd131424b1346bf5275b8adef 100644
--- a/scipost/templates/scipost/totpdevice_form.html
+++ b/scipost/templates/scipost/totpdevice_form.html
@@ -1,11 +1,18 @@
{% extends 'scipost/_personal_page_base.html' %}
+{% load render_bundle from webpack_loader %}
+
+{% block headsup %}
+ {% render_bundle 'vendors~qr' %}
+ {% render_bundle 'qr' %}
+{% endblock headsup %}
+
{% block pagetitle %}: New device{% endblock pagetitle %}
{% load bootstrap %}
{% block breadcrumb_items %}
- {{block.super}}
+ {{ block.super }}
<a href="{% url 'scipost:totp' %}" class="breadcrumb-item">Two-factor authentication</a>
<span class="breadcrumb-item">New device</span>
{% endblock %}
@@ -18,9 +25,9 @@
<h1 class="highlight">Set up a device for two-factor authentication</h1>
<p>First of all, make sure you have an authenticator app installed on your mobile device. We recommend the following (many others are possible):</p>
<ul>
- <li><a href="http://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" target="_blank">Google Authenticator</a> (Android/iOS)</li>
- <li><a href="http://guide.duosecurity.com/third-party-accounts" target="_blank">Duo Mobile</a> (Android/iOS)</li>
- <li><a href="http://aka.ms/dbauthenticator" target="_blank">Authenticator</a> (Windows Phone 7)</li>
+ <li><a href="http://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" target="_blank" rel="noopener">Google Authenticator</a> (Android/iOS)</li>
+ <li><a href="http://guide.duosecurity.com/third-party-accounts" target="_blank" rel="noopener">Duo Mobile</a> (Android/iOS)</li>
+ <li><a href="http://aka.ms/dbauthenticator" target="_blank" rel="noopener">Authenticator</a> (Windows Phone 7)</li>
</ul>
<br>
<p>
@@ -53,4 +60,4 @@
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/scipost/templates/scipost/totpdevice_list.html b/scipost/templates/scipost/totpdevice_list.html
index cf1c608b0ebe31c85e456b13b599f68b49e9fc4a..035e5a53da1fecd68efd8da711a74086817158f4 100644
--- a/scipost/templates/scipost/totpdevice_list.html
+++ b/scipost/templates/scipost/totpdevice_list.html
@@ -15,14 +15,14 @@
<div class="col-md-12">
<h1 class="highlight">Two-factor authentication</h1>
<p>
- Two-factor authentication (2FA, see <a href="https://en.wikipedia.org/wiki/Multi-factor_authentication" target="_blank">Wikipedia</a>) adds an important layer of security to your SciPost account: the logging in procedure verifies something your <em>know</em> (your password) and something your <em>possess</em> (your mobile device). Our 2FA setup makes it nigh impossible for your account to be hijacked. We highly recommend it to all our users.
+ Two-factor authentication (2FA, see <a href="https://en.wikipedia.org/wiki/Multi-factor_authentication" target="_blank" rel="noopener">Wikipedia</a>) adds an important layer of security to your SciPost account: the logging in procedure verifies something your <em>know</em> (your password) and something your <em>possess</em> (your mobile device). Our 2FA setup makes it nigh impossible for your account to be hijacked. We highly recommend it to all our users.
</p>
<p>
Our implementation requires you to use an authenticator app on your mobile device, which generates time-dependent security codes on your phone. Such a code is then required together with your password upon logging in (the codes get renewed at short time intervals, so don't procrastinate when logging in). If you don’t already have one, you will need to install a mobile authentication app, for example:
<ul>
- <li><a href="http://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" target="_blank">Google Authenticator</a> (Android/iOS)</li>
- <li><a href="http://guide.duosecurity.com/third-party-accounts" target="_blank">Duo Mobile</a> (Android/iOS)</li>
- <li><a href="http://aka.ms/dbauthenticator" target="_blank">Authenticator</a> (Windows Phone 7)</li>
+ <li><a href="http://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" target="_blank" rel="noopener">Google Authenticator</a> (Android/iOS)</li>
+ <li><a href="http://guide.duosecurity.com/third-party-accounts" target="_blank" rel="noopener">Duo Mobile</a> (Android/iOS)</li>
+ <li><a href="http://aka.ms/dbauthenticator" target="_blank" rel="noopener">Authenticator</a> (Windows Phone 7)</li>
</ul>
(many other choices are available, depending on your device's operating system).
</p>
@@ -53,7 +53,7 @@
<tr>
<td colspan="3">
<div class="py-2">
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
You are not yet using two-factor authentication. We strongly recommend you to <a href="{% url 'scipost:totp_create' %}">set it up</a>.
</div>
</td>
diff --git a/scipost/views.py b/scipost/views.py
index ffcf29ae08ac03025eb011ace5009db432c2ffe3..9950a4a3a49dd529543be54a93e07d011b3d937c 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -175,7 +175,7 @@ def protected_serve(request, path, show_indexes=False):
def feeds(request):
"""Information page for RSS and Atom feeds."""
- return render(request, 'scipost/feeds.html', context)
+ return render(request, 'scipost/feeds.html')
################
diff --git a/security/templates/security/check_email.html b/security/templates/security/check_email.html
index 3d1d34095ef0b49328783f6e08257c7155edc5e2..a388e89fe9571a98249415f6fff19ac6f5864dae 100644
--- a/security/templates/security/check_email.html
+++ b/security/templates/security/check_email.html
@@ -39,7 +39,7 @@
<h4 class="highlight p-2 bg-danger text-white">
Your email address is associated to {{ breaches_json|length }}
known breach{{ breaches_json|pluralize:"es" }}
- (according to <a href="https://haveibeenpwned.com" target="_blank" class="text-info">haveibeenpawned.com</a>)
+ (according to <a href="https://haveibeenpwned.com" target="_blank" rel="noopener" class="text-info">haveibeenpawned.com</a>)
</h4>
<div class="m-4">
<p>Click on items in the list below to see details.</p>
@@ -53,7 +53,7 @@
ensure that you have changed your password since the date of the breach. If you
have already done that, you can ignore this particular breach from now on.</li>
<li>For all online services you register for,
- choose <a href="https://xkcd.com/936/" target="_blank">strong memorable passwords</a>
+ choose <a href="https://xkcd.com/936/" target="_blank" rel="noopener">strong memorable passwords</a>
(though four words is now outdated: go for six at least!)
or go for a strong password manager.</li>
</ul>
@@ -62,15 +62,15 @@
{% else %}
<h4 class="highlight p-2 bg-success text-white">
Your email address is not associated to any known breach
- (according to <a href="https://haveibeenpwned.com" target="_blank" class="text-info">haveibeenpawned.com</a>)
+ (according to <a href="https://haveibeenpwned.com" target="_blank" rel="noopener" class="text-info">haveibeenpawned.com</a>)
</h4>
{% endif %}
- <h3 class="highlight">Pastes <a href="https://haveibeenpwned.com/Pastes" target="_blank">(what are pastes?)</a></h3>
+ <h3 class="highlight">Pastes <a href="https://haveibeenpwned.com/Pastes" target="_blank" rel="noopener">(what are pastes?)</a></h3>
{% if pastes_json|length > 0 %}
<h4 class="highlight p-2 bg-danger text-white">
Your email address is associated to {{ pastes_json|length }}
known paste{{ pastes_json|pluralize }}
- (according to <a href="https://haveibeenpwned.com" target="_blank" class="text-info">haveibeenpawned.com</a>)
+ (according to <a href="https://haveibeenpwned.com" target="_blank" rel="noopener" class="text-info">haveibeenpawned.com</a>)
</h4>
<div class="m-4">
<p>Click on items in the list below to see details.</p>
@@ -81,7 +81,7 @@
<strong>What should you do?</strong>
<ul>
<li>For all online services you register for,
- choose <a href="https://xkcd.com/936/" target="_blank">strong memorable passwords</a>
+ choose <a href="https://xkcd.com/936/" target="_blank" rel="noopener">strong memorable passwords</a>
(though four words is now outdated: go for six at least!)
or go for a strong password manager.</li>
</ul>
@@ -90,7 +90,7 @@
{% else %}
<h4 class="highlight p-2 bg-success text-white">
Your email address is not associated to any known paste
- (according to <a href="https://haveibeenpwned.com" target="_blank" class="text-info">haveibeenpawned.com</a>)
+ (according to <a href="https://haveibeenpwned.com" target="_blank" rel="noopener" class="text-info">haveibeenpawned.com</a>)
</h4>
{% endif %}
diff --git a/security/templates/security/security.html b/security/templates/security/security.html
index 0ea75bcbe71d424b18b46d7ee0a5821443e93155..f50877471ad360a7f444778578299aa7ad7f5128 100644
--- a/security/templates/security/security.html
+++ b/security/templates/security/security.html
@@ -13,6 +13,7 @@
</div>
{% endblock %}
+{% block meta_description %}{{ block.super }} Security{% endblock meta_description %}
{% block pagetitle %}: Security{% endblock %}
{% block content %}
@@ -33,16 +34,16 @@
<h2 class="highlight">Security assessment for your email address {{ request.user.email }}</h2>
<p>With the link here under, we can probe the
- <a href="https://haveibeenpwned.com" target="_blank">haveibeenpwned.com</a>
+ <a href="https://haveibeenpwned.com" target="_blank" rel="noopener">haveibeenpwned.com</a>
service for you (this is a trusted openly-accessible information source built
by web security professional
- <a href="https://haveibeenpwned.com/About" target="_blank">Troy Hunt</a>; to learn
+ <a href="https://haveibeenpwned.com/About" target="_blank" rel="noopener">Troy Hunt</a>; to learn
more about it, see the <a href="https://haveibeenpwned.com/FAQs">FAQ</a>).
We will then display a simple digest of the data, without it being logged or saved.
</p>
<a class="btn btn-info" href="{% url 'security:check_email_pwned' %}" role="button">
- <i class="fa fa-arrow-right"></i> Check to see if my email address
+ {% include 'bi/arrow-right.html' %} Check to see if my email address
<strong><em>{{ request.user.email }}</em></strong> has been pwned
</a>
</div>
diff --git a/series/templates/series/collection_detail.html b/series/templates/series/collection_detail.html
index f51305279da1809710aa920b420bbc9f5e5643a7..f5bfe8e51f5cddb20f72269c90ba41df2998051b 100644
--- a/series/templates/series/collection_detail.html
+++ b/series/templates/series/collection_detail.html
@@ -11,6 +11,7 @@
<span class="breadcrumb-item">{{ collection.name }}</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Collection detail {{ collection.series.name }} {{ collection.name }}{% endblock meta_description %}
{% block pagetitle %}: Collection detail{% endblock pagetitle %}
{% block content %}
diff --git a/series/templates/series/series_detail.html b/series/templates/series/series_detail.html
index 5202546eb8c43fe82a71080481f145147ae45b1c..8650f39c5a73584723110897c7df0c1f76a7cf51 100644
--- a/series/templates/series/series_detail.html
+++ b/series/templates/series/series_detail.html
@@ -8,6 +8,7 @@
<span class="breadcrumb-item">{{ series.name }}</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Series detail {{ series.name }}{% endblock meta_description %}
{% block pagetitle %}: Series detail{% endblock pagetitle %}
{% block content %}
diff --git a/series/templates/series/series_list.html b/series/templates/series/series_list.html
index 0bdae735a991727f1e6e973058bfd372df413b3b..59dde44c52c4157a3e7155c390d976eb1b65b6f3 100644
--- a/series/templates/series/series_list.html
+++ b/series/templates/series/series_list.html
@@ -8,6 +8,7 @@
<span class="breadcrumb-item">Series</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Series list{% endblock meta_description %}
{% block pagetitle %}: Series{% endblock pagetitle %}
{% block content %}
diff --git a/sponsors/templates/sponsors/sponsors.html b/sponsors/templates/sponsors/sponsors.html
index c8478d264295391689fcfa007f93b16d9131b1f3..2e3849e7c4290f24522969ef151dd2eeaec7f378 100644
--- a/sponsors/templates/sponsors/sponsors.html
+++ b/sponsors/templates/sponsors/sponsors.html
@@ -1,5 +1,6 @@
{% extends 'sponsors/base.html' %}
+{% block meta_description %}{{ block.super }} Sponsors{% endblock meta_description %}
{% block pagetitle %}: Sponsors{% endblock pagetitle %}
{% load static %}
diff --git a/submissions/forms.py b/submissions/forms.py
index 9e5b209da9445f462a1266b22b3d69231cb55c6d..1c603d1d0a32d3767994b3450c0d691355daf828 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1285,12 +1285,12 @@ class EICRecommendationForm(forms.ModelForm):
for_journal_qs = Journal.objects.active().filter(
# The journals which can be recommended for are those falling under
# the responsibility of the College of the journal submitted to
- college=self.submission.to_journal.college)
- if self.submission.to_journal.name.partition(' ')[0] == 'SciPost':
+ college=self.submission.submitted_to.college)
+ if self.submission.submitted_to.name.partition(' ')[0] == 'SciPost':
# Submitted to a SciPost journal, so Selections is accessible
for_journal_qs = for_journal_qs | Journal.objects.filter(name='SciPost Selections')
- self.fields['for_journal'] = for_journal_qs
- if self.submission.to_journal.name.partition(' ')[0] == 'SciPost':
+ self.fields['for_journal'].queryset = for_journal_qs
+ if self.submission.submitted_to.name.partition(' ')[0] == 'SciPost':
# Submitted to a SciPost journal, so Core and Selections are accessible
self.fields['for_journal'].help_text=(
'Please be aware of all the points below!'
diff --git a/submissions/templates/partials/submissions/admin/conflicts.html b/submissions/templates/partials/submissions/admin/conflicts.html
index 51281f03783739f57f2c6462c1691b3d604d04d0..7a2095a4c0109a36c45d5e80d6d2c27faaa95ffa 100644
--- a/submissions/templates/partials/submissions/admin/conflicts.html
+++ b/submissions/templates/partials/submissions/admin/conflicts.html
@@ -2,19 +2,19 @@
{% if conflicts %}
{{ conflicts|length }} (potential) conflict{{ conflicts|length|pluralize }} found:
- <ul class="fa-ul mt-2">
+ <ul class="mt-2">
{% for conflict in conflicts %}
<li class="my-1" id="conflict-{{ conflict.id }}">
<div class="actions status font-weight-bold">
{% if conflict.status == 'unverified' %}
- <i class="fa-li fa fa-question-circle text-warning" aria-hidden="true"></i>
+ <span class="text-warning" aria-hidden="true">{% include 'bi/question-circle-fill.html' %}</span>
Please
<button type="button" class="btn btn-link p-0 update-conflict-button" data-conflict-id="{{ conflict.id }}" data-status="verified" data-urllink="{% url 'api:conflictofinterest-verify_conflict' conflict.id %}">confirm</button>
or
<button type="button" class="btn btn-link p-0 text-danger update-conflict-button" data-conflict-id="{{ conflict.id }}" data-status="delete" data-urllink="{% url 'api:conflictofinterest-verify_conflict' conflict.id %}">delete</button>
this conflict.
{% elif conflict.status == 'verified' %}
- <i class="fa-li fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<strong>Verified by Admin</strong>
{% endif %}
</div>
@@ -36,7 +36,7 @@
{% endfor %}
</ul>
{% else %}
- <em><i class="fa fa-check text-success" aria-hidden="true"></i> No conflicts found</em>
+ <em><span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span> No conflicts found</em>
{% endif %}
diff --git a/submissions/templates/partials/submissions/admin/recommendation_tooltip.html b/submissions/templates/partials/submissions/admin/recommendation_tooltip.html
index 79e47405ebb8b2c351e301b36784232fccf40907..c9a403312ef38126261fc41a8531df690412d2f6 100644
--- a/submissions/templates/partials/submissions/admin/recommendation_tooltip.html
+++ b/submissions/templates/partials/submissions/admin/recommendation_tooltip.html
@@ -1,9 +1 @@
-<i class="fa fa-info-circle {{ classes }}" data-toggle="tooltip" data-html="true" title="
- Eligible to vote ({{ recommendation.eligible_to_vote.count }})
- <hr>
- Agreed ({{ recommendation.voted_for.count }})
- <br>
- Disagreed ({{ recommendation.voted_against.count }})
- <br>
- Abstained ({{ recommendation.voted_abstain.count }})
-"></i>
+<span data-toggle="tooltip" data-html="true" title="Eligible to vote ({{ recommendation.eligible_to_vote.count }})<hr>Agreed ({{ recommendation.voted_for.count }})<br>Disagreed ({{ recommendation.voted_against.count }})<br>Abstained ({{ recommendation.voted_abstain.count }})">{% include 'bi/info-circle-fill.html' %}</span>
diff --git a/submissions/templates/partials/submissions/pool/referee_invitations.html b/submissions/templates/partials/submissions/pool/referee_invitations.html
index c120b79eb9e5c01bff013d8741de8c0102798faf..48c02c7fafcc33e58235af4f8f8ff87c2c8be3f3 100644
--- a/submissions/templates/partials/submissions/pool/referee_invitations.html
+++ b/submissions/templates/partials/submissions/pool/referee_invitations.html
@@ -17,13 +17,13 @@
<td>
{% if invitation.needs_response %}
<div class="text-center" data-toggle="tooltip" data-title="This referee has not responded in over three days.<br>Consider sending a reminder or cancelling the invitation." data-html="true">
- <i class="fa fa-info"></i>
- <i class="fa fa-long-arrow-right"></i>
+ {% include 'bi/info-circle-fill.html' %}
+ {% include 'bi/arrow-right.html' %}
</div>
{% elif invitation.needs_fulfillment_reminder %}
<div class="text-center" data-toggle="tooltip" data-title="This referee has accepted to send a Report, but not yet delivered it.<br>Consider sending a reminder." data-html="true">
- <i class="fa fa-info"></i>
- <i class="fa fa-long-arrow-right"></i>
+ {% include 'bi/info-circle-fill.html' %}
+ {% include 'bi/arrow-right.html' %}
</div>
{% endif %}
{% if invitation.is_overdue %}
@@ -127,7 +127,7 @@
{% if invitations %}
<h4><a href="{% url 'submissions:select_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">+ Invite an additional referee</a></h4>
{% else %}
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-circle-fill.html' %}</span>
You have not invited any referees yet. <a href="{% url 'submissions:select_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">Invite the first referee here</a>.
{% endif %}
</td>
diff --git a/submissions/templates/partials/submissions/pool/required_actions_tooltip.html b/submissions/templates/partials/submissions/pool/required_actions_tooltip.html
index b5e3d92242956fbdbf96e05ade2183bffa79d1a1..047acdf696dd4b0be38f43fd6a448fb6c8dbd740 100644
--- a/submissions/templates/partials/submissions/pool/required_actions_tooltip.html
+++ b/submissions/templates/partials/submissions/pool/required_actions_tooltip.html
@@ -1,10 +1,10 @@
{% if submission.cycle.has_required_actions %}
- <i class="fa fa-exclamation-circle {{ classes }}" data-toggle="tooltip" data-html="true" title="
+ <span class="{{ classes }}" data-toggle="tooltip" data-html="true" title="
Required Actions:
<ul class='mb-0 pl-3 text-left'>
{% for code, action in submission.cycle.required_actions.items %}
<li>{{ action }}</li>
{% endfor %}
</ul>
- "></i>
+ ">{% include 'bi/exclamation.html' %}</span>
{% endif %}
diff --git a/submissions/templates/partials/submissions/pool/submission_comments_summary_table.html b/submissions/templates/partials/submissions/pool/submission_comments_summary_table.html
index 8936ca076132617ed65d5be3cfcb77876622ee6c..c55924b9fc00c75a3a8f234ebe1fbe1d76c64dc1 100644
--- a/submissions/templates/partials/submissions/pool/submission_comments_summary_table.html
+++ b/submissions/templates/partials/submissions/pool/submission_comments_summary_table.html
@@ -15,8 +15,8 @@
<td class="text-center">
{% if comment.is_unvetted %}
<div class="text-center" data-toggle="tooltip" data-title="This Comment has not yet been vetted." data-html="true">
- <i class="fa fa-info"></i>
- <i class="fa fa-long-arrow-right" ></i>
+ {% include 'bi/info-circle-fill.html' %}
+ {% include 'bi/arrow-right.html' %}
</div>
{% endif %}
</td>
@@ -29,12 +29,11 @@
</td>
<td>
{% if comment.is_vetted %}
- <i class="fa fa-check-circle text-success"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>
{% elif comment.is_rejected %}
- <i class="fa fa-times-circle text-danger"></i>
+ <span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% elif comment.is_unvetted %}
- <i class="fa fa-exclamation-triangle text-warning"></i>
- {% endif %}
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> {% endif %}
{{ comment.get_status_display }}
{% if comment.is_unvetted %}
<br>
diff --git a/submissions/templates/partials/submissions/pool/submission_details.html b/submissions/templates/partials/submissions/pool/submission_details.html
index 5bfc2d09fea5dde5e94feee3afe78a6e955c4f55..c581cafe3d208a04afacba6549207526dadbe0ba 100644
--- a/submissions/templates/partials/submissions/pool/submission_details.html
+++ b/submissions/templates/partials/submissions/pool/submission_details.html
@@ -38,9 +38,9 @@
<div class="my-4 p-3 border{% if submission.cycle.has_required_actions %} border-danger bg-light{% endif %}" id="required-actions" {% if submission.cycle.has_required_actions %}style="border-width: 2px !important;"{% endif %}>
<h3>
{% if submission.cycle.has_required_actions %}
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
{% else %}
- <i class="fa fa-check-circle"></i>
+ {% include 'bi/check-circle-fill.html' %}
{% endif %}
Required actions
</h3>
diff --git a/submissions/templates/partials/submissions/pool/submission_info_table.html b/submissions/templates/partials/submissions/pool/submission_info_table.html
index 0304dabe3eb1f6607463c833f9b28f141868a2fd..1e0600e45d81b7b7df2dac1e6eeea46a78b6c634 100644
--- a/submissions/templates/partials/submissions/pool/submission_info_table.html
+++ b/submissions/templates/partials/submissions/pool/submission_info_table.html
@@ -7,7 +7,7 @@
<tr>
<td>Arxiv Link</td>
<td>
- <a href="{{ submission.preprint.url }}" target="_blank">{{ submission.preprint.url }}</a>
+ <a href="{{ submission.preprint.url }}" target="_blank" rel="noopener">{{ submission.preprint.url }}</a>
</td>
</tr>
{% elif submission.preprint.get_absolute_url %}
@@ -68,7 +68,7 @@
<td>Comments</td>
<td>
{{ submission.comments.vetted.count }}
- <small><span class="fa fa-info-circle" data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{ submission.comments.regular_comments.vetted.count }} comments<br>{{ submission.comments.author_replies.vetted.count }} author replies<hr>{{ submission.comments.awaiting_vetting.count }} awaiting vetting"></span></small>
+ <small><span data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{ submission.comments.regular_comments.vetted.count }} comments<br>{{ submission.comments.author_replies.vetted.count }} author replies<hr>{{ submission.comments.awaiting_vetting.count }} awaiting vetting">{% include 'bi/info-circle-fill.html' %}</span></small>
</td>
</tr>
diff --git a/submissions/templates/partials/submissions/pool/submission_li.html b/submissions/templates/partials/submissions/pool/submission_li.html
index 203050984fe6ec76977866cdf267267776ca1620..c3994e67c724910334af469043cf8dfc2f963d8e 100644
--- a/submissions/templates/partials/submissions/pool/submission_li.html
+++ b/submissions/templates/partials/submissions/pool/submission_li.html
@@ -7,7 +7,7 @@
{% include 'partials/submissions/pool/submission_tooltip.html' with submission=submission %}
{% if submission.status == 'unassigned' %}
- <i class="fa fa-exclamation mt-1 px-1 text-danger" data-toggle="tooltip" data-html="true" title="You can volunteer to become Editor-in-charge"></i>
+ <span class="mt-1 px-1 text-danger" data-toggle="tooltip" data-html="true" title="You can volunteer to become Editor-in-charge">{% include 'bi/exclamation-circle-fill.html' %}</span>
{% endif %}
</div>
<div class="pool-item">
@@ -39,7 +39,7 @@
<span class="card-text text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:editorial_assignment' submission.preprint.identifier_w_vn_nr %}">clicking here</a>.</span>
{% elif submission.editor_in_charge == request.user.contributor %}
<strong>You are the EIC</strong>
- <a role="button" class="btn btn-info px-1 py-0" href="{% url 'submissions:editorial_page' submission.preprint.identifier_w_vn_nr %}"><small><i class="fa fa-arrow-right"></i> Editorial page</small></a>
+ <a role="button" class="btn btn-info px-1 py-0" href="{% url 'submissions:editorial_page' submission.preprint.identifier_w_vn_nr %}"><small>{% include 'bi/arrow-right.html' %} Editorial page</small></a>
{% else %}
{{ submission.editor_in_charge }}
{% endif %}
@@ -68,7 +68,7 @@
{% if is_editorial_admin and submission.has_inadequate_pool_composition %}
<div class="border border-danger text-danger mt-1 py-1 px-2">
<strong>
- <i class="fa fa-exclamation-triangle"></i>
+ {% include 'bi/exclamation-triangle-fill.html' %}
Notice to admin: The current editor is not assigned to the pool. Therefore, the editor will not be able to reach the editorial page.
</strong>
</div>
@@ -84,7 +84,7 @@
{% get_editor_invitations submission request.user as invitations %}
{% if invitations %}
<div class="border border-warning mt-1 py-1 px-2">
- <i class="fa fa-exclamation mt-1 px-1 text-danger"></i>
+ <span class="mt-1 px-1 text-danger">{% include 'bi/exclamation.html' %}</i>
You are invited to become Editor-in-charge of this Submission. <a href="{% url 'submissions:editorial_assignment' submission.preprint.identifier_w_vn_nr %}">You can reply to this invitation here</a>.
</div>
{% endif %}
diff --git a/submissions/templates/partials/submissions/pool/submission_reports_summary_table.html b/submissions/templates/partials/submissions/pool/submission_reports_summary_table.html
index 00b82daa5039b2e13d6d3fb359e5a09cbfe5d456..dbd467b8a48c934a04b6d706c1cd13fdda73c676 100644
--- a/submissions/templates/partials/submissions/pool/submission_reports_summary_table.html
+++ b/submissions/templates/partials/submissions/pool/submission_reports_summary_table.html
@@ -24,11 +24,11 @@
</td>
<td>
{% if report.is_vetted %}
- <i class="fa fa-check-circle text-success"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>
{% elif report.is_rejected %}
- <i class="fa fa-times-circle text-danger"></i>
+ <span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% elif report.is_unvetted %}
- <i class="fa fa-exclamation-triangle text-warning"></i>
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span>
{% endif %}
{{ report.get_status_display }}
{% if report.is_unvetted %}
diff --git a/submissions/templates/partials/submissions/pool/submission_tooltip.html b/submissions/templates/partials/submissions/pool/submission_tooltip.html
index 1da797a50e06db9c6f547fb9a0b3b60977d34a76..e16bb8a9425b5b9d3197c0d8b4e1f94a37afffdb 100644
--- a/submissions/templates/partials/submissions/pool/submission_tooltip.html
+++ b/submissions/templates/partials/submissions/pool/submission_tooltip.html
@@ -1,2 +1,2 @@
-<i class="fa fa-info-circle" data-toggle="tooltip" data-html="true"
- title="{{ submission.preprint.identifier_w_vn_nr }}<hr>Status: {{submission.get_status_display}}<br>Latest activity: {{submission.latest_activity}}"></i>
+<span data-toggle="tooltip" data-html="true"
+ title="{{ submission.preprint.identifier_w_vn_nr }}<hr>Status: {{ submission.get_status_display }}<br>Latest activity: {{ submission.latest_activity }}">{% include 'bi/info-circle-fill.html' %}</span>
diff --git a/submissions/templates/partials/submissions/recommendation_author_content.html b/submissions/templates/partials/submissions/recommendation_author_content.html
index 5cec245aa0dc650be230bdf0d638af569f43fbb6..b7d5a9046bf9de6c426df28dfb588b75ae7bdcaa 100644
--- a/submissions/templates/partials/submissions/recommendation_author_content.html
+++ b/submissions/templates/partials/submissions/recommendation_author_content.html
@@ -1,7 +1,7 @@
<div class="border px-3 py-2 my-3" id="rec-{{ recommendation.id }}">
<div class="mb-4 {% if not recommendation.active %}pt-2{% endif %}">
- {% if recommendation.is_deprecated %}<h4 class="mb-0"><i class="fa fa-exclamation-circle text-danger"></i> Deprecated</h4>{% endif %}
+ {% if recommendation.is_deprecated %}<h4 class="mb-0"><span class="text-danger">{% include 'bi/exclamation-circle-fill.html' %}</span> Deprecated</h4>{% endif %}
<h2 class="my-2">Editorial Recommendation</h2>
{% block recommendation_header %}
<h4 class="text-muted mb-2">Date {{ recommendation.date_submitted }}</h4>
diff --git a/submissions/templates/partials/submissions/refereeing_status_as_tr.html b/submissions/templates/partials/submissions/refereeing_status_as_tr.html
index 83e3d005468b9aa6dae4c56468669c763b740092..0d1bf8702e1466f8729583b5ce69382f111f68fa 100644
--- a/submissions/templates/partials/submissions/refereeing_status_as_tr.html
+++ b/submissions/templates/partials/submissions/refereeing_status_as_tr.html
@@ -1,12 +1,12 @@
{% if submission.refereeing_cycle != 'direct_rec' %}
<tr>
<td>Referees invited</td>
- <td>{{ submission.referee_invitations.count }} <small><span class="fa fa-info-circle" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{ submission.referee_invitations.accepted.count }} accepted<br>{{ submission.referee_invitations.declined.count }} declined<br>{{ submission.referee_invitations.pending.count }} response pending"></span></small>
+ <td>{{ submission.referee_invitations.count }} <small><span data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{ submission.referee_invitations.accepted.count }} accepted<br>{{ submission.referee_invitations.declined.count }} declined<br>{{ submission.referee_invitations.pending.count }} response pending">{% include 'bi/info-circle-fill.html' %}</span></small>
</td>
</tr>
<tr>
<td>Reports obtained</td>
- <td>{{ submission.reports.accepted.count }} <small><span class="fa fa-info-circle" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{ submission.reports.accepted.invited.count }} invited<br>{{ submission.reports.accepted.contributed.count }} contributed<hr>{{ submission.reports.awaiting_vetting.count }} awaiting vetting<br>{{ submission.reports.rejected.count }} rejected"></span></small>
+ <td>{{ submission.reports.accepted.count }} <small><span data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{ submission.reports.accepted.invited.count }} invited<br>{{ submission.reports.accepted.contributed.count }} contributed<hr>{{ submission.reports.awaiting_vetting.count }} awaiting vetting<br>{{ submission.reports.rejected.count }} rejected">{% include 'bi/info-circle-fill.html' %}</span></small>
</td>
</tr>
{% endif %}
diff --git a/submissions/templates/partials/submissions/refereeing_status_card.html b/submissions/templates/partials/submissions/refereeing_status_card.html
index a78c2ec8d503d746bd04fc10748657dadd7e3dca..91c56db10d5c05114b29b7c8707e66c37086be8e 100644
--- a/submissions/templates/partials/submissions/refereeing_status_card.html
+++ b/submissions/templates/partials/submissions/refereeing_status_card.html
@@ -10,20 +10,20 @@
{% elif invitation.accepted %}
<h3>Your Referee Invitation</h3>
<p>Thank you for agreeing to referee this Submission. The following checklist will guide you through the steps needed to complete your refereeing task.</p>
- <ul class="fa-ul">
- <li><i class="fa-li fa fa-check-square-o"></i>Accepted Invitation on {{ invitation.date_responded }}.</li>
+ <ul>
+ <li>{% include 'bi/check-square-fill.html' %} Accepted Invitation on {{ invitation.date_responded }}.</li>
<li>
{% if invitation.fulfilled %}
Thank you!
- <i class="fa-li fa fa-check-square-o"></i>Report submitted on {{ invitation.related_report.date_submitted }}.
+ {% include 'bi/check-square-fill.html' %} Report submitted on {{ invitation.related_report.date_submitted }}.
<ul class="list-style-none">
<li>Status: <span class="{% if invitation.related_report.status == 'vetted' %}text-success{% elif invitation.related_report.status == 'unvetted' %}text-danger{% endif %}">{{ invitation.related_report.get_status_display }}</span></li>
<li>Anonymous: {{ invitation.related_report.anonymous|yesno:'Yes,No' }}</li>
{% if invitation.related_report.doi_label %}<li>DOI: {{ invitation.related_report.doi_string }}</li>{% endif %}
</ul>
{% else %}
- <i class="fa-li fa fa-square-o"></i>
+ {% include 'bi/square.html' %}
{% if invitation.related_report.is_in_draft %}
You have a Report in draft, <a href="{% url 'submissions:submit_report' invitation.submission.preprint.identifier_w_vn_nr %}">finish your Report</a>.
{% else %}
diff --git a/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html b/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
index f3266fc459ee6cbc94ba64f786c7c060919132b8..38fe8d7901d58bf3ee767eb406a97b137b7001be 100644
--- a/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
+++ b/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
@@ -1,3 +1,3 @@
<button type="button" class="btn btn-link p-0" data-toggle="tooltip" data-html="true" title="In case of no response to initial invitation, reminders will be sent automatically after 2, then 4 weekdays (with cc to EIC).<br>If there is no response after a week, you (as EIC) will be notified.<br>If accepted, a reminder will be sent to the referee 1 week before deadline.">
- <i class="fa fa-info-circle"></i>
+ {% include 'bi/info-circle-fill.html' %}
</button>
diff --git a/submissions/templates/partials/submissions/report_content.html b/submissions/templates/partials/submissions/report_content.html
index e23223362e5a781efe37da4f85fa2d23467afd44..bb1fb456f4650c9ab4227f45f93ffeeea6caaaa6 100644
--- a/submissions/templates/partials/submissions/report_content.html
+++ b/submissions/templates/partials/submissions/report_content.html
@@ -38,7 +38,7 @@
<div class="row">
<div class="col-12">
<h3 class="highlight tight">Attachment</h3>
- <div class="pl-md-4"><i class="fa fa-download"></i> <a href="{{ report.get_attachment_url }}">Download attachment</a></div>
+ <div class="pl-md-4">{% include 'bi/download.html' %} <a href="{{ report.get_attachment_url }}">Download attachment</a></div>
<br>
</div>
</div>
diff --git a/submissions/templates/partials/submissions/report_public_without_comments.html b/submissions/templates/partials/submissions/report_public_without_comments.html
index 8aa8da2262d9c7f2fdcf565c9600080b204bb24f..6bb1086580412b464945978cf21d4ddf40245a99 100644
--- a/submissions/templates/partials/submissions/report_public_without_comments.html
+++ b/submissions/templates/partials/submissions/report_public_without_comments.html
@@ -15,7 +15,7 @@
Report {{report.report_nr}} by <a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
on {{ report.date_submitted|date:'Y-n-j' }}
{% if report.report_type == 'report_post_edrec' %}
- <small><label class="label label-outline-primary ml-2">Post-Editorial Recommendation Report</label> <i class="fa fa-question-circle-o text-primary" data-toggle="tooltip" data-placement="auto" data-html="true" title="Post-Editorial Reports are submitted after the Editorial Recommendation has been formulated.<br>Hence, they have not been part of the College's decision to Publish the Submission." aria-hidden="true"></i></small>
+ <small><label class="label label-outline-primary ml-2">Post-Editorial Recommendation Report</label> <span class="text-primary" data-toggle="tooltip" data-placement="auto" data-html="true" title="Post-Editorial Reports are submitted after the Editorial Recommendation has been formulated.<br>Hence, they have not been part of the College's decision to Publish the Submission." aria-hidden="true">{% include 'bi/question-circle-fill.html' %}</span></small>
{% endif %}
{% if report.invited %}
@@ -37,7 +37,7 @@
{% endif %}
{% if report.pdf_report %}
<li>
- <a href="{% url 'submissions:report_detail_pdf' report.submission.preprint.identifier_w_vn_nr report.report_nr %}" target="_blank"><i class="fa fa-download"></i> Download as PDF</a>
+ <a href="{% url 'submissions:report_detail_pdf' report.submission.preprint.identifier_w_vn_nr report.report_nr %}" target="_blank">{% include 'bi/download.html' %} Download as PDF</a>
</li>
{% endif %}
</ul>
@@ -89,7 +89,7 @@
on {{ report.date_submitted|date:'Y-n-j' }}
{% if report.report_type == 'report_post_edrec' %}
- <small><label class="label label-outline-primary ml-2">Post-Editorial Recommendation Report</label> <i class="fa fa-question-circle-o text-primary" data-toggle="tooltip" data-placement="auto" data-html="true" title="Post-Editorial Reports are submitted after the Editorial Recommendation has been formulated.<br>Hence, they have not been part of the College's decision to Publish the Submission." aria-hidden="true"></i></small>
+ <small><label class="label label-outline-primary ml-2">Post-Editorial Recommendation Report</label> <span class="text-primary" data-toggle="tooltip" data-placement="auto" data-html="true" title="Post-Editorial Reports are submitted after the Editorial Recommendation has been formulated.<br>Hence, they have not been part of the College's decision to Publish the Submission." aria-hidden="true">{% include 'bi/question-circle-fill.html' %}</span></small>
{% endif %}
{% if report.invited %}
@@ -105,7 +105,7 @@
{% endif %}
{% if report.pdf_report %}
<li>
- <a href="{% url 'submissions:report_detail_pdf' report.submission.preprint.identifier_w_vn_nr report.report_nr %}" target="_blank"><i class="fa fa-download"></i> Download as PDF</a>
+ <a href="{% url 'submissions:report_detail_pdf' report.submission.preprint.identifier_w_vn_nr report.report_nr %}" target="_blank">{% include 'bi/download.html' %} Download as PDF</a>
</li>
{% endif %}
</ul>
diff --git a/submissions/templates/partials/submissions/submission_author_information.html b/submissions/templates/partials/submissions/submission_author_information.html
index f8810e8759d91bf11e79099388f04b74962701ce..eee91ec2289f52ddadf886300e8cfb8ade209e27 100644
--- a/submissions/templates/partials/submissions/submission_author_information.html
+++ b/submissions/templates/partials/submissions/submission_author_information.html
@@ -2,7 +2,7 @@
<h3 class="highlight">
Author information
- <button type="button" class="btn btn-link p-0 text-muted" data-toggle="tooltip" data-title="You see this information because you are a verified author of this Submission."><i class="fa fa-question-circle"></i></button>
+ <button type="button" class="btn btn-link p-0 text-muted" data-toggle="tooltip" data-title="You see this information because you are a verified author of this Submission.">{% include 'bi/question-circle-fill.html' %}</button>
</h3>
<div id="authorinformation" class="mt-2">
@@ -31,10 +31,10 @@
<td>Submission is publicly available:</td>
<td>
{% if submission.visible_public %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">Available in public pages and search results.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">Only available for editors and authors.</span>
{% endif %}
</td>
@@ -43,10 +43,10 @@
<td>Submission is current version:</td>
<td>
{% if submission.is_current %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">This is the current version.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">This is not the current version.</span>
{% endif %}
</td>
diff --git a/submissions/templates/partials/submissions/submission_editorial_information.html b/submissions/templates/partials/submissions/submission_editorial_information.html
index 0fd3764eebbfb27c8a3a9fdaf4b23ccd00acaf1e..57e516f5b1e2f9a20f9de6e446be5c509832629f 100644
--- a/submissions/templates/partials/submissions/submission_editorial_information.html
+++ b/submissions/templates/partials/submissions/submission_editorial_information.html
@@ -48,10 +48,10 @@
<td>Submission is publicly available:</td>
<td>
{% if submission.visible_public %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">Available in public pages and search results.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">Only available for editors and authors.</span>
{% endif %}
</td>
@@ -60,10 +60,10 @@
<td>Submission is current version:</td>
<td>
{% if submission.is_current %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">This is the current version.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">This is not the current version.</span>
{% endif %}
</td>
diff --git a/submissions/templates/partials/submissions/submission_li.html b/submissions/templates/partials/submissions/submission_li.html
index 0c904ba9d139221f9e1c81d62f23763dcf7dbf6d..a5b1fb539dbdd146ea8fe9256a0202c4a622fd73 100644
--- a/submissions/templates/partials/submissions/submission_li.html
+++ b/submissions/templates/partials/submissions/submission_li.html
@@ -1,11 +1,11 @@
<div class="li submission">
- <h5 class="subject">
+ <h3 class="specialties">
<a href="{% url 'submissions:submissions' %}?field={{ submission.acad_field.slug }}" class="muted-link">{{ submission.acad_field }}</a>:
{% for specialty in submission.specialties.all %}
<a href="{% url 'submissions:submissions' %}?specialty={{ specialty.slug }}" class="muted-link">{{ specialty }}</a>
{% if not forloop.last %}<strong> • </strong>{% endif %}
{% endfor %}
- </h5>
+ </h3>
<h3 class="title"><a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a></h3>
<p class="authors">by {{ submission.author_list }}</p>
{% block card_footer %}{% endblock %}
diff --git a/submissions/templates/partials/submissions/submission_quick_actions.html b/submissions/templates/partials/submissions/submission_quick_actions.html
index 593e169082b464ca86a6d617a58f23c7a57a87bb..37c27e213b8723ba981270dd4255111e56da285e 100644
--- a/submissions/templates/partials/submissions/submission_quick_actions.html
+++ b/submissions/templates/partials/submissions/submission_quick_actions.html
@@ -26,7 +26,7 @@
<small class="text-danger">[deactivated]</small>
</h4>
{% if request.user.contributor in submission.authors_claims.all %}
- <i class="fa fa-exclamation-circle text-warning"></i> Authors are not allowed to submit a Report. Your authorship claim on this Submission is pending verification by our Editorial Administration.
+ <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Authors are not allowed to submit a Report. Your authorship claim on this Submission is pending verification by our Editorial Administration.
{% else %}
<div class="border bg-light p-2 mb-2">
The system flagged you as a potential author of this Submission. Please <a href="{% url 'scipost:claim_authorships' %}">clarify this here</a>. You are not allowed to contribute a Report until your (non-)authorship has been verified.
@@ -45,7 +45,7 @@
</li>
{% endif %}
{% elif unfinished_report_for_user %}
- <li><i class="fa fa-exclamation"></i> You have an unfinished report for this submission. You can <a href="{% url 'submissions:submit_report' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">finish your report here</a>.</li>
+ <li>{% include 'bi/exclamation-circle-fill.html' %} You have an unfinished report for this submission. You can <a href="{% url 'submissions:submit_report' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">finish your report here</a>.</li>
{% else %}
<li class="py-1">Reporting for this Submission is closed.</li>
{% endif %}
diff --git a/submissions/templates/partials/submissions/submission_summary.html b/submissions/templates/partials/submissions/submission_summary.html
index c90d48a4572fc2758b27d5e0281a896484f73468..c5d91c7d39dd399354124fe981181ac525c4f0db 100644
--- a/submissions/templates/partials/submissions/submission_summary.html
+++ b/submissions/templates/partials/submissions/submission_summary.html
@@ -23,7 +23,7 @@
<tr>
<td>Arxiv Link:</td>
<td>
- <a href="{{ submission.preprint.url }}" target="_blank">{{ submission.preprint.url }}</a> (<a href="{{ submission.preprint.citation_pdf_url }}" target="_blank">pdf</a>)
+ <a href="{{ submission.preprint.url }}" target="_blank" rel="noopener">{{ submission.preprint.url }}</a> (<a href="{{ submission.preprint.citation_pdf_url }}" target="_blank" rel="noopener">pdf</a>)
</td>
</tr>
{% elif submission.preprint.get_absolute_url %}
@@ -38,7 +38,7 @@
<tr>
<td>Code repository:</td>
<td>
- <a href="{{ submission.code_repository_url }}" target="_blank">{{ submission.code_repository_url }}</a>
+ <a href="{{ submission.code_repository_url }}" target="_blank" rel="noopener">{{ submission.code_repository_url }}</a>
</td>
</tr>
{% endif %}
@@ -46,7 +46,7 @@
<tr>
<td>Data repository:</td>
<td>
- <a href="{{ submission.data_repository_url }}" target="_blank">{{ submission.data_repository_url }}</a>
+ <a href="{{ submission.data_repository_url }}" target="_blank" rel="noopener">{{ submission.data_repository_url }}</a>
</td>
</tr>
{% endif %}
diff --git a/submissions/templates/partials/submissions/submission_topics.html b/submissions/templates/partials/submissions/submission_topics.html
index dda59495f649afe521c709ba38a01f688fa4f0ab..943a538c2503f4fc3e341c4fd4097cfd646613bc 100644
--- a/submissions/templates/partials/submissions/submission_topics.html
+++ b/submissions/templates/partials/submissions/submission_topics.html
@@ -12,7 +12,7 @@
<div>
{% for topic in submission.topics.all %}
- <span class="label label-secondary mb-2"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'submissions:submission_remove_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</span>
+ <span class="label label-secondary mb-2"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'submissions:submission_remove_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr slug=topic.slug %}"><span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span></a>{% endif %}</span>
{% empty %}
<div>No Topic has yet been associated to this Submission</div>
{% endfor %}
diff --git a/submissions/templates/partials/submissions/submission_topics_card.html b/submissions/templates/partials/submissions/submission_topics_card.html
index 52b3ba9b733372238878969d8294fda81b6ead7c..2f477549234879ffdfe4a513421909afd2568ed3 100644
--- a/submissions/templates/partials/submissions/submission_topics_card.html
+++ b/submissions/templates/partials/submissions/submission_topics_card.html
@@ -11,7 +11,7 @@
<div class="card-body">
<ul class="list-inline mb-0">
{% for topic in submission.topics.all %}
- <li class="list-inline-item p-1"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'submissions:submission_remove_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</li>
+ <li class="list-inline-item p-1"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'submissions:submission_remove_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr slug=topic.slug %}"><span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span></a>{% endif %}</li>
{% empty %}
<li class="list-inline-item">No Topic has yet been associated to this Submission</li>
{% endfor %}
diff --git a/submissions/templates/submissions/_guidelines_dl.html b/submissions/templates/submissions/_guidelines_dl.html
index 701aed4219ef18d6f74d45de9b2233fb8fa4c231..02fca634bd59ca352ff6e034212af6f551be4b52 100644
--- a/submissions/templates/submissions/_guidelines_dl.html
+++ b/submissions/templates/submissions/_guidelines_dl.html
@@ -8,23 +8,23 @@
<dt class="col-sm-6 col-md-5">Page</dt>
<dd class="col-sm-6 col-md-7"><em>... where you will find info on:</em></dd>
<dt class="col-sm-6 col-md-5">
- {% if 'colleges' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'colleges' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
<a href="{% url 'colleges:colleges' %}">Editorial Colleges</a></dt>
<dd class="col-sm-6 col-md-7"><em>Our Colleges and their Editorial Fellows</em></dd>
<dt class="col-sm-6 col-md-5">
- {% if 'by-laws' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'by-laws' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
<a href="{% url 'scipost:EdCol_by-laws' %}">Editorial College by-laws</a></dt>
<dd class="col-sm-6 col-md-7"><em>Official rules for all our editorial workflows</em></dd>
<dt class="col-sm-6 col-md-5">
- {% if 'journals_terms_and_conditions' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'journals_terms_and_conditions' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
<a href="{% url 'journals:journals_terms_and_conditions' %}">Journals Terms and Conditions</a></dt>
<dd class="col-sm-6 col-md-7"><em>Expectations, Open Access policy, license and copyright, author obligations, referee code of conduct, corrections and retractions</em></dd>
<dt class="col-sm-6 col-md-5">
- {% if '/terms_and_conditions' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if '/terms_and_conditions' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
<a href="{% url 'scipost:terms_and_conditions' %}">SciPost Terms and Conditions</a></dt>
<dd class="col-sm-6 col-md-7"><em>General terms and conditions pertaining to ownership, license to use, contributions, impermissible uses, etc.</em></dd>
<dt class="col-sm-6 col-md-5">
- {% if 'author_guidelines' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'author_guidelines' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
{% if journal %}
<a href="{% url 'journal:authoring' doi_label=journal.doi_label %}">Author guidelines</a>
{% else %}
@@ -34,13 +34,13 @@
<dd class="col-sm-6 col-md-7"><em>A simple guide on how to proceed as an author</em>
</dd>
<dt class="col-sm-6 col-md-5">
- {% if 'sub_and_ref_procedure' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'sub_and_ref_procedure' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
<a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a>
</dt>
<dd class="col-sm-6 col-md-7"><em>More details about submission procedure and refereeing protocols</em>
</dd>
<dt class="col-sm-6 col-md-5">
- {% if 'referee_guidelines' in request.path %}<i class="fa fa-arrow-circle-right text-success"></i>{% endif %}
+ {% if 'referee_guidelines' in request.path %}<span class="text-success">{% include 'bi/arrow-right-circle-fill.html' %}</span>{% endif %}
{% if journal %}
<a href="{% url 'journal:refereeing' doi_label=journal.doi_label %}">Referee guidelines</a>
{% else %}
diff --git a/submissions/templates/submissions/admin/submission_presassign_editors.html b/submissions/templates/submissions/admin/submission_presassign_editors.html
index e5cc5bb82a23450da5682d50bafd7bfb2c615a2b..408aa4b7377e61b72bce597241e944eb6913264c 100644
--- a/submissions/templates/submissions/admin/submission_presassign_editors.html
+++ b/submissions/templates/submissions/admin/submission_presassign_editors.html
@@ -70,7 +70,7 @@
<td>Number of <u data-toggle="tooltip" data-title="Red-label declines are declines with reason: 'Not interested enough' or 'SciPost should not even consider this paper'.">red-label declines</u>:</td>
<td>
{% if submission.editorial_assignments.declined_red.count >= 3 %}
- <span class="text-danger"><i class="fa fa-exclamation-triangle"></i> {{ submission.editorial_assignments.declined_red.count }}</span>
+ <span class="text-danger">{% include 'bi/exclamation-circle-fill.html' %} {{ submission.editorial_assignments.declined_red.count }}</span>
· <a href="{% url 'submissions:assignment_failed' submission.preprint.identifier_w_vn_nr %}">Close pre-screening: failure to find EIC</a>
{% else %}
{{ submission.editorial_assignments.declined_red.count }}
@@ -82,9 +82,9 @@
<td>Sending invitations in progress:</td>
<td>
{% if submission.is_sending_editorial_invitations %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
{% endif %}
</td>
</tr>
@@ -162,7 +162,7 @@
{% for form in formset %}
<tr>
<td class="actions">
- <a href="#" class="handle"><i class="fa fa-bars" aria-hidden="true"></i></a>
+ <a href="#" class="handle"><span aria-hidden="true">{% include 'bi/list.html' %}</span></a>
{% for field in form %}
{{ field }}
{% endfor %}
@@ -171,7 +171,7 @@
<strong>
{{ form.get_fellow }}
{% if form.instance.status != 'preassigned' %}
- <span data-toggle="tooltip" data-title="This fellow has already been invited. Therefore, this invitation will not be removed."><i class="fa fa-exclamation-circle text-danger" aria-hidden="true"></i></span>
+ <span data-toggle="tooltip" data-title="This fellow has already been invited. Therefore, this invitation will not be removed."><span class="text-danger" aria-hidden="true">{% include 'bi/exclamation-circle-fill.html' %}</span></span>
{% endif %}
</strong>
<br>
diff --git a/submissions/templates/submissions/admin/submission_prescreening.html b/submissions/templates/submissions/admin/submission_prescreening.html
index f5f2adfc0314c09613adbe76facafa3bb8e10f39..dee27a2adb68d88116279c06046e45c7d3caab3f 100644
--- a/submissions/templates/submissions/admin/submission_prescreening.html
+++ b/submissions/templates/submissions/admin/submission_prescreening.html
@@ -24,14 +24,14 @@
<p>{{submission.abstract}}</p>
<h3 class="mt-4">Pre-screening steps</h3>
- <ul class="fa-ul">
+ <ul>
<li>
- <i class="fa-li fa fa-check-square text-success"></i>
+ <span class="text-success">{% include 'bi/check-square-fill.html' %}</span>
<a href="{% url 'colleges:submission' submission.preprint.identifier_w_vn_nr %}">Manage Pool composition ({{ submission.fellows.count }} fellows)</a><br>
</li>
<li>
{% if submission.plagiarism_report %}
- <i class="fa-li fa fa-check-square text-success"></i>
+ <span class="text-success">{% include 'bi/check-square-fill.html' %}</span>
<a class="d-inline-block" href="{% url 'submissions:plagiarism' submission.preprint.identifier_w_vn_nr %}">Update plagiarism report</a>
<table>
<tr>
@@ -56,17 +56,17 @@
</tr>
</table>
{% else %}
- <i class="fa-li fa fa-square"></i>
+ {% include 'bi/square.html' %}
<a href="{% url 'submissions:plagiarism' submission.preprint.identifier_w_vn_nr %}">Run plagiarism check</a>
{% endif %}
</li>
<li>
{% if submission|has_editor %}
- <i class="fa-li fa fa-check-square text-success"></i><a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">See assigned editor-in-charge</a>
+ <span class="text-success">{% include 'bi/check-square-fill.html' %}</span><a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">See assigned editor-in-charge</a>
{% elif submission|has_preassignments %}
- <i class="fa-li fa fa-check-square text-success"></i><a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">See selected pre-assignments ({{ submission.editorial_assignments.all|length }} assignments)</a>
+ <span class="text-success">{% include 'bi/check-square-fill.html' %}</span><a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">See selected pre-assignments ({{ submission.editorial_assignments.all|length }} assignments)</a>
{% else %}
- <i class="fa-li fa fa-square"></i><a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">Select pre-assignments</a>
+ {% include 'bi/square.html' %}<a href="{% url 'submissions:editor_invitations' submission.preprint.identifier_w_vn_nr %}">Select pre-assignments</a>
{% endif %}
</li>
</ul>
diff --git a/submissions/templates/submissions/author_guidelines.html b/submissions/templates/submissions/author_guidelines.html
index 1655a6c1da68616d16f5793c6d54c746d9bceca3..9eed1291de4bec8de0d390116beb5a5d4afbddab 100644
--- a/submissions/templates/submissions/author_guidelines.html
+++ b/submissions/templates/submissions/author_guidelines.html
@@ -1,5 +1,6 @@
{% extends 'submissions/base.html' %}
+{% block meta_description %}{{ block.super }} Author Guidelines{% endblock meta_description %}
{% block pagetitle %}: author guidelines{% endblock pagetitle %}
{% load static %}
diff --git a/submissions/templates/submissions/editorial_workflow.html b/submissions/templates/submissions/editorial_workflow.html
index 51733fbf8a7776ee4656b3dcccb4a48ad3bd3fbc..f7d1f3b995562223fb117b94fd4a1d01faffdaf9 100644
--- a/submissions/templates/submissions/editorial_workflow.html
+++ b/submissions/templates/submissions/editorial_workflow.html
@@ -5,6 +5,7 @@
<span class="breadcrumb-item">Editorial Workflow Summary</span>
{% endblock %}
+{% block meta_description %}{{ block.super }} Editorial Workflow{% endblock meta_description %}
{% block pagetitle %}: Editorial Workflow Summary{% endblock pagetitle %}
{% load static %}
diff --git a/submissions/templates/submissions/pool/assignments.html b/submissions/templates/submissions/pool/assignments.html
index 1e209ab16ef6333ae769824fce7c78fcbf414d65..7a133ef4341404d459f65db6799728a3ef4ee382 100644
--- a/submissions/templates/submissions/pool/assignments.html
+++ b/submissions/templates/submissions/pool/assignments.html
@@ -10,7 +10,7 @@
{% block content %}
{% if assignments_to_consider %}
- <h1>Your open Assignment Requests <i class="fa fa-exclamation-circle text-warning"></i></h1>
+ <h1>Your open Assignment Requests <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h1>
<h3 class="pt-0 mb-2">Can you act as Editor-in-charge? (click to see details)</h3>
<ul>
{% for assignment in assignments_to_consider %}
diff --git a/submissions/templates/submissions/pool/editorial_page.html b/submissions/templates/submissions/pool/editorial_page.html
index 1517d5cb085b68f2ce089c8680d43b3d2786b019..dd9360c71a1391e495f659110d53618de187b867 100644
--- a/submissions/templates/submissions/pool/editorial_page.html
+++ b/submissions/templates/submissions/pool/editorial_page.html
@@ -151,10 +151,10 @@
<td>Publicly available:</td>
<td>
{% if submission.visible_public %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">Available in public pages and search results.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">Only available for editors and authors.</span>
{% endif %}
</td>
@@ -185,10 +185,10 @@
<td>Open for commenting:</td>
<td>
{% if submission.open_for_commenting %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">Open for commenting.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">Commenting closed.</span>
{% endif %}
</td>
@@ -197,10 +197,10 @@
<td>Open for refereeing:</td>
<td>
{% if submission.is_open_for_reporting %}
- <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+ <span class="text-success" aria-hidden="true">{% include 'bi/check-circle-fill.html' %}</span>
<span class="text-muted">Open for refereeing. Deadline: {{ submission.reporting_deadline|date:"SHORT_DATE_FORMAT" }}.</span>
{% else %}
- <i class="fa fa-times-circle text-danger" aria-hidden="true"></i>
+ <span class="text-danger" aria-hidden="true">{% include 'bi/x-circle-fill.html' %}</span>
<span class="text-muted">
Refereeing closed.
{% if submission.referee_invitations.exists %}
@@ -212,12 +212,12 @@
{% if submission.in_refereeing_phase %}
{% if submission.reporting_deadline_has_passed %}
<div class="mt-2 p-2 border">
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
<strong>The reporting deadline has passed.</strong>
</div>
{% elif submission.reporting_deadline_approaching %}
<div class="mt-2 p-2 border">
- <i class="fa fa-exclamation-triangle text-warning"></i>
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span>
The reporting deadline is in {{ submission.reporting_deadline|timeuntil }}.
</div>
{% endif %}
@@ -291,9 +291,9 @@
<div class="my-5 p-3 border{% if submission.cycle.has_required_actions %} border-danger{% endif %}" id="required-actions" {% if submission.cycle.has_required_actions %}style="border-width: 2px !important;"{% endif %}>
<h3>
{% if submission.cycle.has_required_actions %}
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
{% else %}
- <i class="fa fa-check-circle"></i>
+ {% include 'bi/check-circle-fill.html' %}
{% endif %}
Required actions
</h3>
@@ -422,7 +422,7 @@
{% endif %}
{% if submission.referee_invitations.needs_attention.count %}
- <p><strong><i class="fa fa-exclamation-triangle text-warning"></i> {{ submission.referee_invitations.needs_attention.count }} refereeing invitation{{ submission.referee_invitations.needs_attention.count|pluralize }} need{{ submission.referee_invitations.needs_attention.count|pluralize:'s,' }} attention. See below.</strong></p>
+ <p><strong><span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> {{ submission.referee_invitations.needs_attention.count }} refereeing invitation{{ submission.referee_invitations.needs_attention.count|pluralize }} need{{ submission.referee_invitations.needs_attention.count|pluralize:'s,' }} attention. See below.</strong></p>
{% endif %}
{% if submission.eic_recommendation_required %}
@@ -459,7 +459,7 @@
{% else %}
{% if submission.reporting_deadline_has_passed and submission.eic_recommendation_required %}
<p>
- <i class="fa fa-exclamation-triangle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
<strong>The refereeing deadline has passed and you have received no Reports yet.</strong>
Please <a href="#reporting-deadline">extend the reporting deadline</a> and consider sending a reminder to your referees.
</p>
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 9a4b9a3a628d413e097088bd74e3580a1da8c8c9..80e9532533a3ccb5acc8fb11cabb3df3d8a375d8 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -47,7 +47,7 @@
<h2 class="text-primary">Administrative Tasks</h2>
{% if pre_screening_subs %}
- <h3>Submissions in pre-screening phase <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <h3>Submissions in pre-screening phase <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h3>
<ul>
{% for submission in pre_screening_subs %}
<li>
@@ -59,7 +59,7 @@
{% endif %}
{% if recommendations.voting_in_preparation %}
- <h3>Recommendations to prepare for voting <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <h3>Recommendations to prepare for voting <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h3>
<ul>
{% for recommendation in recommendations.voting_in_preparation %}
<li>
@@ -71,11 +71,11 @@
{% endif %}
{% if recommendations.put_to_voting %}
- <h3>Recommendations undergoing voting <i class="fa fa-exclamation-circle text-warning"></i></h3>
- <ul class="fa-ul">
+ <h3>Recommendations undergoing voting <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h3>
+ <ul>
{% for recommendation in recommendations.put_to_voting %}
<li>
- {% include 'partials/submissions/admin/recommendation_tooltip.html' with classes='fa-li' recommendation=recommendation %}
+ {% include 'partials/submissions/admin/recommendation_tooltip.html' with recommendation=recommendation %}
On Editorial Recommendation: {{ recommendation }}<br>
<a href="{% url 'submissions:eic_recommendation_detail' recommendation.submission.preprint.identifier_w_vn_nr %}">See Editorial Recommendation</a>
</li>
@@ -83,7 +83,7 @@
</ul>
{% endif %}
{% if latest_submission_events %}
- <button type="button" class="btn btn-link" data-toggle="toggle" data-target="#lastest_events_list"><i class="fa fa-comments-o"></i> View/hide latest events ({{ latest_submission_events|length }}) in the last 24 hours</button>
+ <button type="button" class="btn btn-link" data-toggle="toggle" data-target="#lastest_events_list">{% include 'bi/chat-right-text-fill.html' %} View/hide latest events ({{ latest_submission_events|length }}) in the last 24 hours</button>
<div id="lastest_events_list" style="display: none;">
{% include 'partials/submissions/submission_events_explicit.html' with events=latest_submission_events %}
</div>
@@ -95,7 +95,7 @@
{% if assignments_to_consider or recs_to_vote_on or recs_current_voted %}
{% if assignments_to_consider %}
- <h3>Your open Assignment Requests <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <h3>Your open Assignment Requests <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h3>
<ul>
{% for assignment in assignments_to_consider %}
<li>On submission: {{ assignment.submission }}<br>
@@ -106,7 +106,7 @@
{% endif %}
{% if recs_to_vote_on %}
- <h3>Recommendations to vote on <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <h3>Recommendations to vote on <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span></h3>
<ul>
{% for recommendation in recs_to_vote_on %}
<li>On Editorial Recommendation of: {{ recommendation.submission }}<br>
diff --git a/submissions/templates/submissions/pool/recommendation_formulate.html b/submissions/templates/submissions/pool/recommendation_formulate.html
index 7b4e93295fec78cee5249729944b3f5c9174f833..c3d444aca06c56e193f738b19399642359636ccc 100644
--- a/submissions/templates/submissions/pool/recommendation_formulate.html
+++ b/submissions/templates/submissions/pool/recommendation_formulate.html
@@ -50,7 +50,7 @@
{% if submission.editor_in_charge != request.user.contributor %}
<div class="border border-danger p-3">
- <i class="fa fa-exclamation-triangle text-warning" aria-hidden="true"></i>
+ <span class="text-warning" aria-hidden="true">{% include 'bi/exclamation-triangle-fill.html' %}</span>
You are not assigned as Editor in charge. However, you can formulate an Editorial Recommendation because you are Editorial Administrator. <strong>This Editorial Recommendation will still be signed by the Editor-in-charge.</strong>
</div>
{% endif %}
diff --git a/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html b/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
index e74270c29c75100a9143dda5d210f78a7470fc23..b9f1a38f97a2a5aed946fde001e22aa9b96bf40c 100644
--- a/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
+++ b/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
@@ -34,7 +34,7 @@
{% if submission.editor_in_charge != request.user.contributor %}
<div class="border border-danger p-3">
- <i class="fa fa-exclamation-triangle text-warning" aria-hidden="true"></i>
+ <span class="text-warning" aria-hidden="true">{% include 'bi/exclamation-triangle-fill.html' %}</span>
You are not assigned as Editor in charge. However, you can formulate an Editorial Recommendation because you are Editorial Administrator. <strong>This Editorial Recommendation will still be signed by the Editor-in-charge.</strong>
</div>
{% endif %}
diff --git a/submissions/templates/submissions/referee_guidelines.html b/submissions/templates/submissions/referee_guidelines.html
index dbb5d9bc1e0f17b0240dd10a7a6264e5d38fc820..cec84e898290db486caf0eb62eda66464d9b8df1 100644
--- a/submissions/templates/submissions/referee_guidelines.html
+++ b/submissions/templates/submissions/referee_guidelines.html
@@ -2,6 +2,7 @@
{% load static %}
+{% block meta_description %}{{ block.super }} Refereeing Guidelines{% endblock meta_description %}
{% block pagetitle %}: refereeing guidelines{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/submissions/templates/submissions/restart_refereeing.html b/submissions/templates/submissions/restart_refereeing.html
index 00bf370777fb2676ae2e86c5655e1dc378ad10cd..c4333916da57d2714815db3daae93b8bab3be675 100644
--- a/submissions/templates/submissions/restart_refereeing.html
+++ b/submissions/templates/submissions/restart_refereeing.html
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight"><i class="fa fa-exclamation-triangle text-warning"></i> Restart refereeing on Submission</h1>
+ <h1 class="highlight"><span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> Restart refereeing on Submission</h1>
<div class="mt-3 mb-4">
<h3 class="text-primary">{{ submission.title }}</h3>
<h3>by {{ submission.author_list }}</h3>
diff --git a/submissions/templates/submissions/select_referee.html b/submissions/templates/submissions/select_referee.html
index d69aa8b35ad881fabbf75a753fa3bb0b8817beaf..49eb9cc1cff58c1b5c603c9de237d9cd90619833 100644
--- a/submissions/templates/submissions/select_referee.html
+++ b/submissions/templates/submissions/select_referee.html
@@ -74,7 +74,7 @@
<div class="col-12">
{% if workdays_left_to_report < 15 %}
<div class="my-5 p-3 border border-danger" style="border-width: 2px !important;">
- <i class="fa fa-exclamation-triangle text-warning"></i>
+ <span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span>
<strong class="text-danger">
Warning: there are {{ workdays_left_to_report }} working days left before the refereeing deadline.
</strong>
@@ -100,11 +100,11 @@
{% for profile in profiles_found %}
<tr>
<td>{{ profile }}</td>
- <td>{% if profile.contributor %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- <td>{% if profile.email %}<i class="fa fa-check-circle text-success"></i> <span class="text-muted">{{ profile.email }}</span>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>{% if profile.contributor %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
+ <td>{% if profile.email %}<span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> <span class="text-muted">{{ profile.email }}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>{% endif %}</td>
<td>
{% if profile.accepts_refereeing_requests %}
- <i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span>{% else %}<span class="text-danger">{% include 'bi/x-circle-fill.html' %}</span>
{% endif %}
</td>
<td>
@@ -112,7 +112,7 @@
{% if profile.email %}
Send refereeing invitation <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=1 %}">with</a> or <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=0 %}">without</a> auto-reminders. {% include 'partials/submissions/refinv_auto_reminders_tooltip.html' %}
{% else %}
- <span class="text-danger">Cannot send an invitation without an email</span> <i class="fa fa-arrow-right"></i> Add one:
+ <span class="text-danger">Cannot send an invitation without an email</span> {% include 'bi/arrow-right.html' %} Add one:
<form class="form-inline" action="{% url 'profiles:add_profile_email' profile_id=profile.id %}" method="post">
{% csrf_token %}
{{ profile_email_form|bootstrap }}
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index 266d92b7f937b8289e758a6df70d0a5dacd07254..7dbb37818ed34d555e2f19a6d3a7d3cb8642e00e 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -1,5 +1,6 @@
{% extends 'submissions/base.html' %}
+{% block meta_description %}{{ block.super }} Submission and Refereeing Procedure{% endblock meta_description %}
{% block pagetitle %}: submission and refereeing procedure{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 0ab5f6bb044736a30bbfb2d89dcf2c4656cd66ef..1b5a389b993ef976b97642abebe3a1d8d081ec2d 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -5,6 +5,7 @@
{% load bootstrap %}
{% load automarkup %}
+{% block meta_description %}{{ block.super }} Submission Detail {{ submission.title }}{% endblock meta_description %}
{% block pagetitle %} Submission: {{ submission.title|truncatechars:40 }}{% endblock pagetitle %}
{% block breadcrumb_items %}
@@ -29,9 +30,9 @@
<div class="col-12">
<div class="border border-warning py-2 px-3 mb-3">
{% if request.user.contributor in submission.authors_claims.all %}
- <i class="fa fa-exclamation-circle text-warning"></i> Your authorship claim on this Submission is pending verification by our Editorial Administration.
+ <span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Your authorship claim on this Submission is pending verification by our Editorial Administration.
{% else %}
- <h3><i class="fa fa-exclamation-circle text-warning"></i> Please advise</h3>
+ <h3><span class="text-warning">{% include 'bi/exclamation-circle-fill.html' %}</span> Please advise</h3>
The system flagged you as a potential author of this Submission. Please <a href="{% url 'scipost:claim_authorships' %}">clarify this here</a>. Particular actions and information may be blocked until your authorship has been verified.
{% endif %}
</div>
@@ -43,7 +44,7 @@
{% if unfinished_report_for_user %}
<div class="w-100">
<div class="border border-warning py-2 px-3 mb-3">
- <h3><i class="fa fa-exclamation-circle"></i> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">finish your report here.</a></h3>
+ <h3>{% include 'bi/exclamation-circle-fill.html' %} You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">finish your report here.</a></h3>
</div>
</div>
{% endif %}
@@ -51,7 +52,7 @@
{% if is_author %}
<div class="w-100">
<div class="border py-2 px-3 mb-3">
- <i class="fa fa-check-circle text-success"></i> You are a verified author of this Submission.
+ <span class="text-success">{% include 'bi/check-circle-fill.html' %}</span> You are a verified author of this Submission.
</div>
</div>
{% endif %}
@@ -79,14 +80,14 @@
{% if unfinished_report_for_user %}
<h4>
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-circle-fill.html' %}</span>
You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">finish your report here.</a>
</h4>
{% endif %}
{% if not submission.is_current %}
<h4 class="text-danger">
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <span class="text-danger">{% include 'bi/exclamation-circle-fill.html' %}</span>
This is not the current version.
</h4>
{% endif %}
@@ -110,14 +111,14 @@
<strong>We are awaiting your response to the publication offer.</strong>
<br>
You can either accept it, or withdraw your manuscript.</p>
- <ul class="list-unstyled">
- <li class="list-item my-1">
- <a class="btn btn-primary" href="{% url 'submissions:accept_puboffer' submission.preprint.identifier_w_vn_nr %}">Accept offer for publication in {{ submission.editorial_decision.for_journal }} (one-click action)</a>
- </li>
- <li class="list-item my-1">
- <a class="btn btn-danger" href="{% url 'submissions:withdraw_manuscript' submission.preprint.identifier_w_vn_nr %}">Turn down offer and withdraw manuscript (leads to confirmation page)</a>
- </li>
- </ul>
+ <ul class="list-unstyled">
+ <li class="list-item my-1">
+ <a class="btn btn-primary" href="{% url 'submissions:accept_puboffer' submission.preprint.identifier_w_vn_nr %}">Accept offer for publication in {{ submission.editorial_decision.for_journal }} (one-click action)</a>
+ </li>
+ <li class="list-item my-1">
+ <a class="btn btn-danger" href="{% url 'submissions:withdraw_manuscript' submission.preprint.identifier_w_vn_nr %}">Turn down offer and withdraw manuscript (leads to confirmation page)</a>
+ </li>
+ </ul>
{% endif %}
{% endif %}
diff --git a/submissions/templates/submissions/submission_list.html b/submissions/templates/submissions/submission_list.html
index 79357998af8c24c750113623628016b9d231b405..681b82ffe3a42c3d910c9fee1256e625297343f6 100644
--- a/submissions/templates/submissions/submission_list.html
+++ b/submissions/templates/submissions/submission_list.html
@@ -4,6 +4,7 @@
{% load submissions_extras %}
{% load request_filters %}
+{% block meta_description %}{{ block.super }} Submissions List{% endblock meta_description %}
{% block pagetitle %}: Submissions{% endblock pagetitle %}
{% block breadcrumb_items %}
diff --git a/submissions/templates/submissions/submit_choose_journal.html b/submissions/templates/submissions/submit_choose_journal.html
index e5b181d52046bd787dbaca9c4f29d9a78a4eda54..2fcd43b40cf6a4105122e2cbd271727e69920daa 100644
--- a/submissions/templates/submissions/submit_choose_journal.html
+++ b/submissions/templates/submissions/submit_choose_journal.html
@@ -56,7 +56,7 @@
</div>
<div class="card-body text-center">
<a class="btn btn-outline-primary m-2" role="button" href="{{ journal.get_absolute_url }}/about" target="_blank"><em>View Description, Scope, Content and Acceptance Criteria</em></a>
- <a class="btn btn-primary m-2" role="button" href="{% url 'submissions:submit_choose_preprint_server' journal_doi_label=journal.doi_label %}{% if thread_hash %}?thread_hash={{ thread_hash }}{% endif %}"><i class="fa fa-arrow-right"></i> Submit to {{ journal.name }}</a>
+ <a class="btn btn-primary m-2" role="button" href="{% url 'submissions:submit_choose_preprint_server' journal_doi_label=journal.doi_label %}{% if thread_hash %}?thread_hash={{ thread_hash }}{% endif %}">{% include 'bi/arrow-right.html' %} Submit to {{ journal.name }}</a>
</div>
</div>
</div>
diff --git a/submissions/templates/submissions/submit_choose_preprint_server.html b/submissions/templates/submissions/submit_choose_preprint_server.html
index a61ab1eff6ad02db9ed7954e5207a551a18931e7..ef907942de2c4411899bac4375f6dd9ce864b14a 100644
--- a/submissions/templates/submissions/submit_choose_preprint_server.html
+++ b/submissions/templates/submissions/submit_choose_preprint_server.html
@@ -67,7 +67,7 @@
{% if thread_hash %}
<input type="hidden" name="thread_hash" value="{{ thread_hash }}"/>
{% endif %}
- <i class="fa fa-arrow-right"></i>
+ {% include 'bi/arrow-right.html' %}
<input type="submit" class="btn btn-primary text-white" value="Query arXiv"/>
</form>
{% endif %}
@@ -79,6 +79,6 @@
</div>
{% else %}
- <h3>You are currently not allowed to submit a manuscript.</h3>
+ <h3>You are currently not allowed to submit a manuscript.</h3>
{% endif %}
{% endblock content %}
diff --git a/submissions/templates/submissions/submit_manuscript.html b/submissions/templates/submissions/submit_manuscript.html
index cfa3517485becee236634e76f7f67b32f42fc59e..4652d08278cef74159606743d0426f0b28fbc3c6 100644
--- a/submissions/templates/submissions/submit_manuscript.html
+++ b/submissions/templates/submissions/submit_manuscript.html
@@ -51,7 +51,7 @@
<p><a href="{{ submission.get_absolute_url }}"><strong>{{ submission.title }}</strong></a></p>
<p>by {{ submission.author_list }}</p>
{% if not submission.open_for_resubmission %}
- <p class="bg-dark border-warning text-warning p-3 mb-0"><strong><i class="fa fa-warning text-danger"></i> This submission is still undergoing peer refereeing. Please wait until the closing of the previous refereeing round and formulation of the Editorial Recommendation before resubmitting.</strong></p>
+ <p class="bg-dark border-warning text-warning p-3 mb-0"><strong><span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span> This submission is still undergoing peer refereeing. Please wait until the closing of the previous refereeing round and formulation of the Editorial Recommendation before resubmitting.</strong></p>
{% else %}
{% if not request.user == submission.submitted_by.user %}
<p class="bg-dark p-2 text-white text-center">
@@ -63,7 +63,7 @@
<table class="table mb-0">
<tbody>
<tr><td class="bg-primary">
- <a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' acad_field=submission.acad_field.slug %}?thread_hash={{ submission.thread_hash }}"><i class="fa fa-arrow-right"></i> Resubmit this manuscript</a>
+ <a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' acad_field=submission.acad_field.slug %}?thread_hash={{ submission.thread_hash }}">{% include 'bi/arrow-right.html' %} Resubmit this manuscript</a>
</td></tr>
</tbody>
</table>
@@ -88,7 +88,7 @@
{% for acad_field in branch.academic_fields.all %}
{% if acad_field.journals.submission_allowed|length > 0 %}
<tr>
- <td class="bg-primary"><a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' acad_field=acad_field.slug %}"><i class="fa fa-arrow-right"></i> New submission in <strong>{{ acad_field }}</strong></a></td>
+ <td class="bg-primary"><a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' acad_field=acad_field.slug %}">{% include 'bi/arrow-right.html' %} New submission in <strong>{{ acad_field }}</strong></a></td>
</tr>
<tr><td></td></tr>
{% endif %}
diff --git a/submissions/templates/submissions/withdraw_manuscript.html b/submissions/templates/submissions/withdraw_manuscript.html
index 49717f0bf58c52002ab5e5180ac72bae8456aaa4..c45be6eb87b8ed1f124efce22342f8a7ba82a720 100644
--- a/submissions/templates/submissions/withdraw_manuscript.html
+++ b/submissions/templates/submissions/withdraw_manuscript.html
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight"><i class="fa fa-exclamation-triangle text-warning"></i> Withdraw Submission</h1>
+ <h1 class="highlight"><span class="text-warning">{% include 'bi/exclamation-triangle-fill.html' %}</span> Withdraw Submission</h1>
<div class="mt-3 mb-4">
<h3 class="text-primary">{{submission.title}}</h3>
<h3>by {{submission.author_list}}</h3>
diff --git a/templates/bi/arrow-left.html b/templates/bi/arrow-left.html
new file mode 100644
index 0000000000000000000000000000000000000000..1b8ffc19bd35bfd9949ac504f7c88e152b3151a9
--- /dev/null
+++ b/templates/bi/arrow-left.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-left" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z"/>
+</svg>
diff --git a/templates/bi/arrow-right-circle-fill.html b/templates/bi/arrow-right-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..7b5b207091ca2a5441b8052053c86d879e6dee19
--- /dev/null
+++ b/templates/bi/arrow-right-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-11.5.5a.5.5 0 0 1 0-1h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5z"/>
+</svg>
diff --git a/templates/bi/arrow-right.html b/templates/bi/arrow-right.html
new file mode 100644
index 0000000000000000000000000000000000000000..ab95671f3d59fa3e75929a6f46f36f7cd0720110
--- /dev/null
+++ b/templates/bi/arrow-right.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z"/>
+</svg>
diff --git a/templates/bi/caret-right-fill.html b/templates/bi/caret-right-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..51af5ed8da7f94c56b07bacf132be0e6760f89d2
--- /dev/null
+++ b/templates/bi/caret-right-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-caret-right-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M12.14 8.753l-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/>
+</svg>
diff --git a/templates/bi/chat-right-text-fill.html b/templates/bi/chat-right-text-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..7be4db1410ad9393f79a68c5f1b6b7e324e7be28
--- /dev/null
+++ b/templates/bi/chat-right-text-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-chat-right-text-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h9.586a1 1 0 0 1 .707.293l2.853 2.853a.5.5 0 0 0 .854-.353V2zM3.5 3a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1h-5z"/>
+</svg>
diff --git a/templates/bi/check-circle-fill.html b/templates/bi/check-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..d2709749b705d0ed138050e14af8d8aa87d6520c
--- /dev/null
+++ b/templates/bi/check-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
+</svg>
diff --git a/templates/bi/check-circle.html b/templates/bi/check-circle.html
new file mode 100644
index 0000000000000000000000000000000000000000..d51e5b8f18776ae734f9301980e366232ef38406
--- /dev/null
+++ b/templates/bi/check-circle.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check-circle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+ <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+</svg>
diff --git a/templates/bi/check-square-fill.html b/templates/bi/check-square-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..bdbc0b13f623a9c3fe087801d2493ee589a8d14c
--- /dev/null
+++ b/templates/bi/check-square-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check-square-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm10.03 4.97a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
+</svg>
diff --git a/templates/bi/check-square.html b/templates/bi/check-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..033c546a050b56bf1ca0960ccffbaeffa66f93be
--- /dev/null
+++ b/templates/bi/check-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+ <path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
+</svg>
diff --git a/templates/bi/circle-fill.html b/templates/bi/circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..74d403b1ef0bc45b70193d1d60d1503d2a13fd26
--- /dev/null
+++ b/templates/bi/circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="8"/>
+</svg>
diff --git a/templates/bi/code-square.html b/templates/bi/code-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..e8b253284706de3b1f05afff3a5a6d005da64535
--- /dev/null
+++ b/templates/bi/code-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-code-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+ <path fill-rule="evenodd" d="M6.854 4.646a.5.5 0 0 1 0 .708L4.207 8l2.647 2.646a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 0 1 .708 0zm2.292 0a.5.5 0 0 0 0 .708L11.793 8l-2.647 2.646a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708 0z"/>
+</svg>
diff --git a/templates/bi/download.html b/templates/bi/download.html
new file mode 100644
index 0000000000000000000000000000000000000000..15d275f121d2d7b1dd9e93ef8f06e4ab53150bda
--- /dev/null
+++ b/templates/bi/download.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
+ <path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
+</svg>
diff --git a/templates/bi/exclamation-circle-fill.html b/templates/bi/exclamation-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..5e4cabc46f827bfc32a49a65221ec4fc0690c253
--- /dev/null
+++ b/templates/bi/exclamation-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-exclamation-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8 4a.905.905 0 0 0-.9.995l.35 3.507a.552.552 0 0 0 1.1 0l.35-3.507A.905.905 0 0 0 8 4zm.002 6a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
+</svg>
diff --git a/templates/bi/exclamation-circle.html b/templates/bi/exclamation-circle.html
new file mode 100644
index 0000000000000000000000000000000000000000..39e0c86ba2fa2ff48c26041cc43b9b5c2e03d5bd
--- /dev/null
+++ b/templates/bi/exclamation-circle.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-exclamation-circle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+ <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/>
+</svg>
diff --git a/templates/bi/exclamation-square-fill.html b/templates/bi/exclamation-square-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..254779b8b33d6d58dd63f4608c52ef7e3e016ac5
--- /dev/null
+++ b/templates/bi/exclamation-square-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-exclamation-square-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6 4a.905.905 0 0 0-.9.995l.35 3.507a.552.552 0 0 0 1.1 0l.35-3.507A.905.905 0 0 0 8 4zm.002 6a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
+</svg>
diff --git a/templates/bi/exclamation-square.html b/templates/bi/exclamation-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..70d5561ffce6f8747e6967f412914d0a19da302b
--- /dev/null
+++ b/templates/bi/exclamation-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-exclamation-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+ <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/>
+</svg>
diff --git a/templates/bi/exclamation-triangle-fill.html b/templates/bi/exclamation-triangle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..b997310bb88b119117b368df55a62832d38f964a
--- /dev/null
+++ b/templates/bi/exclamation-triangle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1.0625em" height="1em" viewBox="0 0 17 16" class="bi bi-exclamation-triangle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5a.905.905 0 0 0-.9.995l.35 3.507a.552.552 0 0 0 1.1 0l.35-3.507A.905.905 0 0 0 8 5zm.002 6a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
+</svg>
diff --git a/templates/bi/exclamation-triangle.html b/templates/bi/exclamation-triangle.html
new file mode 100644
index 0000000000000000000000000000000000000000..89ec110db9c17d2654255946100a80cf292f7bd3
--- /dev/null
+++ b/templates/bi/exclamation-triangle.html
@@ -0,0 +1,4 @@
+<svg width="1.0625em" height="1em" viewBox="0 0 17 16" class="bi bi-exclamation-triangle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M7.938 2.016a.146.146 0 0 0-.054.057L1.027 13.74a.176.176 0 0 0-.002.183c.016.03.037.05.054.06.015.01.034.017.066.017h13.713a.12.12 0 0 0 .066-.017.163.163 0 0 0 .055-.06.176.176 0 0 0-.003-.183L8.12 2.073a.146.146 0 0 0-.054-.057A.13.13 0 0 0 8.002 2a.13.13 0 0 0-.064.016zm1.044-.45a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566z"/>
+ <path d="M7.002 12a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 5.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995z"/>
+</svg>
diff --git a/templates/bi/exclamation.html b/templates/bi/exclamation.html
new file mode 100644
index 0000000000000000000000000000000000000000..6975174bde6e830c2e1f307171e134c67a96782f
--- /dev/null
+++ b/templates/bi/exclamation.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-exclamation" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/>
+</svg>
diff --git a/templates/bi/house-fill.html b/templates/bi/house-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..aea1bfa2c2fe0d038a863111be9a5ee43d3019d3
--- /dev/null
+++ b/templates/bi/house-fill.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-house-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 3.293l6 6V13.5a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 13.5V9.293l6-6zm5-.793V6l-2-2V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5z"/>
+ <path fill-rule="evenodd" d="M7.293 1.5a1 1 0 0 1 1.414 0l6.647 6.646a.5.5 0 0 1-.708.708L8 2.207 1.354 8.854a.5.5 0 1 1-.708-.708L7.293 1.5z"/>
+</svg>
diff --git a/templates/bi/info-circle-fill.html b/templates/bi/info-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..4ea6cee22223abe2766981972dd8b8cabbb45b98
--- /dev/null
+++ b/templates/bi/info-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-info-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
+</svg>
diff --git a/templates/bi/link.html b/templates/bi/link.html
new file mode 100644
index 0000000000000000000000000000000000000000..636362df0b8099941ea8edca4db1fcc45cbd3ec7
--- /dev/null
+++ b/templates/bi/link.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-link" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M6.354 5.5H4a3 3 0 0 0 0 6h3a3 3 0 0 0 2.83-4H9c-.086 0-.17.01-.25.031A2 2 0 0 1 7 10.5H4a2 2 0 1 1 0-4h1.535c.218-.376.495-.714.82-1z"/>
+ <path d="M9 5.5a3 3 0 0 0-2.83 4h1.098A2 2 0 0 1 9 6.5h3a2 2 0 1 1 0 4h-1.535a4.02 4.02 0 0 1-.82 1H12a3 3 0 1 0 0-6H9z"/>
+</svg>
diff --git a/templates/bi/list.html b/templates/bi/list.html
new file mode 100644
index 0000000000000000000000000000000000000000..533fdacdc9f885944689a5ac1b64022c4ccd9a1f
--- /dev/null
+++ b/templates/bi/list.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-list" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2.5 11.5A.5.5 0 0 1 3 11h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 3h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5z"/>
+</svg>
diff --git a/templates/bi/paperclip.html b/templates/bi/paperclip.html
new file mode 100644
index 0000000000000000000000000000000000000000..57336ea01f5d1e6c9c1cf731b7106e1e8a2624fe
--- /dev/null
+++ b/templates/bi/paperclip.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-paperclip" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M4.5 3a2.5 2.5 0 0 1 5 0v9a1.5 1.5 0 0 1-3 0V5a.5.5 0 0 1 1 0v7a.5.5 0 0 0 1 0V3a1.5 1.5 0 1 0-3 0v9a2.5 2.5 0 0 0 5 0V5a.5.5 0 0 1 1 0v7a3.5 3.5 0 1 1-7 0V3z"/>
+</svg>
diff --git a/templates/bi/pencil-square.html b/templates/bi/pencil-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..2562f0a68fee97290b58abf912429c770153614d
--- /dev/null
+++ b/templates/bi/pencil-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M15.502 1.94a.5.5 0 0 1 0 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456l-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z"/>
+ <path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z"/>
+</svg>
diff --git a/templates/bi/plus-circle-fill.html b/templates/bi/plus-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..fe293ddbcd62afb001c43f6ff3f5c490709fada6
--- /dev/null
+++ b/templates/bi/plus-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-plus-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v3h-3a.5.5 0 0 0 0 1h3v3a.5.5 0 0 0 1 0v-3h3a.5.5 0 0 0 0-1h-3v-3z"/>
+</svg>
diff --git a/templates/bi/plus-circle.html b/templates/bi/plus-circle.html
new file mode 100644
index 0000000000000000000000000000000000000000..109876c0a12eab8bdf677c297e8fdaf2adc23021
--- /dev/null
+++ b/templates/bi/plus-circle.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-plus-circle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+ <path fill-rule="evenodd" d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>
+</svg>
diff --git a/templates/bi/plus-square-fill.html b/templates/bi/plus-square-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..45e3790f190b28ea698a567f682107201d899d08
--- /dev/null
+++ b/templates/bi/plus-square-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-plus-square-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5a.5.5 0 0 0-1 0v3h-3a.5.5 0 0 0 0 1h3v3a.5.5 0 0 0 1 0v-3h3a.5.5 0 0 0 0-1h-3v-3z"/>
+</svg>
diff --git a/templates/bi/plus-square.html b/templates/bi/plus-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..fbbf9a2084438214ad68960cbf119b08b50d9660
--- /dev/null
+++ b/templates/bi/plus-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-plus-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+ <path fill-rule="evenodd" d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>
+</svg>
diff --git a/templates/bi/plus.html b/templates/bi/plus.html
new file mode 100644
index 0000000000000000000000000000000000000000..6ac6591799ae58f01824accc625ad926db34a78b
--- /dev/null
+++ b/templates/bi/plus.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-plus" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>
+</svg>
diff --git a/templates/bi/question-circle-fill.html b/templates/bi/question-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..22b57d5325dc0c99ed916e3e5db0284e89248f03
--- /dev/null
+++ b/templates/bi/question-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-question-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.496 6.033a.237.237 0 0 1-.24-.247C5.35 4.091 6.737 3.5 8.005 3.5c1.396 0 2.672.73 2.672 2.24 0 1.08-.635 1.594-1.244 2.057-.737.559-1.01.768-1.01 1.486v.105a.25.25 0 0 1-.25.25h-.81a.25.25 0 0 1-.25-.246l-.004-.217c-.038-.927.495-1.498 1.168-1.987.59-.444.965-.736.965-1.371 0-.825-.628-1.168-1.314-1.168-.803 0-1.253.478-1.342 1.134-.018.137-.128.25-.266.25h-.825zm2.325 6.443c-.584 0-1.009-.394-1.009-.927 0-.552.425-.94 1.01-.94.609 0 1.028.388 1.028.94 0 .533-.42.927-1.029.927z"/>
+</svg>
diff --git a/templates/bi/question-circle.html b/templates/bi/question-circle.html
new file mode 100644
index 0000000000000000000000000000000000000000..cfb7c81c5f702f3f01ba4109841c7daced571d66
--- /dev/null
+++ b/templates/bi/question-circle.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-question-circle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+ <path d="M5.255 5.786a.237.237 0 0 0 .241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/>
+</svg>
diff --git a/templates/bi/reply-fill.html b/templates/bi/reply-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..b82eacfcf33183913420770563d4a99f4f693c54
--- /dev/null
+++ b/templates/bi/reply-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-reply-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M9.079 11.9l4.568-3.281a.719.719 0 0 0 0-1.238L9.079 4.1A.716.716 0 0 0 8 4.719V6c-1.5 0-6 0-7 8 2.5-4.5 7-4 7-4v1.281c0 .56.606.898 1.079.62z"/>
+</svg>
diff --git a/templates/bi/reply.html b/templates/bi/reply.html
new file mode 100644
index 0000000000000000000000000000000000000000..c9443db7455600ba6baa435bf22fc6b7f1cb59eb
--- /dev/null
+++ b/templates/bi/reply.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-reply" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M9.502 5.013a.144.144 0 0 0-.202.134V6.3a.5.5 0 0 1-.5.5c-.667 0-2.013.005-3.3.822-.984.624-1.99 1.76-2.595 3.876C3.925 10.515 5.09 9.982 6.11 9.7a8.741 8.741 0 0 1 1.921-.306 7.403 7.403 0 0 1 .798.008h.013l.005.001h.001L8.8 9.9l.05-.498a.5.5 0 0 1 .45.498v1.153c0 .108.11.176.202.134l3.984-2.933a.494.494 0 0 1 .042-.028.147.147 0 0 0 0-.252.494.494 0 0 1-.042-.028L9.502 5.013zM8.3 10.386a7.745 7.745 0 0 0-1.923.277c-1.326.368-2.896 1.201-3.94 3.08a.5.5 0 0 1-.933-.305c.464-3.71 1.886-5.662 3.46-6.66 1.245-.79 2.527-.942 3.336-.971v-.66a1.144 1.144 0 0 1 1.767-.96l3.994 2.94a1.147 1.147 0 0 1 0 1.946l-3.994 2.94a1.144 1.144 0 0 1-1.767-.96v-.667z"/>
+</svg>
diff --git a/templates/bi/rss-fill.html b/templates/bi/rss-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..8c7a2f643bb34e84b421f638c0e34794b8af5719
--- /dev/null
+++ b/templates/bi/rss-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-rss-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 1 0 2 0c0-5.523-4.477-10-10-10zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 1 0 2 0 6 6 0 0 0-6-6zm.5 7a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
+</svg>
diff --git a/templates/bi/search.html b/templates/bi/search.html
new file mode 100644
index 0000000000000000000000000000000000000000..c594895b98e2ade9ddd2f75de62f4916ebd5e2f7
--- /dev/null
+++ b/templates/bi/search.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
+ <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+</svg>
diff --git a/templates/bi/sort-down.html b/templates/bi/sort-down.html
new file mode 100644
index 0000000000000000000000000000000000000000..67046bdf5274c0fd5bd69623c00d9d7944799aa6
--- /dev/null
+++ b/templates/bi/sort-down.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-sort-down" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M3 2a.5.5 0 0 1 .5.5v10a.5.5 0 0 1-1 0v-10A.5.5 0 0 1 3 2z"/>
+ <path fill-rule="evenodd" d="M5.354 10.146a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L3 11.793l1.646-1.647a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm0-3a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm0-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm0 9a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5z"/>
+</svg>
diff --git a/templates/bi/sort-up.html b/templates/bi/sort-up.html
new file mode 100644
index 0000000000000000000000000000000000000000..284089b257702d92a765e498a02044371f0127c1
--- /dev/null
+++ b/templates/bi/sort-up.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-sort-up" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M3 13a.5.5 0 0 0 .5-.5v-10a.5.5 0 0 0-1 0v10a.5.5 0 0 0 .5.5z"/>
+ <path fill-rule="evenodd" d="M5.354 4.854a.5.5 0 0 0 0-.708l-2-2a.5.5 0 0 0-.708 0l-2 2a.5.5 0 1 0 .708.708L3 3.207l1.646 1.647a.5.5 0 0 0 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm0-3a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm0-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm0 9a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5z"/>
+</svg>
diff --git a/templates/bi/square.html b/templates/bi/square.html
new file mode 100644
index 0000000000000000000000000000000000000000..ba8ec1569c516ffb3223588bd267454100303fb5
--- /dev/null
+++ b/templates/bi/square.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+</svg>
diff --git a/templates/bi/sticky-fill.html b/templates/bi/sticky-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..cc35a48a0e26c67bdea78187fa18858f88815c47
--- /dev/null
+++ b/templates/bi/sticky-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-sticky-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2.5 1A1.5 1.5 0 0 0 1 2.5v11A1.5 1.5 0 0 0 2.5 15h6.086a1.5 1.5 0 0 0 1.06-.44l4.915-4.914A1.5 1.5 0 0 0 15 8.586V2.5A1.5 1.5 0 0 0 13.5 1h-11zm6 8.5v4.396c0 .223.27.335.427.177l5.146-5.146a.25.25 0 0 0-.177-.427H9.5a1 1 0 0 0-1 1z"/>
+</svg>
diff --git a/templates/bi/sticky.html b/templates/bi/sticky.html
new file mode 100644
index 0000000000000000000000000000000000000000..c64d2d5a46ec61d54251b4bbc187c217a03c240d
--- /dev/null
+++ b/templates/bi/sticky.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-sticky" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 0 1 2.5 1h11A1.5 1.5 0 0 1 15 2.5v6.086a1.5 1.5 0 0 1-.44 1.06l-4.914 4.915a1.5 1.5 0 0 1-1.06.439H2.5A1.5 1.5 0 0 1 1 13.5v-11zM2.5 2a.5.5 0 0 0-.5.5v11a.5.5 0 0 0 .5.5h6.086a.5.5 0 0 0 .353-.146l4.915-4.915A.5.5 0 0 0 14 8.586V2.5a.5.5 0 0 0-.5-.5h-11z"/>
+ <path fill-rule="evenodd" d="M9.5 9a.5.5 0 0 0-.5.5v5H8v-5A1.5 1.5 0 0 1 9.5 8h5v1h-5z"/>
+</svg>
diff --git a/templates/bi/trash-fill.html b/templates/bi/trash-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..3793136d77f708c2a2af992ec4cd3c838637267f
--- /dev/null
+++ b/templates/bi/trash-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-trash-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2.5 1a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1H3v9a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V4h.5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1H2.5zm3 4a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zM8 5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7A.5.5 0 0 1 8 5zm3 .5a.5.5 0 0 0-1 0v7a.5.5 0 0 0 1 0v-7z"/>
+</svg>
diff --git a/templates/bi/trash.html b/templates/bi/trash.html
new file mode 100644
index 0000000000000000000000000000000000000000..3226e9127205102cda0fd9e32aa7250491c9b9bb
--- /dev/null
+++ b/templates/bi/trash.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-trash" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+ <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+</svg>
diff --git a/templates/bi/x-circle-fill.html b/templates/bi/x-circle-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..b93a34b25e97c267cc5d9aa81dd9bed2f8c1a109
--- /dev/null
+++ b/templates/bi/x-circle-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x-circle-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
+</svg>
diff --git a/templates/bi/x-circle.html b/templates/bi/x-circle.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d453ee0ad7dfe33b193a2d97bb7c25feb58f286
--- /dev/null
+++ b/templates/bi/x-circle.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x-circle" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+ <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+</svg>
diff --git a/templates/bi/x-square-fill.html b/templates/bi/x-square-fill.html
new file mode 100644
index 0000000000000000000000000000000000000000..11e5ff17870895555e1ad70f27e3696fcf7e231e
--- /dev/null
+++ b/templates/bi/x-square-fill.html
@@ -0,0 +1,3 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x-square-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm3.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
+</svg>
diff --git a/templates/bi/x-square.html b/templates/bi/x-square.html
new file mode 100644
index 0000000000000000000000000000000000000000..457eb24cb287cfea7fbdbf2ceac56f7d51e4db1b
--- /dev/null
+++ b/templates/bi/x-square.html
@@ -0,0 +1,4 @@
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+ <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+</svg>
diff --git a/templates/partials/pagination.html b/templates/partials/pagination.html
index c0f9c4945d5037ce52a33dcb1e365db124d85655..daff71386bb6537b0f55f5824586775060420144 100644
--- a/templates/partials/pagination.html
+++ b/templates/partials/pagination.html
@@ -2,9 +2,9 @@
<div class="text-center">
{% if page_obj.has_previous %}
- <a class="" href="?{% url_replace page=page_obj.previous_page_number %}"><i class="fa fa-long-arrow-left" aria-hidden="true"></i> Previous</a>
+ <a class="" href="?{% url_replace page=page_obj.previous_page_number %}"><span aria-hidden="true">{% include 'bi/arrow-left.html' %}</span> Previous</a>
{% else %}
- <span class="text-muted"><i class="fa fa-long-arrow-left" aria-hidden="true"></i> Previous</span>
+ <span class="text-muted"><span aria-hidden="true">{% include 'bi/arrow-left.html' %}</span> Previous</span>
{% endif %}
{% if paginator and not page_obj.pages %}
@@ -35,8 +35,8 @@
{% endif %}
{% if page_obj.has_next %}
- <a class="" href="?{% url_replace page=page_obj.next_page_number %}">Next <i class="fa fa-long-arrow-right" aria-hidden="true"></i></a>
+ <a class="" href="?{% url_replace page=page_obj.next_page_number %}">Next <span aria-hidden="true">{% include 'bi/arrow-right.html' %}</span></a>
{% else %}
- <span class="text-muted">Next <i class="fa fa-long-arrow-right" aria-hidden="true"></i></span>
+ <span class="text-muted">Next <span aria-hidden="true">{% include 'bi/arrow-right.html' %}</span></span>
{% endif %}
</div>
diff --git a/templates/search/search.html b/templates/search/search.html
index d0a3f0c84584ff16f96b323f806dfbbe4dd6dfd3..16eae4a23eeb328037aed9eca6e475a29343e00d 100644
--- a/templates/search/search.html
+++ b/templates/search/search.html
@@ -3,6 +3,7 @@
{% load bootstrap %}
{% load extra_form_widgets %}
+{% block meta_description %}{{ block.super }} Search{% endblock meta_description %}
{% block pagetitle %} search{% if form.q.value %}: {{ form.q.value }}{% endif %}{% endblock pagetitle %}
{% block breadcrumb %}
@@ -18,85 +19,85 @@
{% block content %}
-<div class="row">
- <div class="col-md-4">
- <h1>Filter</h1>
- <form method="get">
- <div class="form-group">
- <label for="{{ form.q.auto_id }}">{{ form.q.label }}</label>
- <input type="text" name="{{ form.q.name }}" class="form-control form-control-lg" id="{{ form.q.auto_id }}" aria-describedby="search_help" placeholder="Search term" value="{{ form.q.value|default:'' }}" required="required">
- <small id="search_help" class="form-text text-muted">{{ form.q.help_text }}</small>
- </div>
+ <div class="row">
+ <div class="col-md-4">
+ <h1>Filter</h1>
+ <form method="get">
+ <div class="form-group">
+ <label for="{{ form.q.auto_id }}">{{ form.q.label }}</label>
+ <input type="text" name="{{ form.q.name }}" class="form-control form-control-lg" id="{{ form.q.auto_id }}" aria-describedby="search_help" placeholder="Search term" value="{{ form.q.value|default:'' }}" required="required">
+ <small id="search_help" class="form-text text-muted">{{ form.q.help_text }}</small>
+ </div>
- <div class="form-group">
- <label>Type</label>
- </div>
- <div class="form-group checkboxes auto-submit">
- {{ form.models|checkboxes_as_btn }}
- </div>
+ <div class="form-group">
+ <label>Type</label>
+ </div>
+ <div class="form-group checkboxes auto-submit">
+ {{ form.models|checkboxes_as_btn }}
+ </div>
- <label>Date from</label>
- <div class="form-row">
- {{ form.start }}
- </div>
+ <label>Date from</label>
+ <div class="form-row">
+ {{ form.start }}
+ </div>
- <label>Date until</label>
- <div class="form-row">
- {{ form.end }}
- </div>
+ <label>Date until</label>
+ <div class="form-row">
+ {{ form.end }}
+ </div>
- <div class="form-group pt-2">
+ <div class="form-group pt-2">
- <input type="submit" class="btn btn-primary" value="Search">
- <a href="{% url 'scipost:search' %}" class="btn btn-outline-danger ml-2">Reset</a>
- </div>
- </form>
- </div>
+ <input type="submit" class="btn btn-primary" value="Search">
+ <a href="{% url 'scipost:search' %}" class="btn btn-outline-danger ml-2">Reset</a>
+ </div>
+ </form>
+ </div>
- <div class="col-md-8">
- <h1 class="my-3 mt-md-0">Search results{% if results_count and query %} ({{ results_count }} found){% endif %}</h1>
+ <div class="col-md-8">
+ <h1 class="my-3 mt-md-0">Search results{% if results_count and query %} ({{ results_count }} found){% endif %}</h1>
- {# without this logic, an request without GET parameters would return *all* objects indexed by Haystack #}
- {% if query %}
- <ul class="list-group list-group-flush">
- {% for result in object_list %}
- <li class="list-group-item{% if result.content_type == 'journals.publication' %} border-0{% endif %}">
- {% if result.content_type == 'submissions.submission' %}
- {% include 'partials/submissions/search_card.html' with submission=result.object %}
- {% elif result.content_type == 'commentaries.commentary' %}
- {% include 'partials/commentaries/search_card.html' with commentary=result.object %}
- {% elif result.content_type == 'theses.thesislink' %}
- {% include 'partials/theses/search_card.html' with thesislink=result.object %}
- {% elif result.content_type == 'comments.comment' %}
- <div class="py-2">
- {% include 'partials/comments/search_card.html' with comment=result.object %}
- </div>
- {% elif result.content_type == 'journals.publication' %}
- <div class="card card-publication">
- {% include 'partials/journals/search_card.html' with publication=result.object %}
- </div>
- {% else %}
- <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
- {% endif %}
- </li>
- {% empty %}
- <p>Your search query did not return any result.</p>
- {% endfor %}
+ {# without this logic, an request without GET parameters would return *all* objects indexed by Haystack #}
+ {% if query %}
+ <ul class="list-group list-group-flush">
+ {% for result in object_list %}
+ <li class="list-group-item{% if result.content_type == 'journals.publication' %} border-0{% endif %}">
+ {% if result.content_type == 'submissions.submission' %}
+ {% include 'partials/submissions/search_card.html' with submission=result.object %}
+ {% elif result.content_type == 'commentaries.commentary' %}
+ {% include 'partials/commentaries/search_card.html' with commentary=result.object %}
+ {% elif result.content_type == 'theses.thesislink' %}
+ {% include 'partials/theses/search_card.html' with thesislink=result.object %}
+ {% elif result.content_type == 'comments.comment' %}
+ <div class="py-2">
+ {% include 'partials/comments/search_card.html' with comment=result.object %}
+ </div>
+ {% elif result.content_type == 'journals.publication' %}
+ <div class="card card-publication">
+ {% include 'partials/journals/search_card.html' with publication=result.object %}
+ </div>
+ {% else %}
+ <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+ {% endif %}
+ </li>
+ {% empty %}
+ <p>Your search query did not return any result.</p>
+ {% endfor %}
- {% if is_paginated %}
- <p>
- {% if page_obj.has_previous %}
- <a href="?q={{ query }}&page={{ page_obj.previous_page_number }}">Previous</a>
- {% endif %}
- Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
- {% if page_obj.has_next %}
- <a href="?q={{ query }}&page={{ page_obj.next_page_number }}">Next</a>
- {% endif %}
- </p>
- {% endif %}
- </ul>
- {% else %}
- <p>Your search query did not return any result.</p>
+ {% if is_paginated %}
+ <p>
+ {% if page_obj.has_previous %}
+ <a href="?q={{ query }}&page={{ page_obj.previous_page_number }}">Previous</a>
+ {% endif %}
+ Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+ {% if page_obj.has_next %}
+ <a href="?q={{ query }}&page={{ page_obj.next_page_number }}">Next</a>
+ {% endif %}
+ </p>
+ {% endif %}
+ </ul>
+ {% else %}
+ <p>Your search query did not return any result.</p>
{% endif %}
</div>
</div>
diff --git a/theses/templates/theses/_thesislink_card_content.html b/theses/templates/theses/_thesislink_card_content.html
index 93163e6a474284b1caa59725def279e6dc23cbe0..7d37452df408b9d84ef5fcff22b79988ad86cf5b 100644
--- a/theses/templates/theses/_thesislink_card_content.html
+++ b/theses/templates/theses/_thesislink_card_content.html
@@ -1,6 +1,6 @@
<div class="card-body px-0">
<div class="li thesis">
- <h5 class="subject">{{ thesislink.acad_field }}</h5>
+ <h3 class="specialties">{{ thesislink.acad_field }}</h3>
<ul class="list-inline">
{% for spec in thesislink.specialties.all %}
<li class="list-inline-item">{{ spec }}</li>
diff --git a/theses/templates/theses/_thesislink_information.html b/theses/templates/theses/_thesislink_information.html
index 7c63e5ab16503af757e1afb23b21ee6bc4081ce9..4b2472352cd304afc710b1a99a781ed49bde41fd 100644
--- a/theses/templates/theses/_thesislink_information.html
+++ b/theses/templates/theses/_thesislink_information.html
@@ -37,7 +37,7 @@
</tr>
{% endif %}
<tr>
- <td>URL: </td><td> </td><td><a href="{{ thesislink.pub_link }}" target="_blank">{{ thesislink.pub_link }}</a></td>
+ <td>URL: </td><td> </td><td><a href="{{ thesislink.pub_link }}" target="_blank" rel="noopener">{{ thesislink.pub_link }}</a></td>
</tr>
<tr>
<td>Degree granting institution: </td><td> </td><td>{{ thesislink.institution }}</td>
diff --git a/theses/templates/theses/thesis_detail.html b/theses/templates/theses/thesis_detail.html
index 010e84617a917890959aa6de0728b35d41c4c229..75a6a15ff11453a3c8e281f10643b8e5858a2257 100644
--- a/theses/templates/theses/thesis_detail.html
+++ b/theses/templates/theses/thesis_detail.html
@@ -2,6 +2,7 @@
{% load scipost_extras %}
+{% block meta_description %}{{ block.super }} Thesis detail {{ thesislink }}{% endblock meta_description %}
{% block pagetitle %}: Thesis Link detail{% endblock pagetitle %}
{% block content %}
diff --git a/theses/templates/theses/thesislink_list.html b/theses/templates/theses/thesislink_list.html
index 7d7af3cc3ec4aece666654ec2990853b06b8ebec..324a9aa12eb9fb192335b80179bb2f0857ca79f2 100644
--- a/theses/templates/theses/thesislink_list.html
+++ b/theses/templates/theses/thesislink_list.html
@@ -3,6 +3,7 @@
{% load bootstrap %}
{% load request_filters %}
+{% block meta_description %}{{ block.super }} Theses{% endblock meta_description %}
{% block pagetitle %}: Theses{% endblock pagetitle %}
{% block content %}
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index e414e0c56742a4a386ff14dd17d2041861fbb369..159747be7678925f89f37afb5fa3bb6138e1d4f4 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -12,7 +12,6 @@ module.exports = {
main: [
"tether",
"bootstrap-loader",
- "./scipost/static/scipost/assets/js/dynamic_loading.js",
"./scipost/static/scipost/assets/js/scripts.js",
],
homepage: [
@@ -22,6 +21,9 @@ module.exports = {
apimail: [
"./apimail/static/apimail/assets/vue/messages_table.js",
],
+ qr: [
+ "./scipost/static/scipost/assets/js/activate_qr.js",
+ ],
},
output: {
path: path_bundles,
@@ -108,4 +110,9 @@ module.exports = {
// 'vue$': 'vue/dist/vue.esm.js'
}
},
+ optimization: {
+ splitChunks: {
+ chunks: 'all',
+ },
+ },
}
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
index 1fbb5db9bff1899ff577a21189e38cdba504e8df..57a465796f3e4207298ddff90765e30cd1cc7379 100644
--- a/webpack.prod.config.js
+++ b/webpack.prod.config.js
@@ -10,13 +10,15 @@ module.exports = {
main: [
"tether",
"bootstrap-loader",
- "./scipost/static/scipost/assets/js/dynamic_loading.js",
"./scipost/static/scipost/assets/js/scripts.js",
],
homepage: [
"./scipost/static/scipost/assets/js/fader.js",
"./scipost/static/scipost/assets/js/newsticker.js",
],
+ qr: [
+ "./scipost/static/scipost/assets/js/activate_qr.js",
+ ],
},
output: {
path: path_bundles,
@@ -72,4 +74,9 @@ module.exports = {
}
]
},
+ optimization: {
+ splitChunks: {
+ chunks: 'all',
+ },
+ },
}
diff --git a/webpack.stag.config.js b/webpack.stag.config.js
index 4001e9d777b2c5d56dfeff3843529bf5c452f1d3..22ff9351ee7e75751452fd2ca0b9f778aec335a7 100644
--- a/webpack.stag.config.js
+++ b/webpack.stag.config.js
@@ -12,7 +12,6 @@ module.exports = {
main: [
"tether",
"bootstrap-loader",
- "./scipost/static/scipost/assets/js/dynamic_loading.js",
"./scipost/static/scipost/assets/js/scripts.js",
],
homepage: [
@@ -22,6 +21,9 @@ module.exports = {
apimail: [
"./apimail/static/apimail/assets/vue/messages_table.js",
],
+ qr: [
+ "./scipost/static/scipost/assets/js/activate_qr.js",
+ ],
},
output: {
path: path_bundles,
@@ -104,4 +106,9 @@ module.exports = {
// 'vue$': 'vue/dist/vue.esm.js'
}
},
+ optimization: {
+ splitChunks: {
+ chunks: 'all',
+ },
+ },
}
diff --git a/webpack.test.config.js b/webpack.test.config.js
index a6d59c3209bb7314b97380bec9053db22e4e77e0..54b4a15ef6fed9d58730d66b9359d2c991593483 100644
--- a/webpack.test.config.js
+++ b/webpack.test.config.js
@@ -10,13 +10,15 @@ module.exports = {
main: [
"tether",
"bootstrap-loader",
- "./scipost/static/scipost/assets/js/dynamic_loading.js",
"./scipost/static/scipost/assets/js/scripts.js",
],
homepage: [
"./scipost/static/scipost/assets/js/fader.js",
"./scipost/static/scipost/assets/js/newsticker.js",
],
+ qr: [
+ "./scipost/static/scipost/assets/js/activate_qr.js",
+ ],
},
output: {
path: path_bundles,
@@ -72,4 +74,9 @@ module.exports = {
}
]
},
+ optimization: {
+ splitChunks: {
+ chunks: 'all',
+ },
+ },
}