diff --git a/SciPost_v1/wsgi_staging.py b/SciPost_v1/wsgi_staging.py
new file mode 100644
index 0000000000000000000000000000000000000000..a78b524fd804bea5c24ce5b0a2615d48b206a71a
--- /dev/null
+++ b/SciPost_v1/wsgi_staging.py
@@ -0,0 +1,11 @@
+"""
+WSGI config for SciPost_v1 project on Staging (jdewit.webfactional.com).
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "SciPost_v1.settings.staging_release")
+
+application = get_wsgi_application()
diff --git a/commentaries/templates/commentaries/base.html b/commentaries/templates/commentaries/base.html
index 61d1457ba3b5e42318b32650a2adb8dff66d941b..d861de9cdc088e774345c078ee0b5d4fa36acb89 100644
--- a/commentaries/templates/commentaries/base.html
+++ b/commentaries/templates/commentaries/base.html
@@ -1,11 +1,13 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'commentaries:commentaries' %}" class="breadcrumb-item">Commentaries</a>
- {% endblock %}
+ <nav class="breadcrumb">
+ {% block breadcrumb_items %}
+ <a href="{% url 'commentaries:commentaries' %}" class="breadcrumb-item">Commentaries</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
diff --git a/journals/templates/journals/_base.html b/journals/templates/journals/_base.html
index 78399b2698c22707bb0e0cd4994d7d0b5db04ff1..bd692680e7e564e05329bdc90c1314e1ac27c0b5 100644
--- a/journals/templates/journals/_base.html
+++ b/journals/templates/journals/_base.html
@@ -6,19 +6,21 @@
{% block body_class %}{{block.super}} journals{% endblock %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside breadcrumb-nav">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block secondary_navbar %}
-<div class="container my-2 pb-0">
- <nav class="navbar navbar-secondary px-0 pt-3">
- <div>
+<div class="container mt-3">
+ <div class="row">
+ <div class="col journal">
<h2 class="banner d-inline-block mr-2"><a href="{% url 'scipost:landing_page' journal.doi_label %}">{{journal}}</a></h2>
<ul class="links">
{% if journal.active or request.user.is_staff %}
@@ -31,7 +33,7 @@
<li><a class="{% block link_class_physics_about %}{% endblock %}" href="{% url 'journal:about' journal.doi_label %}">About</a></li>
</ul>
</div>
- </nav>
+ </div>
</div>
{% endblock secondary_navbar %}
diff --git a/journals/templates/journals/add_author.html b/journals/templates/journals/add_author.html
index 23e924b7ee3d0660bb95f4908c36055bbea3d0e6..ab992648f64fb3493cddf54a540158efd4478983 100644
--- a/journals/templates/journals/add_author.html
+++ b/journals/templates/journals/add_author.html
@@ -3,15 +3,18 @@
{% block pagetitle %}: add author to publication{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
- <span class="breadcrumb-item active">Add author to publication</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
+ <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
+ <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <span class="breadcrumb-item active">Add author to publication</span>
+
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% load scipost_extras %}
diff --git a/journals/templates/journals/base_detail_page.html b/journals/templates/journals/base_detail_page.html
index 5881a76d967e44d57bdbbcadb0217a8ddd56b5ec..155fcd7887f84e1d181be2dd5d0c72b91ad06876 100644
--- a/journals/templates/journals/base_detail_page.html
+++ b/journals/templates/journals/base_detail_page.html
@@ -6,12 +6,16 @@
{% block body_class %}{{block.super}} journals{% endblock %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
+
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{% url 'scipost:publication_detail' publication.doi_label %}" class="breadcrumb-item">{{ publication.doi_label }}</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{% url 'scipost:publication_detail' publication.doi_label %}" class="breadcrumb-item">{{ publication.doi_label }}</a>
+ {% endblock %}
+
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
diff --git a/journals/templates/journals/create_citation_list_metadata.html b/journals/templates/journals/create_citation_list_metadata.html
index 292301ee572ebbf850624e07462cd3f5a4fb0d5c..637c12a0b10145671a88bede2d81522ed7fa8da0 100644
--- a/journals/templates/journals/create_citation_list_metadata.html
+++ b/journals/templates/journals/create_citation_list_metadata.html
@@ -3,15 +3,17 @@
{% block pagetitle %}: Create citation list metadata{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
- <span class="breadcrumb-item active">Create citation list metadata</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
+ <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
+ <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <span class="breadcrumb-item active">Create citation list metadata</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% load bootstrap %}
diff --git a/journals/templates/journals/create_funding_info_metadata.html b/journals/templates/journals/create_funding_info_metadata.html
index b11cb1c864927ebdb7abe0e66168c41295a256a2..3f5d9921bae52166335fbc2eb80f4f4d7f3180ba 100644
--- a/journals/templates/journals/create_funding_info_metadata.html
+++ b/journals/templates/journals/create_funding_info_metadata.html
@@ -3,15 +3,17 @@
{% block pagetitle %}: Create funding info metadata{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
- <span class="breadcrumb-item active">Create funding info metadata</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
+ <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
+ <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <span class="breadcrumb-item active">Create funding info metadata</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% load bootstrap %}
diff --git a/journals/templates/journals/create_metadata_xml.html b/journals/templates/journals/create_metadata_xml.html
index 02603da8d4dab8ef25ff0646321d0d3a77588f03..c99b48c8a289197ee1f1ffda7f77eec19e1ca6de 100644
--- a/journals/templates/journals/create_metadata_xml.html
+++ b/journals/templates/journals/create_metadata_xml.html
@@ -2,17 +2,18 @@
{% block pagetitle %}: Create metadata xml{% endblock pagetitle %}
-<<<<<<< HEAD
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
- <span class="breadcrumb-item active">Create metadata XML</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
+ <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
+ <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <span class="breadcrumb-item active">Create metadata XML</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% load bootstrap %}
diff --git a/journals/templates/journals/crossmark_policy.html b/journals/templates/journals/crossmark_policy.html
index a90fe2080f05d4723c6a099a022ae6f58aec526a..abe152d00be9a578dcef3f12d34df244d979965f 100644
--- a/journals/templates/journals/crossmark_policy.html
+++ b/journals/templates/journals/crossmark_policy.html
@@ -3,12 +3,14 @@
{% block pagetitle %}: SciPost Journals: Crossmark Policy{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <span class="breadcrumb-item">Crossmark Policy</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <span class="breadcrumb-item">Crossmark Policy</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 22541c9442cb8da12bcd4ec2299a063d9f462ca9..de1e80066fb283e867d99346edbe3e9e2879f199 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -3,25 +3,36 @@
{% block pagetitle %}: Journals{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="submenu">
- <span class="item">Our Journals:</span>
- {% for journal in journals %}
- {% if journal.active %}
- <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
- {% else %}
- <a href="{% url 'journal:about' journal.name %}" class="item">{{journal}}</a>
- {% endif %}
- {% endfor %}
- </nav>
+ <div class="container-outside header">
+ <div class="container">
+ <h1 class="highlight">SciPost Physics Journals</h1>
+ </div>
+ </div>
+
+ <div class="container-outside sub-nav lighter">
+ <div class="container">
+ <nav class="navbar sub-nav navbar-expand-lg">
+ <ul class="navbar-nav">
+ <li class="nav-item"><span class="nav-link">Our Journals:</span></li>
+ {% for journal in journals %}
+ <li class="nav-item">
+ {% if journal.active %}
+ <a href="{{journal.get_absolute_url}}" class="nav-link">{{journal}}</a>
+ {% else %}
+ <a href="{% url 'journal:about' journal.name %}" class="nav-link">{{journal}}</a>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </div>
+ </nav>
+ </div>
+ </div>
+
+
{% endblock %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Physics Journals</h1>
- </div>
-</div>
<div class="row">
<div class="col-12">
<h2>View and comment on current <a href="{% url 'submissions:submissions' %}">Submissions</a> <small>(login required)</small></h2>
diff --git a/journals/templates/journals/journals_terms_and_conditions.html b/journals/templates/journals/journals_terms_and_conditions.html
index b740e95b915637d56bb505435d3c0520a386a3c1..4cd8b4d0a43aff6aad6886ca75c37c149ec3b4bb 100644
--- a/journals/templates/journals/journals_terms_and_conditions.html
+++ b/journals/templates/journals/journals_terms_and_conditions.html
@@ -4,12 +4,14 @@
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <span class="breadcrumb-item">Terms and Conditions</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <span class="breadcrumb-item">Terms and Conditions</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/journals/templates/journals/metadata_xml_deposit.html b/journals/templates/journals/metadata_xml_deposit.html
index 5d3f4871132092d3ddce2e4bd263f27de49f76ac..a6e405b3c01252b3b7b659446258325597ad1f30 100644
--- a/journals/templates/journals/metadata_xml_deposit.html
+++ b/journals/templates/journals/metadata_xml_deposit.html
@@ -3,15 +3,17 @@
{% block pagetitle %}: metadata XML deposit{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
- <span class="breadcrumb-item active">Metadata XML deposit</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
+ <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
+ <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <span class="breadcrumb-item active">Metadata XML deposit</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/partners/templates/partners/_partners_page_base.html b/partners/templates/partners/_partners_page_base.html
index c0e00cd2a5c44e143ff7c344e02ff5ca39a03b3c..8b768d2798a691882848847cf556f8cb3914747f 100644
--- a/partners/templates/partners/_partners_page_base.html
+++ b/partners/templates/partners/_partners_page_base.html
@@ -1,13 +1,15 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'partners:dashboard' %}" class="breadcrumb-item">Partner Page</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'partners:dashboard' %}" class="breadcrumb-item">Partner Page</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
diff --git a/partners/templates/partners/supporting_partners.html b/partners/templates/partners/supporting_partners.html
index f67ff0b202c5029d9331d7f6399f3ffc1ebc3e34..10927c949783c45dab19b57e06500155c9d44be5 100644
--- a/partners/templates/partners/supporting_partners.html
+++ b/partners/templates/partners/supporting_partners.html
@@ -6,16 +6,25 @@
{% load scipost_extras %}
+
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <h1>SciPost Supporting Partners</h1>
+ </div>
+ </div>
+{% endblock %}
+
+
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Supporting Partners</h1>
- {% if perms.scipost.can_manage_SPB %}
+{% if perms.scipost.can_manage_SPB %}
+ <div class="row">
+ <div class="col-12">
<a href="{% url 'partners:dashboard' %}">Manage Partners</a>
- {% endif %}
+ </div>
</div>
-</div>
+{% endif %}
<div class="row">
<div class="col-12">
diff --git a/production/templates/production/base.html b/production/templates/production/base.html
index 9dbe1e96d72f246f9e72efd84824244d9c2f11f5..a5e8b2070f5f6e6e3743f3ef0e3ba696c4172cfa 100644
--- a/production/templates/production/base.html
+++ b/production/templates/production/base.html
@@ -1,13 +1,15 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'production:production' %}" class="breadcrumb-item">Production page</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'production:production' %}" class="breadcrumb-item">Production page</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index 67b14aebb660f6e677e7fb8e820338a89786ea26..c6a977bfc80f6313bf2b4b00941ba3a0ad0f4b30 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -5,8 +5,8 @@
// General variable structure
//
//
-$base-border-radius: 2px;
-$border-radius: 2px;
+$base-border-radius: 0;
+$border-radius: 0;
$border-radius-lg: 2px;
// Alert
@@ -17,12 +17,13 @@ $alert-padding-x: 0.75rem;
// Grid
//
$grid-gutter-width: 20px;
-$container-max-widths: (
- sm: 728px,
- md: 952px,
- lg: 1160px,
- xl: 1200px
-);
+// $container-max-widths: (
+// xs: ,
+// sm: 728px,
+// md: 720px,
+// lg: 960px,
+// xl: 1140px
+// );
// Colors
//
@@ -31,17 +32,19 @@ $scipost-lightblue: #6885c3;
$scipost-lightestblue: #d3e3f6;
$scipost-darkblue: #002b49;
$scipost-orange: #f6a11a;
-$scipost-white: #f9f9f9;
+// $scipost-white: #f9f9f9;
+$scipost-white: #f6f6f6;
$sidebar-border-color: #dfe0e4;
-$body-color: $scipost-darkblue;
-
// -- Bootstrap color codes
$white: #fff;
$blue: $scipost-lightblue; // Primary
$green: #6ebb6e;
$cyan: $scipost-lightestblue;
$yellow: $scipost-orange;
+$gray-100: $scipost-white;
+$gray-200: #e5e5e5;
+$gray-300: #dfdfdf;
$gray-600: #ccc;
$text-muted: #636c72;
// Others, now as default
@@ -50,6 +53,11 @@ $text-muted: #636c72;
// $gray-600: $gray-600; // Secondary
// $gray-800: $gray-800;
+// Body
+//
+$body-bg: $gray-100;
+$body-color: $scipost-darkblue;
+
// Alerts
//
@@ -57,18 +65,20 @@ $alert-border-radius: $base-border-radius;
// Cards
//
-
$card-border-radius: $base-border-radius;
+$card-bg: $gray-200;
+$card-border-color: $gray-200;
$card-spacer-x: 0.75rem;
$card-spacer-y: 0.5rem;
$card-shadow-color: #ccc;
$card-grey-border-bottom-color: #d0d1d5;
-$card-grey-border-color: #e5e6e9 #dfe0e4 $card-grey-border-bottom-color;
+$card-grey-bg: $gray-100;
+$card-grey-border-color: $scipost-lightblue $gray-100 $gray-100;
// breadcrumb
//
-$breadcrumb-bg: #f9f9f9;
+$breadcrumb-bg: $gray-100;
$breadcrumb-active-color: $scipost-darkblue;
$breadcrumb-divider-color: $scipost-orange;
@@ -129,7 +139,9 @@ $table-cell-padding: 0.25rem 0.5rem;
//
$navbar-light-color: $scipost-darkblue;
$navbar-light-hover-color: $scipost-darkblue;
-$nav-link-padding-y: 0.4rem;
+$navbar-padding-x: 0.3rem;
+$navbar-padding-y: 0.3rem;
+// $nav-link-padding-y: 0.4rem;
$input-border-radius: 0;
$btn-border-radius: $base-border-radius;
diff --git a/scipost/static/scipost/assets/css/_breadcrumb.scss b/scipost/static/scipost/assets/css/_breadcrumb.scss
index 4e3915ebcfbd361517c401b2fa6e389afcc6d538..633e86b5918e2f684f9b680841de16114693fd09 100644
--- a/scipost/static/scipost/assets/css/_breadcrumb.scss
+++ b/scipost/static/scipost/assets/css/_breadcrumb.scss
@@ -1,16 +1,16 @@
+.container-outside.breadcrumb-nav {
+ background-color: $gray-200;
+
+ .breadcrumb {
+ background-color: transparent;
+ }
+}
+
.breadcrumb {
- margin-top: -1.5rem;
- margin-bottom: 1.5rem;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
+ margin-bottom: 0;
white-space: nowrap;
overflow: auto;
-
- .container {
- width: 100%;
- display: flex;
- flex-wrap: nowrap;
- }
+ padding: 0.5rem 1.0rem;
.breadcrumb-item {
margin-bottom: 0;
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 88d0e81b789dd24376c3085b14a84ff452134474..ad7c1357f09bb4c59636abe1fe028532f06e667a 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -2,8 +2,9 @@
margin-bottom: 10px;
&.card-grey {
- background-color: #F4F4F4;
- border-color: $card-grey-border-color;
+ background-color: $card-grey-bg;
+ border: 0;
+ border-top: 3px solid $scipost-lightblue;
box-shadow: 0 1px 0 0 $card-shadow-color;
.card-header {
@@ -18,7 +19,7 @@
&.card-publication {
box-shadow: 0 1px 0 0 #ddd;
- border-color: #ddd;
+ border: 1px solid #ddd;
.card-header {
background-color: #eee;
@@ -75,7 +76,6 @@
.card-publication {
width: 100%;
- border-color: #f1f1f1;
&.card-grey {
background-color: #f8f8f8;
diff --git a/scipost/static/scipost/assets/css/_form.scss b/scipost/static/scipost/assets/css/_form.scss
index bfd15ced62c30b8de7bbcdd4edcc652ad5452517..9c191958d781f582c61e74e78362e292a377fe9b 100644
--- a/scipost/static/scipost/assets/css/_form.scss
+++ b/scipost/static/scipost/assets/css/_form.scss
@@ -53,32 +53,6 @@ input[type="file"] {
border-radius: 0.15rem;
}
-.search-nav-form {
- min-width: 260px;
-
- input {
- margin-right: 0 !important;
- outline: 0;
- line-height: 1.75;
- }
-
- input[name="q"] {
- border-right: 0;
- width: 200px;
- border-radius: $base-border-radius 0 0 $base-border-radius;
- }
-
- input[type="submit"] {
- background: #f4f4f4;
- width: 60px;
- text-align: center;
- border-radius: 0 $base-border-radius $base-border-radius 0;
-
- &:hover {
- background: #ddd;
- }
- }
-}
.form-group.checkboxes {
[type="checkbox"] {
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 1b588ba860c314f02a84144451264ecebcc3e91f..0b926b714fcdba25e55fbc2fd887b16e6cfc7e41 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -10,6 +10,10 @@
}
}
+.fa {
+ display: inline-block;
+}
+
.bg-transparent {
background-color: transparent;
}
@@ -36,9 +40,9 @@ footer .logos a {
padding: 0 0.25rem;
}
-body > .container {
- padding-bottom: 1.5rem;
-}
+// body > .container {
+// padding-bottom: 1.5rem;
+// }
.quote-border {
border-left: 3px solid $scipost-lightblue;
diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss
index 7b5c41d378921df7532013bb2938e9b4ce3d96eb..d601f5e6428c863f2c20c7618c5e118f66880ea1 100644
--- a/scipost/static/scipost/assets/css/_grid.scss
+++ b/scipost/static/scipost/assets/css/_grid.scss
@@ -7,13 +7,6 @@
margin-bottom: 1rem;
}
-.panel {
- padding: 0.75rem;
- height: 100%;
- background-color: #f4f4f4;
- border-bottom: 10px solid #fff;
-}
-
img {
max-width: 100%;
}
@@ -22,19 +15,25 @@ img {
display: none;
}
-// footer.footer {
-// position: fixed;
-// width: 100%;
-// bottom: 0;
-// }
-
footer.secondary {
color: $scipost-darkblue;
- background: transparent;
- border-top: 2px solid $scipost-darkblue;
+ background: $white;
+ border-top: 1px solid $scipost-darkblue;
text-align: center;
a {
color: $scipost-lightblue;
}
}
+
+
+.container-inner {
+ padding: $grid-gutter-width;
+ background-color: $white;
+}
+
+.container {
+ max-width: 1500px;
+ padding-left: 30px;
+ padding-right: 30px;
+}
diff --git a/scipost/static/scipost/assets/css/_homepage.scss b/scipost/static/scipost/assets/css/_homepage.scss
index 2940939bb54bee8eaa06fa6383e895e80e042b68..e3ef3e8f07570b317b56029b0c3d5dee54951f4d 100644
--- a/scipost/static/scipost/assets/css/_homepage.scss
+++ b/scipost/static/scipost/assets/css/_homepage.scss
@@ -1,25 +1,13 @@
.has-sidebar {
- .submenu {
- margin-bottom: 0;
- }
-
.content-wrapper {
display: flex;
flex-wrap: wrap;
position: relative;
}
- .container {
- position: relative;
- z-index: 2;
- float: left;
- width: calc(100% - 400px);
- min-height: 100%;
- }
-
.sidebar,
.main-panel {
- padding-top: 1.5rem;
+ padding-top: 0;
overflow: auto;
max-height: 100%;
height: 100%;
@@ -35,39 +23,31 @@
.sidebar {
width: 100%;
- border-top: 2px solid $card-grey-border-bottom-color;
- background-size: cover;
- background-position: center center;
- background-color: $white;
- border-left: 1px solid #ddd;
- position: relative;
- padding-top: 0.25rem;
padding-left: 1rem;
padding-right: 1rem;
- margin-top: 2rem;
-
.card {
- padding-top: 1rem;
- padding-bottom: 1rem;
- background: none;
- border: 0;
- margin-bottom: 0;
- box-shadow: none;
- border-radius: 0;
- border-bottom: 1px solid $card-grey-border-bottom-color;
- }
- .card:last-child {
- border-bottom: 0;
+ margin-bottom: 1rem;
}
+ }
+}
- .card-header,
- .card-body,
- .card-footer {
- border: 0;
- margin-left: 0;
- margin-right: 0;
- padding-left: 0;
- padding-right: 0;
+.granting-institutions > a {
+ width: 25%;
+ display: inline-block;
+ max-width: 100px;
+ padding: 0 0.25rem;
+}
+
+.supporting-partners ul {
+ height: 100px !important;
+ list-style: none;
+
+ li {
+ height: 100px !important;
+
+ img {
+ max-height: 100px !important;
+ width: auto !important;
}
}
}
@@ -77,26 +57,12 @@
.has-sidebar {
.main-panel {
width: calc(100% - 350px);
- padding-left: 1rem;
+ padding-left: 0;
padding-right: 1rem;
}
.sidebar {
width: 350px;
- border-top: 0;
- padding-bottom: 3rem;
- padding-left: 40px;
- margin-top: 0;
-
-
- &:before {
- content: '';
- left: 0;
- top: 0;
- position: absolute;
- height: 100%;
- width: 20px;
- background: $scipost-white;
- }
+ padding-right: 0;
}
}
}
@@ -109,8 +75,6 @@
.sidebar {
width: 400px;
- padding-left: 3rem;
- padding-right: 2rem;
}
}
}
diff --git a/scipost/static/scipost/assets/css/_nav.scss b/scipost/static/scipost/assets/css/_nav.scss
index a5e59525ef3c8b4ee262156b3af58e73b546fc0a..974bcde176520b2f82900249c0c8a030a514c39e 100644
--- a/scipost/static/scipost/assets/css/_nav.scss
+++ b/scipost/static/scipost/assets/css/_nav.scss
@@ -71,28 +71,3 @@ nav.main-nav {
.nav {
flex-wrap: nowrap;
}
-
-nav.submenu {
- margin-top: -1.5rem;
- margin-bottom: 1rem;
- padding: 0.75rem 1rem;
- background-color: $scipost-white;
- border-radius: 0;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
- display: flex;
- flex-wrap: nowrap;
- flex-direction: row;
- overflow-x: scroll;
-
- .item {
- padding: 0 0.5rem;
- white-space: nowrap;
- display: block;
- border-right: 2px solid #fff;
- }
- .item:first-child,
- .item:last-child {
- border-right: 0;
- }
-}
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 211d612f9d49f42ea5ea0de34305cc0f567830f8..4f083989c47b56b03f90f528b1144febbc7e8798 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -3,63 +3,79 @@
*
*/
.navbar {
- margin-bottom: 1.5rem;
- display: flex;
- flex-wrap: nowrap;
- overflow-x: scroll;
- &.main-nav {
- border-bottom: 1px solid #ddd;
+ .nav-item.active a,
+ a:hover {
+ text-decoration: underline;
}
- .nav-link {
- padding-right: .5rem;
- padding-left: .5rem;
- border: 1px solid transparent;
- border-radius: $card-border-radius;
- word-wrap: break-word;
- white-space: nowrap;
- -webkit-transition: all 0.1s ease-in-out;
- -o-transition: all 0.1s ease-in-out;
- transition: all 0.1s ease-in-out;
-
- @include hover-focus {
- background-color: $white;
+ .navbar-nav {
+ flex-direction: row;
+ overflow: scroll;
+ -ms-overflow-style: none;
+ -webkit-overflow-scrolling: touch;
+ overflow: -moz-scrollbars-none;
+
+ .nav-link {
+ padding-left: .5rem;
+ padding-right: .5rem;
+ white-space: nowrap;
}
}
+}
- .active > .nav-link {
- border-color: $scipost-darkblue;
- box-shadow: 0 1px 0 0 #ccc;
- }
+// Hide scrollbars... trying to
+::-webkit-scrollbar,
+::-webkit-scrollbar-button,
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track-piece,
+::-webkit-scrollbar-thumb,
+::-webkit-scrollbar-corner,
+::-webkit-resizer {
+ display: none;
+ background: rgba(0,0,0,0);
+ background-color: rgba(0,0,0,0);
+}
- .highlighted > .nav-link {
- background-color: rgba(255, 255, 255, 0.6);
- }
+.container-outside {
+ &.main-nav {
+ background-color: $scipost-lightblue;
- .navbar-nav {
- display: flex;
- flex-direction: row;
+ .navbar {
+ background-color: $scipost-lightblue;
+
+ a {
+ color: $white;
+ }
+ }
}
-}
-@media (min-width: 768px) {
- .navbar {
+ &.sub-nav {
+ background-color: $gray-200;
- .navbar-nav {
- margin-right: auto;
+ .navbar {
+ background-color: $gray-200;
+
+ a {
+ color: $scipost-lightblue;
+ }
}
- .nav-item {
- margin-right: 0.5rem;
+ span.nav-link {
+ color: #465d8e;
}
- [data-toggle="collapse"] {
- display: none;
+ &.lighter {
+ background-color: #f2f2f2;
+
+ .navbar {
+ background-color: #f2f2f2;
+ }
}
}
}
+
.navbar-scroll {
white-space: nowrap;
overflow-x: auto;
@@ -81,8 +97,6 @@
}
.navbar-secondary {
- margin-top: -0.75rem;
- margin-bottom: 0;
background-color: transparent;
> div {
@@ -94,25 +108,9 @@
.navbar-counter {
position: relative;
- .nav-link.notifications_container:hover {
- background-color: #fff;
- }
-
a.dropdown-toggle {
min-width: 45px;
}
-
- a:hover {
- text-decoration: none;
-
- .badge {
- background-color: $scipost-darkblue;
- }
-
- .fa-bell-o:before {
- content: "\f0f3";
- }
- }
}
.live_notify_badge {
@@ -125,47 +123,61 @@
display: none;
padding: 0.25em;
border-radius: 99px;
- border: 1px solid #f9f9f9;
+ border: 1px solid $white;
+ background-color: $white;
+ color: $scipost-lightblue;
}
-.notifications_container {
- .badge_link {
- color: $scipost-lightestblue;
-
- // &::after {
- // content: none;
- // }
- }
-
- .user {
- color: $scipost-darkblue;
- }
-
- .fa-inbox {
- vertical-align: bottom;
- margin: 0 0.25rem;
- min-width: 17px;
-
- &:before {
- font-size: 150%;
- }
+.search-nav-form {
+ display: none;
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: 100%;
+
+ input[name="q"] {
+ position: relative;
+ outline: none;
+ border-radius: 0;
+ font-size: 110%;
+ margin: 0 !important;
+ padding: 0.5rem 0.75rem;
+ height: 100%;
+ border: 6px solid $gray-800;
+ border-left-width: 8px;
+ width: 100px;
+ transition: 0.1s;
+ }
+
+ &:active input[name="q"],
+ &:focus input[name="q"],
+ &:hover input[name="q"],
+ input[name="q"]:active,
+ input[name="q"]:focus,
+ input[name="q"]:hover {
+ width: 200px;
+ }
+
+ [type="submit"] {
+ background-color: $gray-800;
+ color: $white;
+ border-radius: 0;
+ padding-left: 0.75rem;
+ padding-right: 0.75rem;
+ height: 100%;
+ position: relative;
+ }
+ [type="submit"]:hover {
+ background-color: $gray-700;
}
+}
- &.show .fa-inbox {
- color: $scipost-darkblue;
+@media (min-width: 992px) {
+ .search-nav-form {
+ display: flex;
}
- &.positive_count {
- .badge_link {
- color: $scipost-orange;
- }
-
- .user {
- color: $scipost-darkblue;
- }
-
- .live_notify_badge {
- display: inline-block;
- }
+ .nav-item.search-item {
+ display: none;
}
}
diff --git a/scipost/static/scipost/assets/css/_notifications.scss b/scipost/static/scipost/assets/css/_notifications.scss
index 8670e2f38dbbc8047210e2cf016255b074506a33..a607b5af07920ee0261f7ee60c0abd62e64e18ee 100644
--- a/scipost/static/scipost/assets/css/_notifications.scss
+++ b/scipost/static/scipost/assets/css/_notifications.scss
@@ -1,8 +1,36 @@
-.navbar-counter .nav-link:hover {
- background-color: $white;
+
+.notifications_container {
+ .badge_link {
+ color: $scipost-lightestblue;
+ }
+
+ .fa-inbox {
+ vertical-align: bottom;
+ margin: 0 0.25rem;
+ min-width: 17px;
+
+ &:before {
+ font-size: 150%;
+ }
+ }
+
+ &.show .fa-inbox {
+ color: $scipost-darkblue;
+ }
+
+ &.positive_count {
+ .fa {
+ color: $scipost-orange;
+ }
+
+ .live_notify_badge {
+ display: inline-block;
+ }
+ }
}
+
.popover-template {
display: none;
}
diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss
index fbe387a334e6b23a3e336d1cedcb3930c08a2171..52798b0cc849833716e0725dcdda5b0687be69a6 100644
--- a/scipost/static/scipost/assets/css/_type.scss
+++ b/scipost/static/scipost/assets/css/_type.scss
@@ -49,6 +49,23 @@ h5 {
font-weight: 300;
}
+.container-outside.header {
+ background-color: $gray-200;
+ // box-shadow: 0 1px 0 0 $card-shadow-color;
+
+ h1,
+ h2 {
+ padding: 15px;
+ background-color: $gray-200;
+ border-radius: $card-border-radius;
+ border: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+ // margin-bottom: 10px;
+ box-shadow: none;
+ }
+}
+
.highlight {
background-color: #f4f4f4;
border-radius: $card-border-radius;
@@ -112,6 +129,10 @@ hr.hr12 {
margin-bottom: 0;
}
+.fa {
+ min-width: 10px;
+ display: inline-block;
+}
.fa[data-toggle="tooltip"] {
font-size: 1.5em;
}
diff --git a/scipost/static/scipost/assets/css/scipost-physics.scss b/scipost/static/scipost/assets/css/scipost-physics.scss
index f7736c11633c6f614b3ee0fa5e93b90c67b93605..816d3a46be9e8b8e21cd44e3bc375fee10233b2b 100644
--- a/scipost/static/scipost/assets/css/scipost-physics.scss
+++ b/scipost/static/scipost/assets/css/scipost-physics.scss
@@ -1,26 +1,39 @@
-.journals .navbar-secondary ul.links {
- background-color: #ddd;
- display: inline-block;
- font-size: 16px;
- padding: 0;
- border-radius: $card-border-radius;
- border: 1px solid #c5c5c5;
- margin: 0;
- > li {
+
+.col.journal {
+ justify-content: flex-start;
+ flex-direction: row;
+ display: flex;
+
+ .banner {
+ white-space: nowrap;
+ }
+
+ .links {
+ background-color: #ddd;
display: inline-block;
+ font-size: 16px;
+ border-radius: $card-border-radius;
+ border: 1px solid #c5c5c5;
margin: 0;
- padding: 0.5rem;
+ width: 100%;
+ padding: 0;
+
+ > li {
+ display: inline-block;
+ margin: 0;
+ padding: 0.5rem;
- a {
- padding: 0.25rem 0.75rem;
- border-radius: $card-border-radius;
- display: block;
+ a {
+ padding: 0.25rem 0.75rem;
+ border-radius: $card-border-radius;
+ display: block;
- &.active {
- color: #002b49;
- background: rgba(255, 255, 255, 0.5);
- box-shadow: 0 1px 0 0 #ccc;
+ &.active {
+ color: #002b49;
+ background: rgba(255, 255, 255, 0.5);
+ box-shadow: 0 1px 0 0 #ccc;
+ }
}
}
}
diff --git a/scipost/static/scipost/assets/js/fader.js b/scipost/static/scipost/assets/js/fader.js
new file mode 100644
index 0000000000000000000000000000000000000000..70957cfdf1fe5ffd2e6a0d18a0b277793a81cfce
--- /dev/null
+++ b/scipost/static/scipost/assets/js/fader.js
@@ -0,0 +1,136 @@
+/* =========================================================
+
+// jquery.innerfade.js
+
+// Datum: 2008-02-14
+// Firma: Medienfreunde Hofmann & Baldes GbR
+// Author: Torsten Baldes
+// Mail: t.baldes@medienfreunde.com
+// Web: http://medienfreunde.com
+
+// based on the work of Matt Oakes http://portfolio.gizone.co.uk/applications/slideshow/
+// and Ralf S. Engelschall http://trainofthoughts.org/
+
+ *
+ * <ul id="news">
+ * <li>content 1</li>
+ * <li>content 2</li>
+ * <li>content 3</li>
+ * </ul>
+ *
+ * $('#news').innerfade({
+ * animationtype: Type of animation 'fade' or 'slide' (Default: 'fade'),
+ * speed: Fading-/Sliding-Speed in milliseconds or keywords (slow, normal or fast) (Default: 'normal'),
+ * timeout: Time between the fades in milliseconds (Default: '2000'),
+ * type: Type of slideshow: 'sequence', 'random' or 'random_start' (Default: 'sequence'),
+ * containerheight: Height of the containing element in any css-height-value (Default: 'auto'),
+ * runningclass: CSS-Class which the container get’s applied (Default: 'innerfade'),
+ * children: optional children selector (Default: null)
+ * });
+ *
+
+// ========================================================= */
+
+
+(function($) {
+
+ $.fn.innerfade = function(options) {
+ return this.each(function() {
+ $.innerfade(this, options);
+ });
+ };
+
+ $.innerfade = function(container, options) {
+ var settings = {
+ 'animationtype': 'fade',
+ 'speed': 'normal',
+ 'type': 'sequence',
+ 'timeout': 2000,
+ 'containerheight': 'auto',
+ 'runningclass': 'innerfade',
+ 'children': null
+ };
+ if (options)
+ $.extend(settings, options);
+ if (settings.children === null)
+ var elements = $(container).children();
+ else
+ var elements = $(container).children(settings.children);
+ if (elements.length > 1) {
+ $(container).css('position', 'relative').css('height', settings.containerheight).addClass(settings.runningclass);
+ for (var i = 0; i < elements.length; i++) {
+ $(elements[i]).css('z-index', String(elements.length-i)).css('position', 'absolute').hide();
+ };
+ if (settings.type == "sequence") {
+ setTimeout(function() {
+ $.innerfade.next(elements, settings, 1, 0);
+ }, settings.timeout);
+ $(elements[0]).show();
+ } else if (settings.type == "random") {
+ var last = Math.floor ( Math.random () * ( elements.length ) );
+ setTimeout(function() {
+ do {
+ current = Math.floor ( Math.random ( ) * ( elements.length ) );
+ } while (last == current );
+ $.innerfade.next(elements, settings, current, last);
+ }, settings.timeout);
+ $(elements[last]).show();
+ } else if ( settings.type == 'random_start' ) {
+ settings.type = 'sequence';
+ var current = Math.floor ( Math.random () * ( elements.length ) );
+ setTimeout(function(){
+ $.innerfade.next(elements, settings, (current + 1) % elements.length, current);
+ }, settings.timeout);
+ $(elements[current]).show();
+ } else {
+ alert('Innerfade-Type must either be \'sequence\', \'random\' or \'random_start\'');
+ }
+ }
+ };
+
+ $.innerfade.next = function(elements, settings, current, last) {
+ if (settings.animationtype == 'slide') {
+ $(elements[last]).slideUp(settings.speed);
+ $(elements[current]).slideDown(settings.speed);
+ } else if (settings.animationtype == 'fade') {
+ $(elements[last]).fadeOut(settings.speed);
+ $(elements[current]).fadeIn(settings.speed, function() {
+ removeFilter($(this)[0]);
+ });
+ } else
+ alert('Innerfade-animationtype must either be \'slide\' or \'fade\'');
+ if (settings.type == "sequence") {
+ if ((current + 1) < elements.length) {
+ current = current + 1;
+ last = current - 1;
+ } else {
+ current = 0;
+ last = elements.length - 1;
+ }
+ } else if (settings.type == "random") {
+ last = current;
+ while (current == last)
+ current = Math.floor(Math.random() * elements.length);
+ } else
+ alert('Innerfade-Type must either be \'sequence\', \'random\' or \'random_start\'');
+ setTimeout((function() {
+ $.innerfade.next(elements, settings, current, last);
+ }), settings.timeout);
+ };
+
+})(jQuery);
+
+// **** remove Opacity-Filter in ie ****
+function removeFilter(element) {
+ if(element.style.removeAttribute){
+ element.style.removeAttribute('filter');
+ }
+}
+
+(function($) {
+ // Start
+ $('#fader').innerfade({
+ timeout: 3000,
+ type: 'random_start',
+ });
+}(jQuery));
diff --git a/scipost/static/scipost/images/I4OC.png b/scipost/static/scipost/images/I4OC.png
new file mode 100644
index 0000000000000000000000000000000000000000..38fdce7659791f88e9145ac4cd1c7a9f6d860ff0
Binary files /dev/null and b/scipost/static/scipost/images/I4OC.png differ
diff --git a/scipost/static/scipost/images/Max-Planck-Gesellschaft.svg b/scipost/static/scipost/images/Max-Planck-Gesellschaft.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2dc201b9491c19f46ba25bb78162f85bfd702130
--- /dev/null
+++ b/scipost/static/scipost/images/Max-Planck-Gesellschaft.svg
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="351"
+ height="285"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="New document 1">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.7"
+ inkscape:cx="316.99623"
+ inkscape:cy="122.89305"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="733"
+ inkscape:window-height="680"
+ inkscape:window-x="402"
+ inkscape:window-y="126"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-767.36218)">
+ <g
+ id="layer1-1"
+ transform="matrix(0.60595555,0,0,0.60595555,-7.7714192,760.74914)">
+ <g
+ id="Layer_x0020_1"
+ style="fill:#007d7a;fill-rule:evenodd"
+ transform="matrix(3.543307e-5,0,0,3.543307e-5,-3.580221e-4,0.0069117)">
+ <g
+ id="_84203480"
+ style="fill:#007d7a">
+ <path
+ id="_49116176"
+ style="fill:#007d7a"
+ d="m 3075840,6074460 c 0,-2987740 2431210,-5418880 5419670,-5418880 2987730,0 5418680,2431140 5418680,5418880 0,2988460 -2430950,5418940 -5418680,5418940 -2988460,0 -5419670,-2430480 -5419670,-5418940 z m -155520,0 c 0,3074080 2501110,5574460 5575190,5574460 3074010,0 5575120,-2500380 5575120,-5574460 0,-3074010 -2501110,-5574470 -5575120,-5574470 -3074080,0 -5575190,2500460 -5575190,5574470 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48873840"
+ style="fill:#007d7a"
+ d="m 12158100,6981150 c -152240,141260 -367140,143360 -541140,258180 -79500,79500 -59650,170710 -27090,271260 64510,126980 39980,114160 -49590,144080 -210030,69900 -207930,299800 -460910,261660 -14270,4010 -73250,-25780 -37940,17030 27160,31890 37940,12890 91670,19000 89830,4670 123760,-32750 186890,-75560 89760,-76010 78840,-104550 190370,-157620 26440,-6780 91670,-25710 128370,-12820 24520,22420 25250,23080 29260,43460 -14270,61750 -103900,112780 -138690,133820 47680,34790 136060,93250 121060,142110 -20510,32550 -19130,38140 -54440,54980 -50240,24520 -150130,20380 -244630,-49590 -14270,4740 -29920,-27090 -69900,10990 91670,94490 220090,73250 239230,92390 19660,18940 -68720,133100 -72070,157620 -61950,163880 13610,314730 -19140,485250 -20320,132570 -60560,195760 -176560,280130 -214180,148090 -364380,190900 -603610,229700 -629330,42750 -1026320,-173340 -1478880,-511870 -453410,-338470 -626750,-517800 -768010,-708170 -2100,-78120 54980,-137310 6120,-221480 -40900,14270 -36760,67860 -61290,98440 -35310,49590 -118830,85620 -178670,79570 -186170,-63190 -196420,-282040 -313340,-407180 -249370,-246010 -319470,-600790 -186170,-897760 46820,-91730 131190,-180110 225620,-212800 116260,-18280 253510,-18280 329590,94500 89760,85750 145460,224970 167880,347940 36700,59180 -8150,127180 53070,176100 106670,10260 198330,36700 300990,-28540 76210,10260 86340,94500 144080,131190 l 101920,61230 c 108770,44710 248840,44710 340510,-34790 172090,-175910 134670,-357340 193860,-551860 164400,-145330 273160,-353390 271060,-556660 -10060,-124870 -54970,-254160 -129090,-378580 12170,-73910 53730,-129080 77400,-195040 21050,-12170 47680,-12170 70100,-16180 182750,-38800 348730,-204580 420010,-379300 l 16380,-16370 c 209310,-14210 469590,-88390 589860,-307040 25190,-94490 131190,-24530 197080,-47020 110880,-6050 221480,-67990 305200,-139340 24330,-8150 42810,18410 57730,30640 48930,163680 138690,321500 190380,488010 63130,124420 86270,243240 63130,370420 26500,194390 138030,377200 215430,573630 77590,207270 198530,415860 286910,629320 16170,85620 52870,153680 0,222920 z m 42810,-357530 c -147570,-340510 -313350,-632680 -434280,-975220 -86280,-123040 -36700,-253510 -47680,-385420 -54970,-204580 -141320,-362270 -222860,-561460 -23150,-57080 40710,-73250 63130,-114160 36700,-100540 10980,-213260 -34590,-309860 -18280,-55170 47480,-93770 34590,-150850 -1910,-88380 -79500,-148220 -141250,-195040 -92590,-133300 -135400,-203200 -250220,-323610 l 0,-23150 c 57740,-50960 104760,-139210 103380,-214700 -23150,-85620 -41430,-165780 -123760,-225690 -131190,-73390 -264290,41430 -368320,100610 -29200,20320 -43470,40900 -84370,37420 -26440,-9600 -53600,-19660 -82140,-29920 -26630,30580 -59840,63330 -99890,95150 l 127050,51690 c 4140,3490 6050,6050 6050,10920 0,1900 -1380,6110 -1380,9400 -8680,7500 -294870,258370 -294870,258370 -720,530 -515230,508260 -515230,508260 0,660 -146840,150330 -146840,150330 -1180,650 -457950,527330 -457950,527330 -239230,277370 -592760,731970 -804700,1064980 -110810,152230 -220960,321560 -323610,481950 -10780,17620 -31820,16180 -65230,12230 -22420,-2830 -46100,-4730 -66620,2040 0,0 660,0 660,0 l -4670,1250 c 1380,-530 2760,-530 4010,-1250 -116260,12890 -201160,51690 -291440,133100 -116920,138690 -176110,305910 -176110,486690 0,124420 27880,255540 84900,386730 -23810,70690 -78780,132640 -128370,187610 l -27880,30580 -35310,35320 c -22420,21110 -49060,46160 -67340,69960 l -2040,2110 -1440,3290 c -1910,7490 -3290,21760 19860,32680 l 5390,3350 6110,-1250 c 108050,-25910 176040,-107510 242000,-186290 0,0 41430,-47550 47480,-55040 10260,-1390 18480,4010 32020,16370 7500,6110 16180,11510 25780,16180 0,2820 0,5590 0,5590 0,0 -1380,35310 -1380,43460 -256130,252850 -464920,395480 -738090,555940 l -45570,26430 53070,5590 c 106130,10790 207400,-49120 305190,-106860 l 117580,-64570 c 108040,-55640 208590,-140530 306570,-222140 0,0 87530,-73450 97060,-81610 9600,2110 19660,13550 27160,23150 0,0 6250,6050 10260,10260 1380,2630 81610,161640 86340,171170 -18280,74840 -25780,150200 -25780,225690 0,163740 35320,327610 69970,487340 34590,157630 69910,319990 69910,479720 0,10920 0,21050 -660,31310 0,49580 -53600,114810 -99170,135860 -101990,17030 -226410,18470 -356880,19850 -160910,1190 -327410,2570 -455320,37220 -40700,4870 -88380,18420 -134480,31310 -44910,12160 -91860,25910 -135400,31360 l -4010,660 -5390,4010 -15650,10980 c -14270,8680 -32680,20320 -36690,41370 0,2100 -730,4010 -730,6110 0,11510 5390,25910 14990,34590 8880,9600 19670,13620 31310,13090 38600,0 82130,-16380 124220,-31300 29260,-10980 59840,-21770 87720,-26640 267250,-45440 559350,-36560 757880,-20380 97790,-1380 258180,-4670 315980,-144010 21040,-56430 28540,-108770 28540,-159080 0,-55630 -8750,-108700 -17560,-163670 l -17750,-135400 c -11510,-82140 -29270,-164400 -46170,-244630 -29920,-140600 -60500,-286060 -60500,-433560 0,-29920 1380,-59900 4020,-89820 2760,-4020 6040,-8160 10250,-8680 8160,-1390 23150,10780 35320,20380 13540,10060 27810,21040 43460,25060 17760,12820 37420,17030 55700,19130 25910,3290 39520,6780 47680,26440 10780,129080 55700,263040 99160,392850 29930,88900 60570,180770 80230,271060 35310,157170 70630,316830 70630,474520 0,93780 -12170,186830 -45440,278040 -68000,124870 -218130,124870 -362210,125600 l -43530,0 -354910,-21770 c -303810,-21770 -618340,-44190 -940630,7500 2110,0 -72000,8150 -72000,8150 -39990,6120 -77400,10980 -117650,1380 -14930,-12160 -27090,-32680 -27090,-55100 0,-6840 1380,-13620 4140,-20390 57810,-126980 86340,-241870 86340,-343790 0,-82330 -19130,-155720 -56550,-220960 -83510,-159730 -175250,-270400 -288160,-348000 -138690,-137960 -256790,-261000 -362200,-380480 -61090,-7500 -98510,-19860 -103380,-21110 l -13540,-4870 -61100,76220 c 79510,75360 153620,151570 243250,233180 137240,73920 248110,207210 346550,297700 119030,138490 147570,285990 122320,450450 -15460,194520 -193660,278690 -314530,407120 -49580,92390 -80230,203200 -12890,288820 43470,115010 227590,94500 250020,188930 50960,208130 411850,328340 482610,333070 69970,4870 142700,82990 142700,82990 143360,104690 331630,78780 430790,63850 98640,-14990 275400,65240 386800,48860 165120,-65960 301180,-35310 473080,-49580 540940,8150 1155460,-4010 1708570,65960 102650,-12170 224970,67330 321500,18410 25060,-41560 6120,-76220 0,-110810 -264420,-415990 -303740,-882820 -153610,-1335510 l 99160,5390 c 359640,39450 685880,-7500 1050190,-218190 182020,-100620 277900,-334980 269680,-505630 -6050,-110150 -44190,-240620 -25710,-357410 6770,-52340 40700,-131840 86270,-156370 18280,-10790 85620,-56430 106670,-114890 34650,-94430 -39330,-139340 -61100,-152230 58470,-23810 114160,-141980 61100,-234500 -33940,-36040 -74120,-180120 -78130,-226870 -12890,-68060 -14920,-137310 48930,-180780 143350,-75550 278690,-93970 428160,-159730 102650,-43000 155720,-149670 151580,-245540 l -61090,-209250 z m -5857170,3377820 c -18480,33410 -16370,55110 -24590,94430 -10260,18480 -61230,-6050 -77400,-16170 -63330,-34070 -59190,-16310 -77600,-75500 -10060,-39520 -9400,-85620 56550,-120210 40710,-23140 123040,-50960 149480,0 8150,34590 -32560,78780 -26440,117450 z m 349190,443160 c -84240,2040 -142700,-44190 -181300,-142700 -39530,-126460 -53070,-237130 -25910,-367670 8810,-15650 27090,-26560 39450,-21040 l 116920,-40180 c 39330,-15650 72080,-21040 109300,-12160 l 23140,23670 c -1440,68000 -18280,118300 -19660,181430 -6840,158550 -20380,206030 25060,356880 -16900,40180 -50840,21040 -87000,21770 z m 4814600,-5893210 c -11440,12170 -25710,26440 -44710,21700 -43470,-30580 -27290,-69240 -24530,-105940 8880,-8870 10260,-13540 24530,-13540 20380,-4210 31830,11440 39320,22420 12890,23680 15000,50830 5390,75360 z M 8183500,6469940 c 286720,-514440 634720,-960950 1007910,-1419760 l 522660,-594010 c 372330,-397520 784310,-805360 1241080,-1120610 57740,-32750 82790,-100610 141980,-53070 l 53720,49580 c 36040,40840 4740,157100 -32020,189650 -29920,24530 -58460,47680 -86940,71290 89040,88380 218130,256330 323410,365030 46300,47550 32030,97260 115010,135200 41430,19860 53600,65240 28540,104040 -73450,94490 -195760,80220 -292300,104750 -358920,79500 -648460,182020 -1045320,374440 -317350,168610 -570860,354770 -801220,643590 -87720,108770 -186360,191030 -259810,321500 -209250,268500 -375100,520620 -541600,797270 -59190,87000 -78120,130470 -161840,208590 -39980,38800 -76010,-41430 -101270,-69240 -2560,-2760 -4670,-6970 -6770,-9600 -8150,1440 -16830,-660 -25710,-6050 -22490,-29270 -92390,-41630 -79510,-92590 z m 3159630,-1986610 c -5390,99360 -137960,181500 -248830,212080 -46760,7490 -90290,4860 -132380,4860 -10980,-7430 -23140,-17030 -21760,-27940 7490,-46830 14990,-74710 18280,-116790 l 27160,-20520 c 97910,-19660 217470,-40710 316110,-66480 14270,2630 32550,1240 41420,14790 z m -1029660,259100 17750,-23150 c 80690,-38140 154870,-68060 243910,-93120 l 106660,-27810 c 28540,-25910 78120,-46960 107380,-10260 1380,137960 -101790,304460 -254750,367660 -48330,21040 -112190,27820 -169270,42280 -14270,-12360 -60560,13550 -74830,-21240 8880,-69240 35310,-172620 23150,-234360 z M 9219950,7193950 c -28540,16180 -276660,-78320 -247460,-52410 -59120,-63130 37420,-84370 -181430,-166500 l -53070,5390 c -6770,6120 -25780,16380 -45440,-10780 -2040,-33410 41430,-28670 54980,-69450 78120,-176030 34650,-312620 27160,-494770 l 57800,-149480 c 110080,-131910 109420,-150850 184190,-222860 74180,-104750 89830,-112970 189650,-198520 16380,-14270 46170,-25060 65960,-8880 46820,36690 49580,61220 63200,108040 23140,174000 -82340,293680 -209320,388180 -89830,77400 -176100,198530 -156440,317360 l 7500,7430 c 41560,-33930 93240,-54250 110800,-97260 68720,-153420 253510,-223520 356880,-356680 45570,-80160 17560,-218130 0,-310520 0,2570 135860,-64770 99170,-40900 64570,27160 56350,73390 87650,132570 61290,153620 55700,292830 -38070,426120 l -258170,322230 c -4020,163670 40700,375090 -115540,471690 z m 340500,-1559160 c -61950,28540 -125800,34650 -194390,2630 -17750,-23150 -74110,-42810 -51680,-77400 49650,-80950 133820,-147570 185510,-227070 l 24520,-12890 c 104560,-126320 270540,-233120 427510,-328340 l 94500,-41360 c 21040,-20390 69240,-63200 87650,-19010 4020,165130 -65950,341890 -223580,458680 -95150,70760 -136580,57210 -221680,62600 l -44190,78850 c -10060,39320 -44710,79500 -84170,103310 z m -869280,942660 -4140,116930 c -10790,106660 -59710,229700 -160260,288810 -59840,-14200 -38140,-86270 -53070,-135330 38800,-105940 112720,-194320 174660,-288820 8880,-6110 16900,-10120 25780,-6110 l 17030,24520 z m -1426530,4062190 c -41560,42810 -65230,23150 -107520,27290 -120930,-33400 -191550,-85090 -225490,-221680 -44910,-190300 -43000,-399620 0,-594660 l 18940,-15000 c 84900,-9400 212800,-26430 248110,-7490 34660,19200 -37410,361610 -37410,361610 -2760,68000 30640,242000 61810,331760 6250,13610 76150,82860 41560,118170 z m 875330,-211420 c -12890,122510 -166500,229830 -242000,251600 -75360,21770 -299600,10780 -364170,-11640 -65240,-22490 -223060,-330250 -204580,-489980 0,-132570 35970,-341880 88910,-358910 53060,-16250 193070,-8030 193070,-8030 58460,-4210 103370,10060 154860,16180 36040,14270 10980,59840 23150,86280 17030,68060 21040,142170 63320,210030 58990,114300 167030,182160 274550,222340 23680,22420 10130,52410 12890,82130 z m -172620,-517070 c 0,-24590 1450,-34650 19660,-42810 l 101270,0 c 90490,3290 206030,32490 290270,-54450 48130,2040 52340,59120 65230,104040 11440,61740 8880,101270 8880,156900 -20390,44190 -42810,111530 -88380,140070 -72730,33930 -146190,27160 -216150,0 -105420,-62470 -182160,-162490 -180780,-303750 z m 2074330,-483920 c -135330,469650 -199910,711450 11510,1194790 2040,18280 22420,78840 0,86340 -233840,-47020 -295660,-67340 -515230,-82990 -202470,-35310 -539690,21040 -764460,19140 -176100,6050 -354970,12160 -539030,34590 -55170,-28540 -12170,-90490 -8220,-131190 20380,-63130 22490,-95880 28540,-169990 28540,-30450 63850,-14270 98510,-28540 118300,-18220 218850,-122970 247380,-233650 37420,-116200 -3280,-245480 -57070,-356150 -10070,-32690 -54980,-57740 -36700,-90490 145460,-272440 42810,-549090 -6050,-814760 -51030,-189000 -129150,-397790 -160450,-596780 6770,-20380 -19660,-68060 25250,-71350 l 16310,3290 c 155590,188930 601500,587900 768530,717710 166700,129810 598160,381400 878820,448540 26630,22430 22490,40910 12360,71490 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48164760"
+ style="fill:#007d7a"
+ d="m 11225500,5347880 c 28540,37410 47680,70160 24530,104750 -53070,4010 -61220,-63130 -105940,-85620 -74110,-36690 -140070,1910 -213460,20390 -186160,80230 -341880,239890 -522660,323410 -22490,0 -42810,-2040 -57080,-18220 30580,-30640 80170,-36760 118960,-61950 186240,-122310 367010,-314590 600130,-349900 61750,-4210 116920,18280 155520,67140 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82784152"
+ style="fill:#007d7a"
+ d="m 11211300,5664050 c -14270,-45570 -12170,-119030 -67140,-129280 -12360,28670 0,59840 -12360,86470 -16840,20320 -45570,44720 -78130,36560 -225620,14400 -393570,212740 -585780,315390 -65960,36760 -139420,57800 -209320,76080 -6110,10260 -4210,24530 6050,30580 213330,22490 424020,42810 635440,65230 l 235220,-26430 c 6780,-30580 -30640,-57080 -24530,-92390 27160,-95820 35320,-200570 8880,-290860 18280,-48930 87720,-12360 91670,-71350 z m -164400,363450 c -29200,42950 -74830,5590 -114820,10990 -92390,-10990 -248110,10780 -350100,-2110 -15650,-8880 -26440,-24390 -17690,-38660 15650,-25910 58460,-27290 85030,-46960 111390,-69240 228310,-135860 355490,-165780 23150,-3480 42090,15650 46100,31960 14930,58990 5590,153490 -4010,210560 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_81751608"
+ style="fill:#007d7a"
+ d="m 11331000,6720150 c 6770,-10980 15650,-23140 25710,-23870 12890,4940 20390,10980 22490,36040 -2100,39520 -11510,80880 -22490,125140 -12160,49580 -25050,101210 -25050,151510 0,21770 2630,44190 8740,65960 29200,36690 75500,45570 129940,26430 1250,-720 93780,-53590 93780,-53590 80220,-47680 155520,-93050 297040,-129090 2560,-720 3280,530 3940,1190 2830,2100 3490,7490 3490,14270 0,11700 -3490,28540 -9540,41620 -5390,2570 -135200,60370 -135200,60370 -101930,44850 -208070,91140 -307300,148220 -29190,5400 -56350,-10260 -82260,-25910 l -6780,-3280 c -37410,-51690 -49580,-101270 -49580,-151580 0,-44910 9540,-89760 19660,-135860 8880,-42810 19140,-87000 21050,-134020 3480,-3290 12360,-13550 12360,-13550 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111035472"
+ style="fill:#007d7a"
+ d="m 8137910,6678070 c 74110,151510 -3950,294860 0,452490 12230,44920 100610,51030 74110,104760 -20320,14270 -49580,18280 -72010,2100 -40700,-26630 -55170,-46950 -65230,-94500 -10980,-138620 99890,-301180 2100,-432370 -28540,-28470 -70160,-57010 -110870,-59120 -88380,16380 -133230,110810 -163870,180250 -46820,184060 -59710,379110 102650,526670 94500,54980 208790,114820 215560,233850 13610,20320 42090,39980 65230,28540 28540,-2110 32550,-84370 73260,-44920 l 12360,27880 c -10260,33210 -20320,90420 -73390,92330 -26500,6120 -55690,-8150 -77460,-24330 -57740,-59180 -13020,-149600 -109430,-188270 -159730,-49580 -264480,-217470 -280790,-375290 -10130,-151510 -3350,-317360 127180,-450460 51620,-38800 118830,-64050 184780,-42940 36700,6250 79510,31960 95820,63330 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111045264"
+ style="fill:#007d7a"
+ d="m 6134990,7785860 c -291440,135200 -380550,483140 -384560,497410 l -7500,31300 29790,10260 c 11640,3350 282180,92390 613150,-70100 333000,-163020 401530,-493400 404350,-507670 l 6780,-34660 -35320,-5390 c -13610,-2760 -339780,-53720 -626690,78850 z m 29200,63130 c 212800,-99170 456180,-87660 547910,-78780 -25910,84170 -114820,303740 -356880,422770 -242520,118830 -451310,90290 -527330,74110 28540,-84370 122320,-318740 336300,-418100 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111057648"
+ style="fill:#007d7a"
+ d="m 6425850,7131280 c -292110,131920 -400150,475840 -404360,490840 l -10060,32550 32550,10260 c 11440,3280 281320,84170 612950,-74120 334390,-160450 405740,-479190 408500,-492730 l 7500,-34660 -35320,-6250 c -12890,-2630 -324130,-55700 -611760,74110 z m 28540,62670 c 212140,-95870 443880,-83710 532920,-74170 -27820,82850 -118310,292830 -360100,408370 -240690,115010 -448030,93240 -526870,78970 33400,-86270 140070,-316830 354050,-413170 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82872168"
+ style="fill:#007d7a"
+ d="m 6805870,6500580 c -293020,128560 -420000,469590 -424740,483860 l -13020,34790 36040,10130 c 11640,3480 280790,75490 612420,-79570 336300,-156180 409750,-463480 413230,-477020 l 7500,-34660 -34650,-6770 c -12370,-2110 -307960,-57810 -596780,69240 z m 27160,63330 c 212080,-93250 431650,-80230 517930,-70100 -28540,80160 -121590,281320 -362930,393570 -238510,111530 -443810,95810 -526140,82790 39520,-87000 158480,-312490 371140,-406260 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111066936"
+ style="fill:#007d7a"
+ d="m 7182350,5877380 c -292960,125730 -438420,462750 -443810,477020 l -16380,37410 39520,9610 c 11450,2760 279940,67330 612950,-83720 337880,-152760 413240,-449200 416720,-462090 l 8880,-34660 -35310,-7430 c -11710,-2830 -291650,-59910 -582570,63860 z m 27160,63850 c 210690,-89630 419350,-76090 502340,-65960 -29920,78260 -124420,270540 -365760,379300 -235750,107320 -439670,97920 -524560,87000 45440,-89100 175900,-309920 387980,-400340 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111358368"
+ style="fill:#007d7a"
+ d="m 7704350,5254100 c -293680,122320 -457420,456050 -464200,470320 l -19000,39450 42810,9600 c 10780,1910 278560,58270 613010,-88380 338400,-149670 417380,-435000 420670,-447360 l 8880,-33870 -34590,-8880 c -10990,-1970 -275280,-61810 -567580,59120 z m 26440,63860 c 210030,-87000 406460,-72730 486690,-61750 -31170,76740 -127050,258890 -368390,365560 -235220,103310 -436320,99360 -523320,90480 52350,-90480 193600,-306570 405020,-394290 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111528120"
+ style="fill:#007d7a"
+ d="m 8280080,4652660 c -294410,118960 -477290,449930 -484720,464200 l -22290,41360 46100,8880 c 11640,2110 278750,50310 613140,-93770 340510,-145460 421920,-419290 425400,-430790 l 9610,-34790 -34790,-8160 c -10130,-2630 -259620,-65300 -552450,53070 z m 25780,63860 c 207860,-83520 393500,-68590 470970,-57080 -32550,74110 -131190,248110 -371810,350760 -232460,99820 -431510,100550 -521270,94430 58460,-91870 211350,-302360 422110,-388110 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_114230976"
+ style="fill:#007d7a"
+ d="m 8894410,4084560 c -294870,114820 -496160,442960 -504380,457230 l -26440,43530 50310,8160 c 11640,1380 278030,42090 613150,-97790 341680,-142170 425400,-405080 428680,-415990 l 10990,-33940 -33940,-9600 c -9600,-2560 -244100,-67330 -538370,48400 l 0,0 z m 25050,63860 c 206030,-80230 381410,-65240 456050,-53800 -34590,72080 -134480,237200 -375100,337220 -228970,95680 -426780,101930 -519170,97790 65890,-93120 228980,-299080 438220,-381210 l 0,0 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48808752"
+ style="fill:#007d7a"
+ d="m 9533330,3559800 c -295790,112050 -515160,437040 -524040,450650 l -31370,46760 55900,6840 c 10780,1380 276450,33400 612950,-102660 342610,-138490 429610,-390080 432890,-400870 l 10990,-32750 -33410,-10780 c -8750,-2760 -227590,-70100 -523910,42810 z m 24330,63850 c 204650,-77400 369050,-61750 440590,-49580 -36030,69970 -138680,227070 -377260,323470 -227730,91870 -422770,102650 -517270,101210 72730,-94430 245350,-295590 453940,-375100 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48137184"
+ style="fill:#007d7a"
+ d="m 10182300,3089480 c -296320,109490 -533450,431520 -543710,445070 l -36030,48400 60560,6110 c 10790,1380 275930,25060 612950,-107380 344650,-135340 433550,-375300 437040,-385360 l 11510,-32750 -32550,-10780 c -8160,-3480 -212080,-72730 -509770,36690 z m 23800,64580 c 202540,-74110 356880,-59180 424740,-46290 -37410,67330 -141310,216080 -379830,309860 -224960,88380 -417370,103370 -514500,104090 79500,-95220 262250,-290920 469590,-367660 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82940240"
+ style="fill:#007d7a"
+ d="m 5668820,7126620 c -8880,10780 -211350,273820 -232390,590520 -21110,322880 242520,568890 254160,579210 l 23150,21700 23670,-21700 c 8880,-7490 217470,-203920 233120,-573690 17090,-372460 -241800,-592100 -252780,-601440 l -27160,-22490 -21770,27890 z m -164600,626490 c 0,-10060 730,-20320 1450,-31100 14930,-237330 143360,-445990 195040,-521280 59850,61750 201950,234370 201950,489250 0,9540 0,19660 -650,29920 -12370,271920 -137310,441780 -189000,500890 -58460,-62470 -208790,-244620 -208790,-467680 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82893400"
+ style="fill:#007d7a"
+ d="m 6079950,6417070 c -6770,7490 -171890,189650 -241990,450650 -9410,35970 -16900,73260 -21770,112710 -37880,312690 187740,568960 197870,579740 l 21700,25250 25980,-21760 c 9400,-7500 222130,-192420 265670,-551930 43460,-362930 -188270,-587170 -198530,-596040 l -25060,-24530 -23870,25910 z m -198990,633990 c 0,-20320 1190,-40710 3950,-61750 4010,-36040 10850,-70630 19660,-103380 50310,-187540 155060,-333660 201880,-392850 49720,58470 157100,212080 157100,431000 0,25050 -1380,52340 -4860,79500 -31170,261660 -161640,424020 -216090,482480 -48930,-64580 -161640,-234370 -161640,-435000 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82889776"
+ style="fill:#007d7a"
+ d="m 6541390,5751710 c -7500,6770 -180780,167750 -268430,427500 -10790,33210 -20390,68590 -27890,109300 -54250,302560 134020,568230 141450,579870 l 21110,29060 28480,-22290 c 8870,-7430 227070,-181430 297030,-530090 70630,-352870 -134470,-581840 -143350,-591450 l -23150,-25050 -25250,23150 z m -236410,648320 c 0,-32550 2760,-66680 8810,-99880 6120,-36700 14270,-68720 24400,-98640 62600,-184790 173480,-318090 223720,-371680 39320,54980 116790,188270 116790,371150 0,41430 -4020,84900 -13620,130990 -50240,250880 -184720,405220 -243180,463020 -38860,-65300 -116920,-218920 -116920,-394960 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82869456"
+ style="fill:#007d7a"
+ d="m 7048400,5129690 c -8030,6110 -188800,146840 -294940,404550 -12160,29720 -23080,64580 -32480,104560 -71550,292300 77400,568230 84170,579740 l 18280,33930 32030,-22950 c 9530,-6310 231740,-169990 328990,-507010 97790,-342610 -80220,-577110 -87650,-586710 l -21050,-27160 -27350,21050 z m -277180,672320 c 0,-47670 4730,-97980 16180,-146840 8870,-36690 19130,-68060 29920,-95150 74830,-180780 191100,-301710 244820,-350770 29260,50250 81410,161120 81410,310000 0,56420 -6770,118170 -25710,184120 -69440,239900 -207930,386740 -270540,443160 -27160,-61810 -76080,-193660 -76080,-344520 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82898896"
+ style="fill:#007d7a"
+ d="m 7597690,4550670 c -8150,4870 -196430,125070 -320840,380680 -14270,28540 -27160,60370 -39460,101270 -87720,282050 23080,566850 28480,579020 l 15710,38800 35310,-23150 c 9540,-6770 235890,-159010 359650,-485240 125600,-332480 -25260,-571000 -32030,-581120 l -18280,-28540 -28540,18280 z m -324330,712310 c 0,-67340 8220,-139340 29920,-209970 11710,-36760 22490,-65960 35320,-91210 87000,-178670 209510,-287440 265210,-330900 21040,43460 53590,129810 53590,246000 0,70630 -12230,151580 -45440,239960 -86280,229110 -229830,368320 -296310,424880 -17040,-56560 -42290,-159210 -42290,-278760 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_117735336"
+ style="fill:#007d7a"
+ d="m 8185580,4013740 c -8150,4210 -203200,103370 -347930,356880 -15000,27820 -29270,58460 -44190,97260 -104760,271720 -31370,565470 -27890,577630 l 11510,44850 39520,-24530 c 9340,-5390 240420,-147500 390750,-462820 152960,-321500 29260,-564020 23670,-574280 l -15650,-29980 -29790,14990 0,0 z m -378580,778930 c 0,-91150 11510,-198470 50310,-300460 14270,-35310 26440,-63130 40700,-87660 99830,-174720 227070,-271780 286190,-309930 12890,36040 30650,98710 30650,184990 0,81410 -16380,181950 -70100,294210 -103900,218850 -251470,350040 -322100,403630 -7490,-42090 -15650,-107320 -15650,-184780 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_47326760"
+ style="fill:#007d7a"
+ d="m 8809510,3518370 c -8880,3350 -209970,82130 -374570,333010 -16900,26500 -33270,57080 -50300,93110 -120210,261660 -84900,564090 -83520,576260 l 6120,50300 44850,-24390 c 10120,-5390 244620,-135860 421450,-440330 180780,-311440 84170,-558170 80030,-568300 l -12890,-32020 -31170,12360 z m -445190,883550 c 0,-107390 13540,-278030 82990,-428890 15450,-33400 30440,-60560 45370,-83710 112910,-171890 245350,-256790 306570,-290200 6780,28020 13620,68720 13620,123040 0,90420 -20390,213460 -98510,349320 -121790,208780 -273370,331820 -348660,384030 -720,-14990 -1380,-32550 -1380,-53590 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_81988928"
+ style="fill:#007d7a"
+ d="m 9466720,3064300 c -8880,2040 -216160,61220 -401070,309330 -18940,25060 -38080,54320 -55700,87530 -137240,251600 -139350,562840 -139350,576450 l 730,54980 48860,-24400 c 10980,-5390 250210,-125800 453410,-419290 206550,-299800 137960,-550540 135200,-560800 l -9600,-33210 -32480,9410 z m -396210,430270 c 16180,-30650 33210,-56360 50310,-80230 126320,-168610 264290,-242720 328140,-269880 1380,16370 3490,35380 3490,60560 0,92400 -22490,240620 -135930,405090 -137960,198520 -293680,314000 -373910,365030 7500,-101270 33410,-308680 127900,-480570 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82907120"
+ style="fill:#007d7a"
+ d="m 10151000,2650340 c -8740,1380 -220820,40900 -427500,284150 -204450,242720 -252850,642340 -254750,659240 l -6780,59840 54980,-24530 c 10260,-4660 254220,-114150 483200,-397580 233840,-288090 192410,-542980 191030,-553240 l -6110,-33930 -34070,6050 z m -374430,329060 c 140070,-165120 282700,-228450 348660,-250210 720,1380 720,2100 720,4140 0,80230 -21040,259620 -179390,455320 -153620,189650 -314800,297040 -398310,345900 22490,-122970 84960,-385880 228320,-555150 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82162616"
+ style="fill:#007d7a"
+ d="m 3595940,6074460 c 0,1669970 903140,3275890 2357560,4192850 l 60560,37350 43470,-56490 c 12160,-15710 17030,-31170 17030,-44910 0,-36040 -30580,-63850 -47680,-80030 l -84170,-80890 c -300460,-340500 -380680,-663450 -380680,-911560 0,-274550 98640,-457950 106790,-471700 l 26500,-48860 -36760,-41420 c -615050,-685680 -939180,-1547660 -939180,-2494340 0,-2082490 1693650,-3776070 3776130,-3776070 579010,0 1134230,126990 1650770,378580 l 53790,26440 758410,-865930 -83520,-46820 c -723950,-402980 -1546930,-615710 -2379450,-615710 -2702270,0 -4899570,2197960 -4899570,4899510 l 0,0 z m 154860,0 c 0,-2615930 2128720,-4743990 4744710,-4743990 773340,0 1538060,191760 2216960,551200 -99890,113640 -492080,562180 -553300,630710 -521940,-244630 -1081160,-369710 -1663660,-369710 -2168100,0 -3932570,1763750 -3932570,3931790 0,967190 327680,1850020 946870,2558190 -36030,82260 -99360,262380 -99360,500890 0,197150 45570,433620 184980,685220 C 4447460,8904570 3750800,7513880 3750800,6074460 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_49059128"
+ style="fill:#007d7a"
+ d="m 10214300,2537630 c -538310,-262380 -1116010,-394960 -1718830,-394960 -2168100,0 -3932570,1763750 -3932570,3931790 0,984820 338590,1883950 979420,2598370 l 67340,74640 299080,-451120 -15650,-18480 c -27160,-3280 -48930,-7490 -65240,-10780 3950,-12360 10070,-28540 16840,-46300 -22950,-27810 -46760,-56350 -69250,-84890 -23800,38600 -46750,66480 -62470,84890 -58460,-62470 -208790,-244620 -208790,-467680 0,-6770 730,-14270 730,-21040 -279280,-492020 -421390,-1047230 -421390,-1657610 0,-1881130 1530560,-3411760 3411950,-3411760 461370,0 906630,90290 1325920,267780 44910,-46960 89100,-83720 130530,-112190 -458810,-205370 -948060,-311310 -1456450,-311310 -1967670,0 -3568200,1600530 -3568200,3567480 0,852900 266400,1602630 787610,2231950 -29720,45580 -72670,110150 -120870,183540 -570860,-672790 -874670,-1504130 -874670,-2415490 0,-2082490 1693650,-3776070 3776130,-3776070 553240,0 1083920,117580 1580870,347280 -21110,44850 -40910,89110 -61950,133300 46230,-25980 84370,-41630 110810,-49780 720,1380 720,2100 720,4140 0,58460 -11510,169330 -78850,301050 l 17560,8880 218190,-473080 -68520,-32550 0,0 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_122255456"
+ style="fill:#007d7a"
+ d="m 10179000,1766130 -376020,475910 c 34790,11440 68720,23600 102650,36690 l 373190,-471700 c -32680,-14270 -65890,-27810 -99820,-40900 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111525640"
+ style="fill:#007d7a"
+ d="m 9443570,1547280 -219570,543180 c 34780,6120 69370,12890 103310,20390 l 218910,-541140 c -34660,-8030 -68720,-15000 -102650,-22430 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_81748496"
+ style="fill:#007d7a"
+ d="m 8568240,1449500 -53790,575730 c 34590,0 69440,520 103370,1180 l 54250,-574150 c -34590,-720 -69240,-2100 -103830,-2760 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48970056"
+ style="fill:#007d7a"
+ d="m 7715140,1514730 109420,565470 c 34130,-5390 68060,-10980 102650,-15650 l -109420,-566190 c -34590,4860 -68520,10260 -102650,16370 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_47284000"
+ style="fill:#007d7a"
+ d="m 6888140,1736210 258900,519370 c 32550,-11640 65300,-22420 98510,-33400 l -259620,-520560 c -32490,11640 -65240,23080 -97790,34590 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48122368"
+ style="fill:#007d7a"
+ d="m 6103100,2116240 386080,441050 c 30440,-17560 61090,-34660 92390,-51690 l -388120,-443150 c -30440,17750 -60430,36030 -90350,53790 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82943656"
+ style="fill:#007d7a"
+ d="m 5390130,2648430 487350,338400 c 27090,-23140 54970,-45570 82990,-68720 l -490840,-340500 c -26430,23150 -53590,47020 -79500,70820 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_111743952"
+ style="fill:#007d7a"
+ d="m 4783230,3316420 560080,218130 c 22950,-28540 46100,-56360 69240,-83520 l -564080,-220230 c -21700,28540 -43470,57080 -65240,85620 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_81670368"
+ style="fill:#007d7a"
+ d="m 4315020,4094620 602690,84240 c 17100,-33210 34790,-65230 53070,-97060 l -608280,-84960 c -16310,32550 -32680,65300 -47480,97780 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82778632"
+ style="fill:#007d7a"
+ d="m 4007790,4948250 614330,-58980 c 11640,-35510 23150,-71550 34660,-106860 l -620510,59180 c -10260,35310 -19600,70630 -28480,106660 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_49035160"
+ style="fill:#007d7a"
+ d="m 3874500,5842000 594660,-206490 c 4210,-38140 8880,-76220 13620,-114290 l -601510,209250 c -2630,36760 -4670,74170 -6770,111530 l 0,0 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82868520"
+ style="fill:#007d7a"
+ d="m 3920790,6745210 536930,-352670 c -2830,-39330 -5390,-78850 -7500,-118830 l -545800,358060 c 5390,38080 10260,75490 16370,113440 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82947392"
+ style="fill:#007d7a"
+ d="m 4149770,7628890 435660,-479850 c -10790,-40180 -20390,-80880 -29920,-121130 l -445070,490170 c 12830,37420 25720,74120 39330,110810 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_82847744"
+ style="fill:#007d7a"
+ d="m 4559650,8472920 308480,-586510 c -18940,-38080 -38600,-76020 -56360,-114820 l -314070,597490 c 20390,34590 40910,69910 61950,103840 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_47020472"
+ style="fill:#007d7a"
+ d="m 5084940,9176350 165250,-678900 c -27290,-36040 -54450,-72730 -80160,-109430 l -167880,693900 c 27090,31960 54970,63130 82790,94430 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="_48970168"
+ style="fill:#007d7a"
+ d="m 10102100,3077840 c 14270,8880 28540,18480 42080,28020 13090,-5590 25260,-11640 38150,-16380 14920,-5390 29920,-10250 44910,-14920 -32030,-21050 -61810,-44920 -90490,-70100 -9400,23800 -21760,48330 -34650,73380 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ id="path53"
+ style="fill:#007d7a"
+ d="m 16101400,13274400 249140,0 0,-22290 -80140,0 0,-620900 42440,0 c 49370,550 84760,16440 106190,47790 20690,32020 33070,72700 36790,121720 l 41940,0 -6710,-191990 -513330,0 -10630,191990 24960,0 c 4930,-25290 9720,-48480 13990,-69710 3540,-10100 6520,-19670 9020,-28680 2450,-9390 5650,-17500 9360,-24420 8480,-15220 19820,-26720 33990,-34510 13460,-8120 31110,-12190 53090,-12190 l 65450,0 0,620900 -75550,0 0,22290 z m -769640,0 253410,0 0,-22290 -82980,0 0,-305590 c 2310,0 4620,0 6690,0 41950,0 72770,6410 92730,18940 11000,8170 19310,20160 24960,36110 6030,15220 9740,35910 10970,61920 l 21230,0 0,-245250 -22270,0 c -1760,24790 -5860,43720 -11690,57180 -6390,13930 -15030,24220 -26010,30750 -10960,6750 -24230,10820 -39640,12220 -15930,1950 -35060,3190 -56970,3910 l 0,-291090 122620,0 c 1950,0 3710,0 5480,0 55760,0 93620,10410 113420,31130 20170,21960 36300,62810 48470,123160 l 33790,0 -8280,-176770 -485930,0 0,22480 77020,0 0,620900 -77020,0 0,22290 z m -794080,0 187950,0 0,-22290 -82840,0 68840,-219910 184180,0 66550,219910 -80860,0 0,22290 245790,0 0,-22290 -67440,0 -198860,-652080 -37700,0 -209310,652080 -76300,0 0,22290 z m 348260,-269480 -165970,0 84930,-270750 1960,0 79080,270750 z m -716720,-87600 -278560,0 0,-286110 75570,0 0,-22480 -242940,0 0,22480 74150,0 0,620900 -74150,0 0,22290 242940,0 0,-22290 -75570,0 0,-306660 278560,0 0,306660 -75580,0 0,22290 265410,0 0,-22290 -96610,0 0,-620900 96610,0 0,-22480 -265410,0 0,22480 75580,0 0,286110 z m -677990,-130930 0,-169350 -14310,0 -33110,29200 c -22290,-16980 -44040,-30250 -65470,-39440 -22660,-8700 -48110,-13100 -76240,-13100 -70790,1230 -134670,33970 -191840,97840 -59420,63880 -89670,146010 -90960,246170 0,98330 24600,180820 73620,247180 47430,67950 115920,102780 205470,104730 680,0 1590,0 2270,0 53810,0 103680,-18750 149530,-55900 l 26900,40680 25820,0 0,-180820 -23510,0 c -12230,45470 -32920,84570 -61780,117130 -29540,33800 -68130,50970 -115880,51690 -73240,-720 -120860,-28680 -142820,-83890 -11650,-26730 -19260,-57850 -23150,-93770 -4260,-35420 -6570,-74700 -6570,-118050 0,-3540 -170,-7620 -170,-11510 0,-29720 2300,-69160 6740,-117130 2620,-26010 6880,-51830 12720,-77150 5120,-24420 11880,-45660 20340,-63880 10100,-19790 26370,-38040 49010,-54670 21970,-16800 48340,-25640 79110,-26360 50780,720 89730,16790 116770,48280 27640,32040 46030,72580 55220,122120 l 22290,0 z m -1091430,491040 41570,-43350 c 20530,19620 43370,33800 68500,42440 25820,8660 52370,13100 79460,13100 136440,-2620 206340,-76420 209510,-221690 0,-33660 -4820,-62650 -14190,-86570 -9700,-23500 -23520,-42440 -41410,-56940 -36090,-29400 -78360,-49910 -126690,-61960 -22290,-7070 -44210,-14140 -65450,-20890 -22650,-5800 -42630,-13230 -59810,-21930 -17340,-8450 -31160,-19300 -41390,-32740 -11150,-12540 -16630,-29000 -16630,-49150 0,-19120 4570,-36270 13770,-51500 7420,-15410 17710,-27960 30620,-38060 27590,-21420 58570,-32200 92900,-32200 43730,720 79290,14670 107040,41950 26910,27940 46040,62970 56990,105630 l 19490,0 0,-154840 -13810,0 -36300,28870 c -10960,-8530 -28660,-17730 -53100,-27830 -25080,-10050 -49680,-15390 -73410,-16070 -36460,680 -66550,7240 -90430,19980 -25130,13270 -44750,30440 -58930,51130 -25990,35380 -39440,72200 -39440,110450 0,1030 0,1940 0,2980 0,28680 6020,56260 18380,82820 12230,27940 32040,51140 59650,69710 12930,6750 43730,18390 92360,35070 49030,17840 84770,31100 107420,39800 36280,13950 60330,29530 72010,46890 10430,16630 15600,38730 15600,66000 0,1410 0,2620 0,4080 -740,44390 -17180,79460 -49210,104720 -32560,26540 -70430,39830 -113590,39830 -46400,-550 -85680,-16450 -118230,-47250 -32040,-29900 -55000,-67950 -68460,-113790 l -18380,0 0,171310 13590,0 z m -685150,-3030 496870,0 10600,-185940 -19290,0 c -5310,34650 -18580,69880 -39640,105630 -10600,15900 -23860,29350 -39640,39990 -16260,12000 -34650,18030 -55540,18030 l -181920,0 0,-620900 98030,0 0,-22480 -269470,0 0,22480 78220,0 0,620900 -78220,0 0,22290 z m -670660,0 496690,0 10780,-185940 -19480,0 c -5290,34650 -18380,69880 -39630,105630 -10600,15900 -23680,29350 -39640,39990 -16080,12000 -34650,18030 -55350,18030 l -181920,0 0,-620900 98030,0 0,-22480 -269480,0 0,22480 78050,0 0,620900 -78050,0 0,22290 z m -712830,0 519000,0 13270,-186130 -25820,0 c -11690,71300 -32390,116960 -62110,137110 -27800,17890 -72200,26920 -131630,26920 -3760,0 -7980,-190 -11870,-190 l -123180,0 0,-308620 c 5310,0 10600,-310 15770,-310 40000,0 69910,6880 90060,20340 21750,15230 33800,49010 36460,100830 l 21200,0 0,-251950 -21200,0 c -2660,26000 -6740,46020 -12410,59970 -6520,14670 -15400,25330 -26360,31850 -18220,10290 -48470,15220 -89340,15220 -4430,0 -9550,-170 -14180,-170 l 0,-288060 125810,0 c 1770,0 3390,0 5150,0 41910,0 76430,8330 103520,24770 14130,9560 26170,23510 35920,42130 8660,18750 15220,43350 19290,73250 l 21210,0 0,-162630 -488560,0 0,22480 84410,0 0,620900 -84410,0 0,22290 z m -604820,3030 41580,-43350 c 20520,19620 43350,33800 68680,42440 25810,8660 52180,13100 79440,13100 136450,-2620 206170,-76420 209330,-221690 0,-33660 -4810,-62650 -14170,-86570 -9700,-23500 -23510,-42440 -41420,-56940 -36090,-29400 -78360,-49910 -126690,-61960 -22300,-7070 -44040,-14140 -65460,-20890 -22640,-5800 -42440,-13230 -59800,-21930 -17340,-8450 -31160,-19300 -41400,-32740 -10950,-12540 -16480,-29000 -16480,-49150 0,-19120 4430,-36270 13620,-51500 7630,-15410 17730,-27960 30640,-38060 27580,-21420 58570,-32200 92910,-32200 43710,720 79440,14670 107040,41950 27080,27940 46010,62970 56970,105630 l 19490,0 0,-154840 -13820,0 -36110,28870 c -11140,-8530 -28850,-17730 -53260,-27830 -25100,-10050 -49510,-15390 -73430,-16070 -36470,680 -66550,7240 -90410,19980 -25150,13270 -44760,30440 -58760,51130 -26180,35380 -39640,72200 -39640,110450 0,1030 0,1940 0,2980 0,28680 6200,56260 18390,82820 12230,27940 32210,51140 59840,69710 12730,6750 43540,18390 92180,35070 49010,17840 84760,31100 107410,39800 36470,13950 60340,29530 72030,46890 10410,16630 15580,38730 15580,66000 0,1410 0,2620 0,4080 -740,44390 -16980,79460 -49210,104720 -32560,26540 -70240,39830 -113420,39830 -46380,-550 -85850,-16450 -118220,-47250 -32220,-29900 -54990,-67950 -68640,-113790 l -18380,0 0,171310 13590,0 z m -736840,-3030 519170,0 13090,-186130 -25650,0 c -11670,71300 -32390,116960 -62090,137110 -27960,17890 -72220,26920 -131640,26920 -3720,0 -7980,-190 -11870,-190 l -123160,0 0,-308620 c 5280,0 10460,-310 15580,-310 39990,0 70070,6880 90220,20340 21800,15230 33800,49010 36300,100830 l 21410,0 0,-251950 -21410,0 c -2500,26000 -6580,46020 -12240,59970 -6520,14670 -15400,25330 -26370,31850 -18200,10290 -48470,15220 -89320,15220 -4440,0 -9560,-170 -14170,-170 l 0,-288060 125780,0 c 1820,0 3410,0 5170,0 41950,0 76410,8330 103510,24770 14130,9560 26180,23510 35920,42130 8650,18750 15220,43350 19300,73250 l 21190,0 0,-162630 -488720,0 0,22480 84440,0 0,620900 -84440,0 0,22290 z m -274400,-658240 -33970,36960 c -41780,-38900 -96450,-58740 -164040,-59420 -70620,1230 -134670,33600 -191840,96800 -59420,64050 -89690,146310 -90960,247210 0,98330 24600,180820 73620,247180 47430,67950 115910,102780 205470,104730 49510,-720 90240,-7600 121540,-21060 31480,-13280 56260,-30620 74500,-52010 9390,-11320 17500,-23180 24060,-35560 6220,-12040 11510,-24580 15580,-37870 8110,-26720 12550,-53630 13100,-80850 l 78720,0 0,-23190 -281520,0 0,23190 93940,0 c 720,13940 910,27400 910,40500 0,13090 -360,25510 -910,37510 -2450,24410 -8110,46380 -16620,66000 -8120,19100 -21930,33780 -41400,43880 -18580,11330 -44750,17000 -78370,17000 -73300,-550 -120860,-29720 -143000,-87250 -19620,-50970 -29910,-117640 -29910,-198850 0,-4630 190,-9750 190,-14560 0,-3530 -190,-7600 -190,-11510 0,-29700 2310,-69710 6760,-118180 2620,-25990 6890,-51680 12720,-76950 5120,-24420 11870,-45670 20340,-63880 10100,-19850 26370,-38040 49020,-54500 22110,-16300 48500,-24770 79270,-25490 54680,720 98560,16430 131140,47420 33780,30630 55350,71480 65100,122980 l 22270,0 0,-170230 -15520,0 z m -945200,475820 236370,0 0,-66170 -236370,0 0,66170 z m -525550,182420 0,-22290 -79640,0 0,-620900 79640,0 0,-22480 -246160,0 0,22480 73130,0 0,620900 -73130,0 0,22290 246160,0 z m 118360,-643190 86890,0 -266490,278310 c -5470,5350 -8300,9920 -8300,13990 0,1100 190,1950 520,3000 l 256050,325600 -77670,0 0,22290 265210,0 0,-22290 -65450,0 -300110,-373160 227910,-247740 73280,0 0,-22480 -191840,0 0,22480 z m -605190,155180 0,-169350 -14500,0 -32880,29200 c -22330,-16980 -44070,-30250 -65510,-39440 -22650,-8700 -48110,-13100 -76410,-13100 -70620,1230 -134500,33970 -191660,97840 -59430,63880 -89700,146010 -90970,246170 0,98330 24470,180820 73490,247180 47560,67950 116040,102780 205600,104730 680,0 1590,0 2270,0 53820,0 103690,-18750 149540,-55900 l 26720,40680 25990,0 0,-180820 -23500,0 c -12410,45470 -32930,84570 -61790,117130 -29540,33800 -68260,50970 -115870,51690 -73250,-720 -120860,-28680 -142790,-83890 -11680,-26730 -19470,-57850 -23180,-93770 -4460,-35420 -6580,-74700 -6580,-118050 0,-3540 -170,-7620 -170,-11510 0,-29720 2290,-69160 6750,-117130 2440,-26010 6690,-51830 12720,-77150 4940,-24420 11860,-45660 20340,-63880 9930,-19790 26360,-38040 48830,-54670 22150,-16800 48520,-25640 79280,-26360 50780,720 89730,16790 116810,48280 27600,32040 45990,72580 54990,122120 l 22480,0 z m -1192500,-155180 0,620900 -74170,0 0,22290 177660,0 0,-22290 -74320,0 0,-600560 1770,0 362020,638070 24960,0 0,-658410 93630,0 0,-22480 -198050,0 0,22480 75240,0 0,459370 -1760,0 -273600,-481850 -187550,0 0,22480 74170,0 z m -859620,643190 188070,0 0,-22290 -82990,0 68860,-219910 184190,0 66550,219910 -80700,0 0,22290 245620,0 0,-22290 -67450,0 -198860,-652080 -37690,0 -209320,652080 -76280,0 0,22290 z m 348200,-269480 -165790,0 84760,-270750 1950,0 79080,270750 z m -1005590,269480 496700,0 10770,-185940 -19460,0 c -5120,34650 -18390,69880 -39640,105630 -10420,15900 -23690,29350 -39630,39990 -16090,12000 -34670,18030 -55370,18030 l -181900,0 0,-620900 98010,0 0,-22480 -269480,0 0,22480 78050,0 0,620900 -78050,0 0,22290 z m -506090,-322570 0,-320620 26860,0 c 33130,0 61790,860 86400,2810 24230,2670 44200,9050 59970,19100 15410,10100 26910,25320 34510,45850 7790,20890 11650,48470 11650,82990 0,2990 190,6030 190,9020 0,50280 -11650,89370 -34160,116950 -13410,14000 -32170,24770 -56090,32210 -5650,1940 -12170,3350 -19460,3900 -6900,1950 -14320,3530 -22130,4980 -16080,1950 -34320,2810 -54850,2810 l -32890,0 z m -168640,-343100 0,22480 75200,0 0,620900 -82440,0 0,22290 261690,0 0,-22290 -85810,0 0,-277990 46180,0 c 50950,0 94120,-6160 129720,-18940 35200,-11330 63510,-26170 84930,-44580 21930,-19460 37700,-39990 47070,-61740 9190,-21420 13590,-42300 13590,-62640 0,-22650 -3520,-44760 -10790,-66190 -7420,-21060 -20330,-39800 -38530,-56250 -35070,-35430 -96630,-53630 -184790,-55050 l -256020,0 z m -451860,483250 236370,0 0,-66170 -236370,0 0,66170 z m -593290,182420 0,-22290 -86530,0 156780,-268620 156410,268620 -79810,0 0,22290 252850,0 0,-22290 -66000,0 -208270,-357260 158530,-263640 79830,0 0,-22480 -191290,0 0,22480 79070,0 -136570,234470 -136070,-234470 71110,0 0,-22480 -248780,0 0,22480 67410,0 183140,328410 -169500,292490 -81050,0 0,22290 198740,0 z m -966850,0 187900,0 0,-22290 -82820,0 68700,-219910 184350,0 66550,219910 -80860,0 0,22290 245780,0 0,-22290 -67440,0 -198870,-652080 -37680,0 -209320,652080 -76290,0 0,22290 z m 348220,-269480 -165990,0 84940,-270750 1950,0 79100,270750 z m -1207230,-373710 71340,0 0,620900 -71340,0 0,22290 173070,0 0,-22290 -72550,0 0,-608350 1760,0 180520,630640 24910,0 187580,-630640 1940,0 0,608350 -74500,0 0,22290 263310,0 0,-22290 -95580,0 0,-620900 95580,0 0,-22480 -197810,0 -146910,489960 -1900,0 -139980,-489960 -199440,0 0,22480 z m -2260,-375830 16000000,0 0,38600 -16000000,0 0,-38600 0,0 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/scipost/static/scipost/images/NWO_LOGO_EN_2.png b/scipost/static/scipost/images/NWO_LOGO_EN_2.png
new file mode 100755
index 0000000000000000000000000000000000000000..4a1662f31fdf57d04a064307702b21892ddb201a
Binary files /dev/null and b/scipost/static/scipost/images/NWO_LOGO_EN_2.png differ
diff --git a/scipost/static/scipost/images/OpenAIRE.png b/scipost/static/scipost/images/OpenAIRE.png
new file mode 100644
index 0000000000000000000000000000000000000000..729a20cf95fc297ea2b91fa31bc143ffa58043fe
Binary files /dev/null and b/scipost/static/scipost/images/OpenAIRE.png differ
diff --git a/scipost/static/scipost/images/logovsnu.jpg b/scipost/static/scipost/images/logovsnu.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1a1175f32948c43adaa145cc6b892ec122a5e8cc
Binary files /dev/null and b/scipost/static/scipost/images/logovsnu.jpg differ
diff --git a/scipost/templates/scipost/EdCol_by-laws.html b/scipost/templates/scipost/EdCol_by-laws.html
index ef6e2be5820209bb2d319526df4f1e7c975d53e0..e3a4b4b2f1e743b303084a2283fa0680b632d39e 100644
--- a/scipost/templates/scipost/EdCol_by-laws.html
+++ b/scipost/templates/scipost/EdCol_by-laws.html
@@ -3,12 +3,14 @@
{% block pagetitle %}: Editorial College By-laws{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
- <span class="breadcrumb-item">Editorial College By-laws</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+ <span class="breadcrumb-item">Editorial College By-laws</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 5b1f2162d831c028e2c37fb2fc2aafd49fd75f1b..7e848aaa378a400af53bab5d56a40aef7be01528 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -6,12 +6,14 @@
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
- <span class="breadcrumb-item">Frequently asked questions</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+ <span class="breadcrumb-item">Frequently asked questions</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/scipost/templates/scipost/_personal_page_base.html b/scipost/templates/scipost/_personal_page_base.html
index 2a62116b4a69f353a480e49b88570a6a77052e34..4dbf56d4114f5b50839a4f9c5a73e4cdc2a523d3 100644
--- a/scipost/templates/scipost/_personal_page_base.html
+++ b/scipost/templates/scipost/_personal_page_base.html
@@ -1,13 +1,15 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index 6b849a4e6e2cf52de535e231a531c0fb0722ca94..e247402657e12b3d3191c89bbad4c34cd80a742c 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -148,7 +148,7 @@
<div class="col-12">
<a href="#editorial_college_{{ college|lower }}" class="mx-2" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show Fellows by specialization</a>
<a href="#editorial_college_{{ college|lower }}" class="mx-2" style="display: none;" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show full list of Fellows</a>
- <div id="specializations-{{college|lower}}" class="card border-default all-specializations mt-2" style="display: none">
+ <div id="specializations-{{college|lower}}" class="card bg-white border-default all-specializations mt-2" style="display: none">
<div class="card-body">
<p class="text-muted mt-2">Hover to highlight or click to select</p>
@@ -175,7 +175,7 @@
<div class="col-12">
<div class="card-columns">
{% for fellowship in college.current_fellows %}
- <div class="card contributor mb-1">
+ <div class="card bg-white contributor mb-1">
{% include 'scipost/_contributor_short.html' with contributor=fellowship.contributor %}
</div>
{% endfor %}
diff --git a/scipost/templates/scipost/bare_base.html b/scipost/templates/scipost/bare_base.html
index 6b326d991c7cb9bd84acf26c42158e272b0e350f..7bf4d7b5912cb31419f107bdf0d87bd58994e6fd 100644
--- a/scipost/templates/scipost/bare_base.html
+++ b/scipost/templates/scipost/bare_base.html
@@ -31,6 +31,7 @@
{% include 'scipost/header.html' %}
{% include 'scipost/navbar.html' %}
{% block breadcrumb %}{% endblock breadcrumb %}
+
{% block secondary_navbar %}{% endblock secondary_navbar %}
{% include 'scipost/messages.html' %}
diff --git a/scipost/templates/scipost/base.html b/scipost/templates/scipost/base.html
index 9d05985f23a6b808b4259bf13d45ae726ef6f36e..af8a7d2c9b2f174f8837cb582b9efbf1034cdb85 100644
--- a/scipost/templates/scipost/base.html
+++ b/scipost/templates/scipost/base.html
@@ -1,12 +1,15 @@
{% extends 'scipost/bare_base.html' %}
{% block base %}
+
<div class="{% block container_class %}container pb-5{% endblock %}">
- {% block page_header %}{% endblock page_header %}
+ <div class="container-inner">
+ {% block page_header %}{% endblock page_header %}
- {% block content %}{% endblock content %}
+ {% block content %}{% endblock content %}
- {% block content_footer %}{% endblock content_footer %}
+ {% block content_footer %}{% endblock content_footer %}
+ </div>
</div>
{% block secondary_footer %}{% endblock secondary_footer %}
diff --git a/scipost/templates/scipost/base_for_sidebar.html b/scipost/templates/scipost/base_for_sidebar.html
index 6c413c9a89a80652d3270455b33cc28e794880ea..9569677b98e1c6b420dc2e92165e85252b7d626b 100644
--- a/scipost/templates/scipost/base_for_sidebar.html
+++ b/scipost/templates/scipost/base_for_sidebar.html
@@ -1,25 +1,30 @@
{% extends 'scipost/bare_base.html' %}
{% block base %}
- <div class="content-wrapper">
- <div class="main-panel">
- <div class="{% block container_class %}container-fluid{% endblock %}">
- {% block page_header %}{% endblock page_header %}
+ <div class="container">
+ <div class="content-wrapper">
+ <div class="main-panel">
+ <div class="container-inner">
+ <div class="{% block container_class %}{% endblock %}">
+ {% block page_header %}{% endblock page_header %}
- {% block content %}{% endblock content %}
+ {% block content %}{% endblock content %}
- {% block content_footer %}{% endblock content_footer %}
- </div>
+ {% block content_footer %}{% endblock content_footer %}
+ </div>
- {% block secondary_footer %}{% endblock secondary_footer %}
+ {% block secondary_footer %}{% endblock secondary_footer %}
+ </div>
- </div>
+ </div>
- <div class="sidebar">
- {% block sidebar %}{% endblock %}
+ <div class="sidebar">
+ <div class="container-inner">
+ {% block sidebar %}{% endblock %}
+ </div>
+ </div>
+ </div>
</div>
- </div>
-
{% include 'scipost/footer.html' %}
{% endblock base %}
diff --git a/scipost/templates/scipost/foundation.html b/scipost/templates/scipost/foundation.html
index 4fd490282d77f24db8399d02957c53b7025f8771..8b5691c24416a1bee3ae432c73a30f49a9b1b565 100644
--- a/scipost/templates/scipost/foundation.html
+++ b/scipost/templates/scipost/foundation.html
@@ -5,13 +5,14 @@
{% load staticfiles %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
- {# <a href="{% url 'scipost:FAQ' %}" class="breadcrumb-item">Frequently asked questions</a>#}
- <span class="breadcrumb-item">Foundation</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+ <span class="breadcrumb-item">Foundation</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html
index c85dd99638939ffefad2995eac8fb76b81e747a0..05e6b25b83d15f009b6bb6ac425a03dd8b6a7e8b 100644
--- a/scipost/templates/scipost/header.html
+++ b/scipost/templates/scipost/header.html
@@ -1,16 +1,17 @@
{% load staticfiles %}
<header>
-
- <div class="flex-container" id="headerflex">
- <div class="flex-logobox">
- <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="240" /></a>
- </div>
- <div class="flex-blurbbox d-none d-md-block">
- <p>
- <i>The complete scientific publication portal</i><br />
- <i>Managed by professional scientists</i><br />
- <i>For open, global and perpetual access to science</i>
- </p>
- </div>
- </div>
+ <div class="container">
+ <div class="flex-container" id="headerflex">
+ <div class="flex-logobox">
+ <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="240" /></a>
+ </div>
+ <div class="flex-blurbbox d-none d-md-block">
+ <p>
+ <i>The complete scientific publication portal</i><br />
+ <i>Managed by professional scientists</i><br />
+ <i>For open, global and perpetual access to science</i>
+ </p>
+ </div>
+ </div>
+ </div>
</header>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 59862ebd0256875d6e3b27ead7f7c84647c147d6..1bcfc115cbae7805a462fd0333f4192069806cbc 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -6,16 +6,24 @@
{% block body_class %}{{block.super}} has-sidebar has-breadcrumb-submenu homepage{% endblock %}
{% block breadcrumb %}
- <nav class="submenu">
- <span class="item">Our Journals:</span>
- {% for journal in journals %}
- {% if journal.active %}
- <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
- {% else %}
- <a href="{% url 'journal:about' journal.name %}" class="item">{{journal}}</a>
- {% endif %}
- {% endfor %}
- </nav>
+ <div class="container-outside sub-nav">
+ <div class="container">
+ <nav class="navbar sub-nav navbar-expand-lg">
+ <ul class="navbar-nav">
+ <li class="nav-item"><span class="nav-link">Our Journals:</span></li>
+ {% for journal in journals %}
+ <li class="nav-item">
+ {% if journal.active %}
+ <a href="{{journal.get_absolute_url}}" class="nav-link">{{journal}}</a>
+ {% else %}
+ <a href="{% url 'journal:about' journal.name %}" class="nav-link">{{journal}}</a>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </div>
+ </nav>
+ </div>
+ </div>
{% endblock %}
{% block footer_script %}
@@ -26,7 +34,7 @@
<div class="row">
<div class="col-lg-6">
<!-- Latest publications -->
- <div class="card card-grey px-4">
+ <div class="card card-grey px-3">
<div class="card-header px-0">
<h2><a href="{% url 'journals:journals' %}" class="text-black">Latest Publications</a></h2>
</div>
@@ -51,7 +59,7 @@
<div class="col-lg-6">
<!-- Latest submissions -->
- <div class="card card-grey px-4">
+ <div class="card card-grey px-3">
<div class="card-header px-0">
<h2><a href="{% url 'submissions:submissions' %}" class="text-black">Latest Submissions</a></h2>
</div>
@@ -168,13 +176,16 @@
<footer class="container-fluid text-left secondary pt-4 mt-5">
<div class="row">
<div class="col-lg-6">
- <h1>SciPost is endorsed by</h1>
- <div class="row">
- <div class="col-lg-6">
- <a href="//www.nwo.nl/en" target="_blank"><img style="max-height: 55px; width: auto;" src="{% static 'scipost/images/NWO_logo_EN.jpg' %}" alt="NWO logo"></a>
- <p id="NWOOpenAccess" class="mt-1">All articles published in SciPost Journals fulfill the Gold standard Open Access requirements of the NWO, as
- stipulated on the NWO’s <a href="//www.nwo.nl/en/policies/open+science" target="_blank">Open Science page</a>.</p>
- </div>
+ <h1>Supporting partners</h1>
+ <a class="mb-2 d-inline-block" href="{% url 'partners:partners' %}">See all Partners</a>
+ <div class="supporting-partners">
+ <ul id="fader">
+ {% for agreement in current_agreements %}
+ {% if agreement.partner.institution.logo %}
+ <li class="item"><img height="100" class="rounded" src="{{ agreement.partner.institution.logo.url }}" alt="Partner Logo"></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
</div>
</div>
<div class="col-lg-6 logos">
@@ -184,6 +195,18 @@
<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>
</div>
- </div>
+ </div>
+ <div class="row">
+ <div class"col-lg-6 logos">
+ <h1>Granting institutions</h1>
+ <div class="granting-institutions">
+ <a href="//www.nwo.nl/en" target="_blank" style="max-width: 600px;"><img width="600" src="{% static 'scipost/images/NWO_LOGO_EN_2.png' %}"></a>
+ <a href="//www.mpg.de/en" target="_blank"><img width="100" src="{% static 'scipost/images/Max-Planck-Gesellschaft.svg' %}"></a>
+ <a href="//www.vsnu.nl" target="_blank"><img width="100" src="{% static 'scipost/images/logovsnu.jpg' %}"></a>
+ <a href="//www.openaire.eu" target="_blank"><img width="100" src="{% static 'scipost/images/OpenAIRE.png' %}"></a>
+ <a href="//i4oc.org/" target="_blank"><img width="100" src="{% static 'scipost/images/I4OC.png' %}"></a>
+ </div>
+ </div>
+ </div>
</footer>
{% endblock %}
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index 6c0bea234470a3afe91bf080a4bf276f6978e84c..960f025f7c4c84f59f4254da00694af3e3888133 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -3,74 +3,82 @@
{% load scipost_extras %}
-<nav class="navbar navbar-light main-nav navbar-expand-lg">
- <ul id="menu-navbar" class="navbar-nav">
- <li class="nav-item{% if request.path == '/' %} active{% endif %}">
- <a href="{% url 'scipost:index' %}" class="nav-link">Home</a>
- </li>
- <li class="nav-item{% if '/journals/' in request.path %} active{% endif %}">
- <a href="{% url 'journals:journals' %}" class="nav-link">Journals</a>
- </li>
- <li class="nav-item{% if '/submissions/' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'submissions:submissions' %}">Submissions</a>
- </li>
- <li class="nav-item{% if '/commentaries/' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'commentaries:commentaries' %}">Commentaries</a>
- </li>
- <li class="nav-item{% if '/theses/' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'theses:theses' %}">Theses</a>
- </li>
- <li class="nav-item{% if '/about' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'scipost:about' %}">About SciPost</a>
- </li>
+<div class="container-outside main-nav">
+ <div class="container">
+ <nav class="navbar main-nav navbar-expand-lg">
+ <ul id="menu-navbar" class="navbar-nav">
+ <li class="nav-item{% if request.path == '/' %} active{% endif %}">
+ <a href="{% url 'scipost:index' %}" class="nav-link">Home</a>
+ </li>
+ <li class="nav-item{% if '/journals/' in request.path %} active{% endif %}">
+ <a href="{% url 'journals:journals' %}" class="nav-link">Journals</a>
+ </li>
+ <li class="nav-item{% if '/submissions/' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'submissions:submissions' %}">Submissions</a>
+ </li>
+ <li class="nav-item{% if '/commentaries/' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'commentaries:commentaries' %}">Commentaries</a>
+ </li>
+ <li class="nav-item{% if '/theses/' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'theses:theses' %}">Theses</a>
+ </li>
+ <li class="nav-item{% if '/about' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'scipost:about' %}">About SciPost</a>
+ </li>
- {% if user.is_authenticated %}
- {% if request.user|is_in_group:'Testers' %}
- <li class="nav-item highlighted navbar-counter">
- <div class="nav-link notifications_container">
- <a href="javascript:;" class="d-inline-block ml-1 badge_link" id="notifications_badge" data-toggle="popover">
- <span class="user">{% if user.last_name %}{% if user.contributor %}{{ user.contributor.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</span>
- <i class="fa fa-inbox" aria-hidden="true"></i>
- {% live_notify_badge classes="badge badge-pill badge-primary" %}
- </a>
- {% live_notify_list %}
- </div>
+ {% if user.is_authenticated %}
+ {% if request.user|is_in_group:'Testers' %}
+ <li class="nav-item navbar-counter">
+ <div class="nav-link notifications_container">
+ <a href="javascript:;" class="d-inline-block ml-1 badge_link" id="notifications_badge" data-toggle="popover">
+ <span class="user">{% if user.last_name %}{% if user.contributor %}{{ user.contributor.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</span>
+ <i class="fa fa-inbox" aria-hidden="true" style="min-width: 16px;"></i>
+ {% live_notify_badge classes="badge badge-pill badge-primary" %}
+ </a>
+ {% live_notify_list %}
+ </div>
- </li>
- {% else %}
- <li class="nav-item highlighted">
- <span class="nav-link">Logged in as {{ user.username }}</span>
- </li>
- {% endif %}
- <li class="nav-item">
- <a class="nav-link" href="{% url 'scipost:logout' %}">Logout</a>
- </li>
- {% if perms.scipost.can_view_production %}
- <li class="nav-item{% if '/production' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'production:production' %}">Production</a>
- </li>
- {% endif %}
- {% if user.contributor %}
- <li class="nav-item{% if '/personal_page' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'scipost:personal_page' %}">Personal Page</a>
- </li>
- {% endif %}
- {% if user.partner_contact %}
- <li class="nav-item{% if '/partners/dashboard' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'partners:dashboard' %}">Partner Page</a>
+ </li>
+ {% else %}
+ <li class="nav-item highlighted">
+ <span class="nav-link">Logged in as {{ user.username }}</span>
+ </li>
+ {% endif %}
+ <li class="nav-item">
+ <a class="nav-link" href="{% url 'scipost:logout' %}">Logout</a>
+ </li>
+ {% if perms.scipost.can_view_production %}
+ <li class="nav-item{% if '/production' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'production:production' %}">Production</a>
+ </li>
+ {% endif %}
+ {% if user.contributor %}
+ <li class="nav-item{% if '/personal_page' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'scipost:personal_page' %}">Personal Page</a>
+ </li>
+ {% endif %}
+ {% if user.partner_contact %}
+ <li class="nav-item{% if '/partners/dashboard' in request.path %} active{% endif %}">
+ <a class="nav-link" href="{% url 'partners:dashboard' %}">Partner Page</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="nav-item{% if request.path == '/login/' %} active{% endif %}">
+ <a class="nav-link" href="{% url 'scipost:login' %}">Login</a>
+ </li>
+ {% endif %}
+
+ <li class="nav-item search-item">
+ <a class="nav-link" href="{% url 'scipost:search' %}">Search</a>
</li>
- {% endif %}
- {% else %}
- <li class="nav-item{% if request.path == '/login/' %} active{% endif %}">
- <a class="nav-link" href="{% url 'scipost:login' %}">Login</a>
- </li>
- {% endif %}
- </ul>
- <form action="{% url 'scipost:search' %}" method="get" class="form-inline search-nav-form">
- <input class="form-control" id="id_q" maxlength="100" name="q" type="text" required="required" value="{{search_query|default:''}}">
- <input class="btn btn-secondary" type="submit" value="Search">
- </form>
-</nav>
+ </ul>
+ <form action="{% url 'scipost:search' %}" method="get" class="form-inline search-nav-form">
+ <input class="form-control mr-sm-2" id="id_q" maxlength="100" name="q" type="text" aria-label="Search" value="{{ search_query|default:'' }}">
+ <button class="btn my-0" type="submit"><i class="fa fa-search"></i> Search</button>
+ </form>
+ </nav>
+ </div>
+</div>
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 8339a12e3e5bf26d8d5a60f01b27ddbd052325f2..68989e3ceeae91a9ccc3ac05ce413e13399f17e4 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -5,758 +5,760 @@
{% block pagetitle %}: personal page{% endblock pagetitle %}
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <h1>Welcome to your SciPost Personal Page{% if appellation %}, {{ appellation }}{% endif %}</h1>
+ </div>
+ </div>
+{% endblock %}
+
{% block content %}
-{% if needs_validation %}
+ {% if needs_validation %}
- <div class="row">
- <div class="col-12">
- <hr class="hr12">
- <h3>Your credentials will soon be verified by an Editor.</h3>
- <p>If accepted, you will become a registered Contributor, enabling you to submit, comment and vote.</p>
+ <div class="row">
+ <div class="col-12">
+ <hr class="hr12">
+ <h3>Your credentials will soon be verified by an Editor.</h3>
+ <p>If accepted, you will become a registered Contributor, enabling you to submit, comment and vote.</p>
+ </div>
</div>
- </div>
-{% else %}
- {# Save all Permission groups into template variables #}
- {% is_edcol_admin request.user as is_edcol_admin %}
- {% is_scipost_admin request.user as is_scipost_admin %}
- {% is_editorial_college request.user as is_editorial_college %}
- {% is_advisory_board request.user as is_advisory_board %}
- {% is_vetting_editor request.user as is_vetting_editor %}
- {% is_ambassador request.user as is_ambassador %}
- {% is_junior_ambassador request.user as is_junior_ambassador %}
- {% is_registered_contributor request.user as is_registered_contributor %}
- {% is_tester request.user as is_tester %}
- {% is_production_officer request.user as is_production_officer %}
-
- <div class="row">
- <div class="col-12">
- <h1 class="highlight">Welcome to your SciPost Personal Page, {{ appellation }}</h1>
- </div>
- </div>
-
- <div class="row">
- <div class="col-12">
- <div class="tab-nav-container">
- <div class="tab-nav-inner">
- <!-- Nav tabs -->
- <ul class="nav btn-group personal-page-nav" role="tablist">
- <li class="nav-item btn btn-secondary">
- <a href="#account" class="nav-link active" data-toggle="tab">Account</a>
- </li>
- {% if is_scipost_admin or is_edcol_admin or is_editorial_college or is_advisory_board or is_vetting_editor or is_ambassador or is_junior_ambassador %}
- <li class="nav-item btn btn-secondary">
- <a href="#editorial-actions" class="nav-link" data-toggle="tab">Editorial Actions</a>
- </li>
- {% endif %}
- {% if perms.scipost.can_referee %}
- <li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#refereeing">Refereeing {% if refereeing_tab_total_count %}({{refereeing_tab_total_count}}){% endif %}</a>
- </li>
- {% endif %}
- {% if contributor %}
- {# If user is contributor #}
+ {% else %}
+ {# Save all Permission groups into template variables #}
+ {% is_edcol_admin request.user as is_edcol_admin %}
+ {% is_scipost_admin request.user as is_scipost_admin %}
+ {% is_editorial_college request.user as is_editorial_college %}
+ {% is_advisory_board request.user as is_advisory_board %}
+ {% is_vetting_editor request.user as is_vetting_editor %}
+ {% is_ambassador request.user as is_ambassador %}
+ {% is_junior_ambassador request.user as is_junior_ambassador %}
+ {% is_registered_contributor request.user as is_registered_contributor %}
+ {% is_tester request.user as is_tester %}
+ {% is_production_officer request.user as is_production_officer %}
+
+ <div class="row">
+ <div class="col-12">
+ <div class="tab-nav-container">
+ <div class="tab-nav-inner">
+ <!-- Nav tabs -->
+ <ul class="nav btn-group personal-page-nav" role="tablist">
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#publications">Publications</a>
+ <a href="#account" class="nav-link active" data-toggle="tab">Account</a>
</li>
- <li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#submissions">Submissions</a>
- </li>
- <li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#commentaries">Commentaries</a>
- </li>
- <li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#theses">Theses</a>
- </li>
- <li class="nav-item btn btn-secondary">
- {% with contributor.comments.regular_comments.awaiting_vetting.count as count %}
- <a class="nav-link" data-toggle="tab" href="#comments">Comments{% if count %} ({{count}} unvetted){% endif %}</a>
- {% endwith %}
- </li>
- <li class="nav-item btn btn-secondary">
- {% with contributor.comments.author_replies.awaiting_vetting.count as count %}
- <a class="nav-link" data-toggle="tab" href="#author-replies">Author Replies{% if count %} ({{count}} unvetted){% endif %}</a>
- {% endwith %}
- </li>
- {# END: If user is contributor #}
- {% endif %}
- </ul>
+ {% if is_scipost_admin or is_edcol_admin or is_editorial_college or is_advisory_board or is_vetting_editor or is_ambassador or is_junior_ambassador %}
+ <li class="nav-item btn btn-secondary">
+ <a href="#editorial-actions" class="nav-link" data-toggle="tab">Editorial Actions</a>
+ </li>
+ {% endif %}
+ {% if perms.scipost.can_referee %}
+ <li class="nav-item btn btn-secondary">
+ <a class="nav-link" data-toggle="tab" href="#refereeing">Refereeing {% if refereeing_tab_total_count %}({{refereeing_tab_total_count}}){% endif %}</a>
+ </li>
+ {% endif %}
+ {% if contributor %}
+ {# If user is contributor #}
+ <li class="nav-item btn btn-secondary">
+ <a class="nav-link" data-toggle="tab" href="#publications">Publications</a>
+ </li>
+ <li class="nav-item btn btn-secondary">
+ <a class="nav-link" data-toggle="tab" href="#submissions">Submissions</a>
+ </li>
+ <li class="nav-item btn btn-secondary">
+ <a class="nav-link" data-toggle="tab" href="#commentaries">Commentaries</a>
+ </li>
+ <li class="nav-item btn btn-secondary">
+ <a class="nav-link" data-toggle="tab" href="#theses">Theses</a>
+ </li>
+ <li class="nav-item btn btn-secondary">
+ {% with contributor.comments.regular_comments.awaiting_vetting.count as count %}
+ <a class="nav-link" data-toggle="tab" href="#comments">Comments{% if count %} ({{count}} unvetted){% endif %}</a>
+ {% endwith %}
+ </li>
+ <li class="nav-item btn btn-secondary">
+ {% with contributor.comments.author_replies.awaiting_vetting.count as count %}
+ <a class="nav-link" data-toggle="tab" href="#author-replies">Author Replies{% if count %} ({{count}} unvetted){% endif %}</a>
+ {% endwith %}
+ </li>
+ {# END: If user is contributor #}
+ {% endif %}
+ </ul>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="tab-content">
- <!-- Tab: Account -->
- <div class="tab-pane active" id="account" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Account</h2>
+ <div class="tab-content">
+ <!-- Tab: Account -->
+ <div class="tab-pane active" id="account" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Account</h2>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row">
- <div class="col-md-6">
- <h3>Your personal details:</h3>
- {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
-
- {% if contributor %}
- {# Scientist fields #}
- <h3 class="mt-3">Your main discipline:</h3>
- <ul><li>{{ contributor.get_discipline_display }}</li></ul>
-
- <h3 class="mt-3">Your expertises:</h3>
- {% if contributor.expertises %}
- {% include "scipost/_expertises_as_ul.html" with contributor=contributor %}
- {% else %}
- <p>You haven't listed your expertise(s).<br/>
- Do so by <a href="{% url 'scipost:update_personal_data' %}">updating your personal data</a>
- </p>
- {% endif %}
- {# END: Scientist fields #}
- {% endif %}
- </div>
- <div class="col-md-6">
- {% if contributor %}
+ <div class="row">
+ <div class="col-md-6">
+ <h3>Your personal details:</h3>
+ {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
+
+ {% if contributor %}
{# Scientist fields #}
- {% if not contributor.is_currently_available %}
- <h3 class="text-warning">You are currently unavailable</h3>
- <p>Check your availability underneath if this should not be the case.</p>
- <hr>
+ <h3 class="mt-3">Your main discipline:</h3>
+ <ul><li>{{ contributor.get_discipline_display }}</li></ul>
+
+ <h3 class="mt-3">Your expertises:</h3>
+ {% if contributor.expertises %}
+ {% include "scipost/_expertises_as_ul.html" with contributor=contributor %}
+ {% else %}
+ <p>You haven't listed your expertise(s).<br/>
+ Do so by <a href="{% url 'scipost:update_personal_data' %}">updating your personal data</a>
+ </p>
{% endif %}
{# END: Scientist fields #}
- {% endif %}
-
- {% if not request.user.contributor.petition_signatories.exists %}
- <div class="border border-danger p-2">
- <h3 class="text-danger">Scientists, please help us out!</h3>
- <p class="mb-1">If it is not listed on our Partners page, please encourage your institution (through a librarian, director, ...) to join by <a class="h3 text-blue" href="{% url 'petitions:petition' slug='join-SPB' %}">signing our petition</a>.</p>
- </div>
- <hr>
- {% endif %}
-
- {% if is_scipost_admin %}
- <h3>You are a SciPost Administrator.</h3>
- {% endif %}
- {% if is_edcol_admin %}
- <h3>You are a SciPost Editorial Administrator.</h3>
- {% endif %}
- {% if is_advisory_board %}
- <h3>You are a member of the Advisory Board.</h3>
- {% endif %}
- {% if is_editorial_college %}
- <h3>You are a member of the Editorial College.</h3>
- {% endif %}
- {% if is_vetting_editor %}
- <h3>You are a SciPost Vetting Editor.</h3>
- {% endif %}
- {% if is_registered_contributor %}
- <h3>You are a Registered Contributor.</h3>
- {% endif %}
- {% if is_tester %}
- <h3>You are a SciPost Tester.</h3>
- {% endif %}
- {% if is_ambassador %}
- <h3>You are a SciPost Ambassador.</h3>
- {% endif %}
- {% if is_junior_ambassador %}
- <h3>You are a SciPost Junior Ambassador.</h3>
- {% endif %}
- {% if is_production_officer %}
- <h3>You are a SciPost Production Officer.</h3>
- {% endif %}
-
- {% if contributor.fellowships.exists %}
- <h3>Your Fellowships:</h3>
- <ul class="mb-2">
- {% for fellowship in contributor.fellowships.all %}
- <li class="pt-1">
- {{ fellowship.contributor.get_discipline_display }}
-
- {% if fellowship.guest %}
- (Guest Fellowship)
- {% else %}
- (Regular Fellowship)
+ {% endif %}
+ </div>
+ <div class="col-md-6">
+ {% if contributor %}
+ {# Scientist fields #}
+ {% if not contributor.is_currently_available %}
+ <h3 class="text-warning">You are currently unavailable</h3>
+ <p>Check your availability underneath if this should not be the case.</p>
+ <hr>
{% endif %}
+ {# END: Scientist fields #}
+ {% endif %}
- {% if not fellowship.is_active %}
- <span class="label label-outline-warning label-sm">Inactive</span>
- {% endif %}
+ {% if not request.user.contributor.petition_signatories.exists %}
+ <div class="border border-danger p-2">
+ <h3 class="text-danger">Scientists, please help us out!</h3>
+ <p class="mb-1">If it is not listed on our Partners page, please encourage your institution (through a librarian, director, ...) to join by <a class="h3 text-blue" href="{% url 'petitions:petition' slug='join-SPB' %}">signing our petition</a>.</p>
+ </div>
+ <hr>
+ {% endif %}
- {% if fellowship.start_date or fellowship.until_date %}
- <div class="text-muted">
- {% if fellowship.start_date %}
- from {{ fellowship.start_date }}
- {% endif %}
+ {% if is_scipost_admin %}
+ <h3>You are a SciPost Administrator.</h3>
+ {% endif %}
+ {% if is_edcol_admin %}
+ <h3>You are a SciPost Editorial Administrator.</h3>
+ {% endif %}
+ {% if is_advisory_board %}
+ <h3>You are a member of the Advisory Board.</h3>
+ {% endif %}
+ {% if is_editorial_college %}
+ <h3>You are a member of the Editorial College.</h3>
+ {% endif %}
+ {% if is_vetting_editor %}
+ <h3>You are a SciPost Vetting Editor.</h3>
+ {% endif %}
+ {% if is_registered_contributor %}
+ <h3>You are a Registered Contributor.</h3>
+ {% endif %}
+ {% if is_tester %}
+ <h3>You are a SciPost Tester.</h3>
+ {% endif %}
+ {% if is_ambassador %}
+ <h3>You are a SciPost Ambassador.</h3>
+ {% endif %}
+ {% if is_junior_ambassador %}
+ <h3>You are a SciPost Junior Ambassador.</h3>
+ {% endif %}
+ {% if is_production_officer %}
+ <h3>You are a SciPost Production Officer.</h3>
+ {% endif %}
+
+ {% if contributor.fellowships.exists %}
+ <h3>Your Fellowships:</h3>
+ <ul class="mb-2">
+ {% for fellowship in contributor.fellowships.all %}
+ <li class="pt-1">
+ {{ fellowship.contributor.get_discipline_display }}
+
+ {% if fellowship.guest %}
+ (Guest Fellowship)
+ {% else %}
+ (Regular Fellowship)
+ {% endif %}
- {% if fellowship.until_date %}
- until {{ fellowship.until_date }}
- {% endif %}
- </div>
- {% endif %}
- </li>
+ {% if not fellowship.is_active %}
+ <span class="label label-outline-warning label-sm">Inactive</span>
+ {% endif %}
- {% endfor %}
- </ul>
- <a href="{% url 'submissions:pool' %}" class="h3 text-primary ml-4 px-3 d-block-inline">Go to the Submissions Pool</a>
- {% endif %}
+ {% if fellowship.start_date or fellowship.until_date %}
+ <div class="text-muted">
+ {% if fellowship.start_date %}
+ from {{ fellowship.start_date }}
+ {% endif %}
- <h3 class="mt-3">Update your personal data or password</h3>
+ {% if fellowship.until_date %}
+ until {{ fellowship.until_date }}
+ {% endif %}
+ </div>
+ {% endif %}
+ </li>
- <ul>
- <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
- <li><a href="{% url 'scipost:change_password' %}">Change your password</a></li>
- </ul>
- </div>
- </div>
+ {% endfor %}
+ </ul>
+ <a href="{% url 'submissions:pool' %}" class="h3 text-primary ml-4 px-3 d-block-inline">Go to the Submissions Pool</a>
+ {% endif %}
- {% if unavailability_form %}
- <hr>
- <div class="row">
- <div class="col">
- <h2 class="highlight">Your Availability</h2>
+ <h3 class="mt-3">Update your personal data or password</h3>
+
+ <ul>
+ <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
+ <li><a href="{% url 'scipost:change_password' %}">Change your password</a></li>
+ </ul>
</div>
</div>
- <div class="row justify-content-center">
- <div class="col-md-4 mr-md-5">
- <p>To help with the editorial workflow, you can inform us of any periods during which you are unavailable. We will do our best to respect these.</p>
- <h3 class="mb-3">Mark a period as unavailable:</h3>
- <form action="{% url 'scipost:mark_unavailable_period' %}" method="post">
- {% csrf_token %}
- {{ unavailability_form|bootstrap }}
- <input class="btn btn-secondary" type="submit" value="Submit" />
- </form>
+
+ {% if unavailability_form %}
+ <hr>
+ <div class="row">
+ <div class="col">
+ <h2 class="highlight">Your Availability</h2>
+ </div>
</div>
- <div class="col-md-4 ml-md-5">
- {% if unavailabilities %}
- <h3>Your unavailability periods in our records</h3>
- <p class="text-muted">(YYYY-MM-DD)</p>
- <table class="table">
- <tr>
- <th>Start</th>
- <th colspan="2">End</th>
- </tr>
- {% for unav in unavailabilities %}
- <tr>
- <td>{{ unav.start }}</td>
- <td>{{ unav.end }}</td>
- <td>
- <form action="{% url 'scipost:delete_unavailable_period' unav.id %}" method="post">
- {% csrf_token %}
- <input class="btn btn-danger" type="submit" value="Delete" />
- </form>
- </td>
- </tr>
- {% endfor %}
- </table>
- {% else %}
- <p>You don't have any upcoming unavailability periods on record.</p>
- {% endif %}
+ <div class="row justify-content-center">
+ <div class="col-md-4 mr-md-5">
+ <p>To help with the editorial workflow, you can inform us of any periods during which you are unavailable. We will do our best to respect these.</p>
+ <h3 class="mb-3">Mark a period as unavailable:</h3>
+ <form action="{% url 'scipost:mark_unavailable_period' %}" method="post">
+ {% csrf_token %}
+ {{ unavailability_form|bootstrap }}
+ <input class="btn btn-secondary" type="submit" value="Submit" />
+ </form>
+ </div>
+ <div class="col-md-4 ml-md-5">
+ {% if unavailabilities %}
+ <h3>Your unavailability periods in our records</h3>
+ <p class="text-muted">(YYYY-MM-DD)</p>
+ <table class="table">
+ <tr>
+ <th>Start</th>
+ <th colspan="2">End</th>
+ </tr>
+ {% for unav in unavailabilities %}
+ <tr>
+ <td>{{ unav.start }}</td>
+ <td>{{ unav.end }}</td>
+ <td>
+ <form action="{% url 'scipost:delete_unavailable_period' unav.id %}" method="post">
+ {% csrf_token %}
+ <input class="btn btn-danger" type="submit" value="Delete" />
+ </form>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% else %}
+ <p>You don't have any upcoming unavailability periods on record.</p>
+ {% endif %}
+ </div>
</div>
- </div>
- {% endif %}
- </div><!-- End tab -->
+ {% endif %}
+ </div><!-- End tab -->
- {% if is_scipost_admin or is_edcol_admin or is_editorial_college or is_advisory_board or is_vetting_editor or is_ambassador or is_junior_ambassador %}
- <!-- Tab: Editorial Actions -->
- <div class="tab-pane" id="editorial-actions" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title mb-0">Pending Editorial Actions</h2>
+ {% if is_scipost_admin or is_edcol_admin or is_editorial_college or is_advisory_board or is_vetting_editor or is_ambassador or is_junior_ambassador %}
+ <!-- Tab: Editorial Actions -->
+ <div class="tab-pane" id="editorial-actions" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Pending Editorial Actions</h2>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row">
- {% if is_scipost_admin or is_advisory_board or is_ambassador or is_junior_ambassador %}
- <div class="col-md-4">
- <h3>Registration actions</h3>
- <ul>
- {% if perms.scipost.can_vet_registration_requests %}
- <li><a href="{% url 'scipost:vet_registration_requests' %}">Vet Registration requests</a> ({{ nr_reg_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_resend_registration_requests %}
- <li><a href="{% url 'scipost:registration_requests' %}">Awaiting validation</a> ({{ nr_reg_awaiting_validation }})</li>
- {% endif %}
- {% if perms.scipost.can_draft_registration_invitations %}
- <li><a href="{% url 'scipost:draft_registration_invitation' %}">Draft a Registration Invitation</a></li>
- {% endif %}
+ <div class="row">
+ {% if is_scipost_admin or is_advisory_board or is_ambassador or is_junior_ambassador %}
+ <div class="col-md-4">
+ <h3>Registration actions</h3>
+ <ul>
+ {% if perms.scipost.can_vet_registration_requests %}
+ <li><a href="{% url 'scipost:vet_registration_requests' %}">Vet Registration requests</a> ({{ nr_reg_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_resend_registration_requests %}
+ <li><a href="{% url 'scipost:registration_requests' %}">Awaiting validation</a> ({{ nr_reg_awaiting_validation }})</li>
+ {% endif %}
+ {% if perms.scipost.can_draft_registration_invitations %}
+ <li><a href="{% url 'scipost:draft_registration_invitation' %}">Draft a Registration Invitation</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_registration_invitations %}
+ <li><a href="{% url 'scipost:registration_invitations' %}">Manage Registration Invitations</a></li>
+ {% endif %}
+ </ul>
+
{% if perms.scipost.can_manage_registration_invitations %}
- <li><a href="{% url 'scipost:registration_invitations' %}">Manage Registration Invitations</a></li>
+ <h3>Notifications</h3>
+ <ul>
+ <li><a href="{% url 'scipost:citation_notifications' %}">Manage citation notifications</a></li>
+ </ul>
{% endif %}
- </ul>
- {% if perms.scipost.can_manage_registration_invitations %}
- <h3>Notifications</h3>
- <ul>
- <li><a href="{% url 'scipost:citation_notifications' %}">Manage citation notifications</a></li>
- </ul>
+ {% if is_scipost_admin %}
+ <h3>Email communications</h3>
+ <ul>
+ {% if perms.scipost.can_email_group_members %}
+ <li><a href="{% url 'scipost:email_group_members' %}">Email Group Members</a></li>
+ {% endif %}
+ {% if perms.scipost.can_email_particulars %}
+ <li><a href="{% url 'scipost:send_precooked_email' %}">Send a precooked email</a></li>
+ <li><a href="{% url 'scipost:email_particular' %}">Email a particular individual/address</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_mailchimp %}
+ <li><a href="{% url 'mailing_lists:overview' %}">Manage mailing lists</a></li>
+ {% endif %}
+ </ul>
+
+ <h3>SciPost Administation</h3>
+ <ul>
+ <li><a href="{% url 'affiliations:institutions' %}">Manage Institutions database</a></li>
+ </ul>
+ {% endif %}
+
+ {% if perms.scipost.can_view_timesheets %}
+ <h3>Finance</h3>
+ <ul>
+ <li><a href="{% url 'finances:timesheets' %}">Production Team Timesheets</a></li>
+ </ul>
+ {% endif %}
+ </div>
{% endif %}
- {% if is_scipost_admin %}
- <h3>Email communications</h3>
+ <div class="col-md-4">
+ {% if is_vetting_editor or perms.scipost.can_vet_submitted_reports %}
+ <h3>Vetting actions</h3>
<ul>
- {% if perms.scipost.can_email_group_members %}
- <li><a href="{% url 'scipost:email_group_members' %}">Email Group Members</a></li>
+ {% if perms.scipost.can_vet_commentary_requests %}
+ <li><a href="{% url 'commentaries:vet_commentary_requests' %}">Vet Commentary Page requests</a> ({{ nr_commentary_page_requests_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_vet_comments %}
+ <li><a href="{% url 'comments:vet_submitted_comments_list' %}">Vet submitted Comments</a> ({{ nr_comments_to_vet }})</li>
{% endif %}
- {% if perms.scipost.can_email_particulars %}
- <li><a href="{% url 'scipost:send_precooked_email' %}">Send a precooked email</a></li>
- <li><a href="{% url 'scipost:email_particular' %}">Email a particular individual/address</a></li>
+ {% if perms.scipost.can_vet_thesislink_requests %}
+ <li><a href="{% url 'theses:unvetted_thesislinks' %}">Vet Thesis Link Requests</a> ({{ nr_thesislink_requests_to_vet }})</li>
{% endif %}
- {% if perms.scipost.can_manage_mailchimp %}
- <li><a href="{% url 'mailing_lists:overview' %}">Manage mailing lists</a></li>
+ {% if perms.scipost.can_vet_authorship_claims %}
+ <li><a href="{% url 'scipost:vet_authorship_claims' %}">Vet Authorship Claims</a> ({{ nr_authorship_claims_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_vet_submitted_reports %}
+ <li><a href="{% url 'submissions:vet_submitted_reports_list' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
{% endif %}
</ul>
+ {% endif %}
+
+ {% if is_edcol_admin %}
+ <h3>Editorial Admin actions</h3>
+ <ul>
+ <li><a href="{% url 'submissions:reports_accepted_list' %}">Accepted Reports</a>{% if nr_reports_without_pdf %} ({{nr_reports_without_pdf}} unfinished){% endif %}</li>
+ <li><a href="{% url 'submissions:pool' %}">Submissions Pool</a></li>
+ <li><a href="{% url 'submissions:treated_submissions_list' %}">Fully treated Submissions</a>{% if nr_treated_submissions_without_pdf %} ({{nr_treated_submissions_without_pdf}} unfinished){% endif %}</li>
+ <li><a href="{% url 'journals:harvest_citedby_list' %}">Harvest citedby data</a></li>
+ <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li>
+ <li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
+ <li><a href="{% url 'journals:manage_metadata' %}">Manage Publication metadata</a></li>
+ <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li>
+ <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li>
+ </ul>
+ {% endif %}
- <h3>SciPost Administation</h3>
+ {% if perms.scipost.can_attend_VGMs %}
+ <h3>Virtual General Meetings</h3>
<ul>
- <li><a href="{% url 'affiliations:institutions' %}">Manage Institutions database</a></li>
+ <li><a href="{% url 'virtualmeetings:VGMs' %}">List of VGMs</a></li>
</ul>
- {% endif %}
+ {% endif %}
+ </div>
- {% if perms.scipost.can_view_timesheets %}
- <h3>Finance</h3>
+ {% if is_edcol_admin or is_editorial_college %}
+ <div class="col-md-4">
+ <h3>Info</h3>
<ul>
- <li><a href="{% url 'finances:timesheets' %}">Production Team Timesheets</a></li>
+ <li><a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a></li>
</ul>
- {% endif %}
- </div>
- {% endif %}
- <div class="col-md-4">
- {% if is_vetting_editor or perms.scipost.can_vet_submitted_reports %}
- <h3>Vetting actions</h3>
- <ul>
- {% if perms.scipost.can_vet_commentary_requests %}
- <li><a href="{% url 'commentaries:vet_commentary_requests' %}">Vet Commentary Page requests</a> ({{ nr_commentary_page_requests_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_comments %}
- <li><a href="{% url 'comments:vet_submitted_comments_list' %}">Vet submitted Comments</a> ({{ nr_comments_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_thesislink_requests %}
- <li><a href="{% url 'theses:unvetted_thesislinks' %}">Vet Thesis Link Requests</a> ({{ nr_thesislink_requests_to_vet }})</li>
+ <h3>Submissions assignments</h3>
+ <ul>
+ {% if perms.scipost.can_view_pool %}
+ <li><a href="{% url 'submissions:assignments' %}">Your assignments</a></li>
+ <li><a href="{% url 'scipost:Fellow_activity_overview' %}">View assignments overview</a></li>
{% endif %}
- {% if perms.scipost.can_vet_authorship_claims %}
- <li><a href="{% url 'scipost:vet_authorship_claims' %}">Vet Authorship Claims</a> ({{ nr_authorship_claims_to_vet }})</li>
+ {% if perms.scipost.can_assign_submissions %}
+ <li>Assign Submissions via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_submissions_to_assign }})</li>
{% endif %}
- {% if perms.scipost.can_vet_submitted_reports %}
- <li><a href="{% url 'submissions:vet_submitted_reports_list' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
+ {% if perms.scipost.can_take_charge_of_submissions %}
+ <li>Accept or decline assignments via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_assignments_to_consider }})</li>
{% endif %}
- </ul>
- {% endif %}
-
- {% if is_edcol_admin %}
- <h3>Editorial Admin actions</h3>
- <ul>
- <li><a href="{% url 'submissions:reports_accepted_list' %}">Accepted Reports</a>{% if nr_reports_without_pdf %} ({{nr_reports_without_pdf}} unfinished){% endif %}</li>
- <li><a href="{% url 'submissions:pool' %}">Submissions Pool</a></li>
- <li><a href="{% url 'submissions:treated_submissions_list' %}">Fully treated Submissions</a>{% if nr_treated_submissions_without_pdf %} ({{nr_treated_submissions_without_pdf}} unfinished){% endif %}</li>
- <li><a href="{% url 'journals:harvest_citedby_list' %}">Harvest citedby data</a></li>
- <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li>
- <li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
- <li><a href="{% url 'journals:manage_metadata' %}">Manage Publication metadata</a></li>
- <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li>
- <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li>
</ul>
- {% endif %}
-
- {% if perms.scipost.can_attend_VGMs %}
- <h3>Virtual General Meetings</h3>
- <ul>
- <li><a href="{% url 'virtualmeetings:VGMs' %}">List of VGMs</a></li>
- </ul>
- {% endif %}
- </div>
- {% if is_edcol_admin or is_editorial_college %}
- <div class="col-md-4">
- <h3>Info</h3>
- <ul>
- <li><a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a></li>
- </ul>
-
- <h3>Submissions assignments</h3>
- <ul>
- {% if perms.scipost.can_view_pool %}
- <li><a href="{% url 'submissions:assignments' %}">Your assignments</a></li>
- <li><a href="{% url 'scipost:Fellow_activity_overview' %}">View assignments overview</a></li>
- {% endif %}
- {% if perms.scipost.can_assign_submissions %}
- <li>Assign Submissions via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_submissions_to_assign }})</li>
- {% endif %}
- {% if perms.scipost.can_take_charge_of_submissions %}
- <li>Accept or decline assignments via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_assignments_to_consider }})</li>
+ {% if is_edcol_admin %}
+ <h3>Refereeing overview</h3>
+ <ul>
+ <li>View (and act on) outstanding refereeing invitations in the <a href="{% url 'submissions:refereeing_overview' %}">refereeing overview</a></li>
+ <li><a href="{% url 'stats:statistics' %}">View statistics</a> for submissions, refereeing, publishing</li>
+ </ul>
+ <h3>Voting</h3>
+ <ul>
+ <li>Prepare Editorial Recommendations for voting via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_recommendations_to_prepare_for_voting }})</li>
+ </ul>
+ {% endif %}
+ </div>
{% endif %}
- </ul>
-
- {% if is_edcol_admin %}
- <h3>Refereeing overview</h3>
- <ul>
- <li>View (and act on) outstanding refereeing invitations in the <a href="{% url 'submissions:refereeing_overview' %}">refereeing overview</a></li>
- <li><a href="{% url 'stats:statistics' %}">View statistics</a> for submissions, refereeing, publishing</li>
- </ul>
- <h3>Voting</h3>
- <ul>
- <li>Prepare Editorial Recommendations for voting via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_recommendations_to_prepare_for_voting }})</li>
- </ul>
- {% endif %}
</div>
- {% endif %}
- </div>
- {% if active_assignments %}
- <div class="row">
- <div class="col-12">
- <h3 class="highlight">Submissions for which you are Editor-in-charge</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for assignment in active_assignments %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
- {% include 'submissions/_submission_status_block.html' with submission=assignment.submission %}
- <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a>.</p>
- </div>
- </li>
- {% endfor %}
- </ul>
- </div>
- </div>
- {% endif %}
- </div><!-- End tab -->
- {% endif %}
-
- {% if contributor %}
- {# If user is contributor #}
- <!-- Tab: Publications -->
- <div class="tab-pane" id="publications" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title">Publications</h2>
- <ul class="mb-0">
- {% if nr_publication_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_publication_authorships_to_claim}})</a></li>
- {% endif %}
+ {% if active_assignments %}
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Submissions for which you are Editor-in-charge</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for assignment in active_assignments %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
+ {% include 'submissions/_submission_status_block.html' with submission=assignment.submission %}
+ <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a>.</p>
+ </div>
+ </li>
+ {% endfor %}
</ul>
</div>
</div>
- </div>
- </div>
-
- {# {% if own_publications %}#}
- <div class="row" id="mypublicationslist">
- <div class="col-12">
- <h3 class="mb-3">Publications for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-unstyled">
- {% for pub in own_publications %}
- <li>
- <div class="card card-grey card-publication" id="{{pub.doi_label}}">
- {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
- </div>
- </li>
- {% empty %}
- <li>
- <em>No Publications found</em>
- </li>
- {% endfor %}
- </ul>
- </div>
- </div>
- {# {% endif %}#}
- </div><!-- End tab -->
-
+ {% endif %}
+ </div><!-- End tab -->
+ {% endif %}
- {% if perms.scipost.can_referee %}
- <!-- Tab: Refereeing -->
- <div class="tab-pane" id="refereeing" role="tabpanel">
+ {% if contributor %}
+ {# If user is contributor #}
+ <!-- Tab: Publications -->
+ <div class="tab-pane" id="publications" role="tabpanel">
<div class="row">
<div class="col-12">
<div class="card card-grey">
<div class="card-body">
- <h2 class="card-title">Refereeing Tasks</h2>
+ <h2 class="card-title">Publications</h2>
<ul class="mb-0">
- <li><a href="{% url 'submissions:accept_or_decline_ref_invitations' %}">Accept/decline refereeing invitations</a> ({{ nr_ref_inv_to_consider }})</li>
+ {% if nr_publication_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_publication_authorships_to_claim}})</a></li>
+ {% endif %}
</ul>
</div>
</div>
</div>
</div>
- <div class="row">
+ {# {% if own_publications %}#}
+ <div class="row" id="mypublicationslist">
<div class="col-12">
- <h3>Pending Refereeing Tasks:</h3>
+ <h3 class="mb-3">Publications for which you are identified as an author:</h3>
</div>
<div class="col-12">
- <ul class="list-group list-group-flush">
- {% for task in pending_ref_tasks %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/refereeing_invitation_card_content.html' with invitation=task %}
- </div>
- </li>
- {% empty %}
- <li class="list-group-item"><em>You do not have any pending refereeing task</em></li>
- {% endfor %}
+ <ul class="list-unstyled">
+ {% for pub in own_publications %}
+ <li>
+ <div class="card card-grey card-publication" id="{{pub.doi_label}}">
+ {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
+ </div>
+ </li>
+ {% empty %}
+ <li>
+ <em>No Publications found</em>
+ </li>
+ {% endfor %}
</ul>
</div>
</div>
+ {# {% endif %}#}
+ </div><!-- End tab -->
+
- {% if contributor.reports.in_draft.exists %}
+ {% if perms.scipost.can_referee %}
+ <!-- Tab: Refereeing -->
+ <div class="tab-pane" id="refereeing" role="tabpanel">
<div class="row">
<div class="col-12">
- <h3>Unfinished reports:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for report in contributor.reports.in_draft.all %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_card_content.html' with submission=report.submission %}
- <a class="btn btn-outline-primary my-2" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a>
- </div>
- </li>
- {% endfor %}
- </ul>
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title">Refereeing Tasks</h2>
+ <ul class="mb-0">
+ <li><a href="{% url 'submissions:accept_or_decline_ref_invitations' %}">Accept/decline refereeing invitations</a> ({{ nr_ref_inv_to_consider }})</li>
+ </ul>
+ </div>
+ </div>
</div>
</div>
- {% endif %}
- {% if contributor.reports.non_draft.exists %}
<div class="row">
<div class="col-12">
- <h3>Finished reports:</h3>
+ <h3>Pending Refereeing Tasks:</h3>
</div>
<div class="col-12">
<ul class="list-group list-group-flush">
- {% for report in contributor.reports.non_draft.all %}
+ {% for task in pending_ref_tasks %}
<li class="list-group-item">
- {% comment %}
- Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
- {% endcomment %}
- <div class="card-body px-0 {% block cardblock_class_block %}{% endblock %}">
- <h3>Report on Submission <a href="{{report.submission.get_absolute_url}}">{{report.submission.title}}</a></h3>
- <table>
- <tr>
- <th style='min-width: 100px;'>Received:</th><td>{{ report.date_submitted|date:'Y-n-j' }}<td>
- </tr>
- <tr>
- <th>Status:</th><td {% if report.status == 'vetted' %}class="text-success"{% elif report.status == 'unvetted' %}class="text-danger"{% endif %}>{{report.get_status_display}}</td>
- </tr>
- {% if report.doi_label %}
- <tr>
- <th>DOI:</th><td>{{ report.doi_string }}</td></th>
- {% endif %}
- <tr>
- <th>Anonymous:</th><td>{{report.anonymous|yesno:'Yes,No'}}</td>{% if report.anonymous %}<td>You can <a href="{% url 'journals:sign_existing_report' report_id=report.id %}">click here to sign this Report</a> (leads to confirmation page){% endif %}</td>
- </tr>
- </table>
+ <div class="card-body px-0">
+ {% include 'partials/submissions/refereeing_invitation_card_content.html' with invitation=task %}
</div>
</li>
+ {% empty %}
+ <li class="list-group-item"><em>You do not have any pending refereeing task</em></li>
{% endfor %}
</ul>
</div>
</div>
- {% endif %}
- </div><!-- End tab -->
- {% endif %}
- <!-- Tab: Submissions -->
- <div class="tab-pane" id="submissions" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title">Submissions</h2>
- <ul class="mb-0">
- {% if nr_submission_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_submission_authorships_to_claim}})</a></li>
- {% endif %}
- <li><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></li>
- </ul>
+ {% if contributor.reports.in_draft.exists %}
+ <div class="row">
+ <div class="col-12">
+ <h3>Unfinished reports:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for report in contributor.reports.in_draft.all %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=report.submission %}
+ <a class="btn btn-outline-primary my-2" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ {% endif %}
+
+ {% if contributor.reports.non_draft.exists %}
+ <div class="row">
+ <div class="col-12">
+ <h3>Finished reports:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for report in contributor.reports.non_draft.all %}
+ <li class="list-group-item">
+ {% comment %}
+ Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
+ {% endcomment %}
+ <div class="card-body px-0 {% block cardblock_class_block %}{% endblock %}">
+ <h3>Report on Submission <a href="{{report.submission.get_absolute_url}}">{{report.submission.title}}</a></h3>
+ <table>
+ <tr>
+ <th style='min-width: 100px;'>Received:</th><td>{{ report.date_submitted|date:'Y-n-j' }}<td>
+ </tr>
+ <tr>
+ <th>Status:</th><td {% if report.status == 'vetted' %}class="text-success"{% elif report.status == 'unvetted' %}class="text-danger"{% endif %}>{{report.get_status_display}}</td>
+ </tr>
+ {% if report.doi_label %}
+ <tr>
+ <th>DOI:</th><td>{{ report.doi_string }}</td></th>
+ {% endif %}
+ <tr>
+ <th>Anonymous:</th><td>{{report.anonymous|yesno:'Yes,No'}}</td>{% if report.anonymous %}<td>You can <a href="{% url 'journals:sign_existing_report' report_id=report.id %}">click here to sign this Report</a> (leads to confirmation page){% endif %}</td>
+ </tr>
+ </table>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ {% endif %}
+ </div><!-- End tab -->
+ {% endif %}
+
+ <!-- Tab: Submissions -->
+ <div class="tab-pane" id="submissions" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title">Submissions</h2>
+ <ul class="mb-0">
+ {% if nr_submission_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_submission_authorships_to_claim}})</a></li>
+ {% endif %}
+ <li><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></li>
+ </ul>
+ </div>
</div>
</div>
</div>
- </div>
- {# {% if own_submissions %}#}
- <div class="row" id="mysubmissionslist">
- <div class="col-12">
- <h3>Submissions for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for sub in own_submissions %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
- {% include 'submissions/_submission_status_block.html' with submission=sub %}
-
- {% if request.user.contributor == sub.submitted_by %}
- <p class="card-text mt-1">
- {% if sub.editor_in_charge %}
- <a href="{% url 'submissions:communication' sub.arxiv_identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a>
- {% endif %}
- {% if sub.status == 'revision_requested' %}
- · <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{ sub.arxiv_identifier_wo_vn_nr }}">Resubmit this manuscript</a>
- {% endif %}
- </p>
- {% endif %}
- </div>
- </li>
- {% empty %}
- <li class="list-group-item">
- <em>No Submissions found</em>
- </li>
- {% endfor %}
- </ul>
+ {# {% if own_submissions %}#}
+ <div class="row" id="mysubmissionslist">
+ <div class="col-12">
+ <h3>Submissions for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for sub in own_submissions %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
+ {% include 'submissions/_submission_status_block.html' with submission=sub %}
+
+ {% if request.user.contributor == sub.submitted_by %}
+ <p class="card-text mt-1">
+ {% if sub.editor_in_charge %}
+ <a href="{% url 'submissions:communication' sub.arxiv_identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a>
+ {% endif %}
+ {% if sub.status == 'revision_requested' %}
+ · <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{ sub.arxiv_identifier_wo_vn_nr }}">Resubmit this manuscript</a>
+ {% endif %}
+ </p>
+ {% endif %}
+ </div>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ <em>No Submissions found</em>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- </div>
- {# {% endif %}#}
- </div><!-- End tab -->
+ {# {% endif %}#}
+ </div><!-- End tab -->
- <!-- Tab: Commentaries -->
- <div class="tab-pane" id="commentaries" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title">Commentaries</h2>
- <ul class="mb-0">
- {% if nr_commentary_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_commentary_authorships_to_claim}})</a></li>
- {% endif %}
- <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
- </ul>
+ <!-- Tab: Commentaries -->
+ <div class="tab-pane" id="commentaries" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title">Commentaries</h2>
+ <ul class="mb-0">
+ {% if nr_commentary_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_commentary_authorships_to_claim}})</a></li>
+ {% endif %}
+ <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
+ </ul>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row" id="mycommentarieslist">
- <div class="col-12">
- <h3>Commentaries for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for com in own_commentaries %}
- <li class="list-group-item">
- {% include 'commentaries/_commentary_card_content.html' with commentary=com %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>No Commentaries found</em></li>
- {% endfor %}
- </ul>
+ <div class="row" id="mycommentarieslist">
+ <div class="col-12">
+ <h3>Commentaries for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for com in own_commentaries %}
+ <li class="list-group-item">
+ {% include 'commentaries/_commentary_card_content.html' with commentary=com %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>No Commentaries found</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- </div>
- </div><!-- End tab -->
+ </div><!-- End tab -->
- <!-- Tab: Theses -->
- <div class="tab-pane" id="theses" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title">Theses</h2>
- <ul class="mb-0">
- {% if nr_thesis_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_thesis_authorships_to_claim}})</a></li>
- {% endif %}
- <li><a href="{% url 'theses:request_thesislink' %}">Request a SciPost ThesisLink</a></li>
- </ul>
+ <!-- Tab: Theses -->
+ <div class="tab-pane" id="theses" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title">Theses</h2>
+ <ul class="mb-0">
+ {% if nr_thesis_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_thesis_authorships_to_claim}})</a></li>
+ {% endif %}
+ <li><a href="{% url 'theses:request_thesislink' %}">Request a SciPost ThesisLink</a></li>
+ </ul>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row" id="mytheseslist">
- <div class="col-12">
- <h3>Theses for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for thesis in own_thesislinks %}
- <li class="list-group-item">
- {% include 'theses/_thesislink_card_content.html' with thesislink=thesis %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>No Theses found</em></li>
- {% endfor %}
- </ul>
+ <div class="row" id="mytheseslist">
+ <div class="col-12">
+ <h3>Theses for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for thesis in own_thesislinks %}
+ <li class="list-group-item">
+ {% include 'theses/_thesislink_card_content.html' with thesislink=thesis %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>No Theses found</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- </div>
- </div><!-- End tab -->
+ </div><!-- End tab -->
- <!-- Tab: Comments -->
- <div class="tab-pane" id="comments" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Comments</h2>
+ <!-- Tab: Comments -->
+ <div class="tab-pane" id="comments" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Comments</h2>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row" id="mycommentslist">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for own_comment in own_comments %}
- <li class="list-group-item">
- {% include 'comments/_comment_card_extended_for_author.html' with comment=own_comment %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>You have not commented yet.</em></li>
- {% endfor %}
- </ul>
+ <div class="row" id="mycommentslist">
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for own_comment in own_comments %}
+ <li class="list-group-item">
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_comment %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>You have not commented yet.</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- </div>
- </div><!-- End tab -->
+ </div><!-- End tab -->
- <!-- Tab: Author Replies -->
- <div class="tab-pane" id="author-replies" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Author Replies</h2>
+ <!-- Tab: Author Replies -->
+ <div class="tab-pane" id="author-replies" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Author Replies</h2>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="row" id="myauthorreplieslist">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for own_reply in own_authorreplies %}
- <li class="list-group-item">
- {% include 'comments/_comment_card_extended_for_author.html' with comment=own_reply %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>You do not have Author Replies yet.</em></li>
- {% endfor %}
- </ul>
+ <div class="row" id="myauthorreplieslist">
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for own_reply in own_authorreplies %}
+ <li class="list-group-item">
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_reply %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>You do not have Author Replies yet.</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- </div>
- </div><!-- End tab -->
+ </div><!-- End tab -->
- {# END: If user is contributor #}
- {% endif %}
- </div>
+ {# END: If user is contributor #}
+ {% endif %}
+ </div>
-{% endif %}
+ {% endif %}
{% endblock content %}
diff --git a/scipost/templates/scipost/privacy_policy.html b/scipost/templates/scipost/privacy_policy.html
index 397810bba8579f293f339f300ed57b48ac5b2293..98f308ecf70b4f5c64f983043b4bdcddd6e30981 100644
--- a/scipost/templates/scipost/privacy_policy.html
+++ b/scipost/templates/scipost/privacy_policy.html
@@ -3,13 +3,15 @@
{% block pagetitle %}: privacy policy{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
- <a href="{% url 'scipost:FAQ' %}" class="breadcrumb-item">Frequently asked questions</a>
- <span class="breadcrumb-item">Privacy Policy</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+ <a href="{% url 'scipost:FAQ' %}" class="breadcrumb-item">Frequently asked questions</a>
+ <span class="breadcrumb-item">Privacy Policy</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/scipost/templates/scipost/terms_and_conditions.html b/scipost/templates/scipost/terms_and_conditions.html
index 9f658c26a8e80831c9241dff1505f19c96eca7b1..6a1cc71598c2831252a41641bcc1fb48c1c38a28 100644
--- a/scipost/templates/scipost/terms_and_conditions.html
+++ b/scipost/templates/scipost/terms_and_conditions.html
@@ -3,12 +3,14 @@
{% block pagetitle %}: terms and conditions{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
- <span class="breadcrumb-item">Terms and Conditions</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+ <span class="breadcrumb-item">Terms and Conditions</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/submissions/templates/submissions/_pool_base.html b/submissions/templates/submissions/_pool_base.html
index a60e5b5b1129a08d124e3bc4a5c52d9719eee89f..f2c5074cef8ced37641ffbf53c052ccf2cf9329f 100644
--- a/submissions/templates/submissions/_pool_base.html
+++ b/submissions/templates/submissions/_pool_base.html
@@ -1,11 +1,13 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
diff --git a/submissions/templates/submissions/_recommendation_author_content.html b/submissions/templates/submissions/_recommendation_author_content.html
index d1f4e69cab3d821efa589ee0f8635c866cb3d4b2..d646512ba90d33dcee14957a7d92f4c13d8a107e 100644
--- a/submissions/templates/submissions/_recommendation_author_content.html
+++ b/submissions/templates/submissions/_recommendation_author_content.html
@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card bg-white">
<div class="card-body">
<h2 class="pb-0 mb-0">Editorial Recommendation</h2>
diff --git a/submissions/templates/submissions/admin/base.html b/submissions/templates/submissions/admin/base.html
index 49b66534f3568f9661f205e0e6e18e9ab9a0f96f..a5bd69060d95a0c9d67f233ff188c6feb52932c0 100644
--- a/submissions/templates/submissions/admin/base.html
+++ b/submissions/templates/submissions/admin/base.html
@@ -1,17 +1,19 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- {% if submission %}
- <a href="{% url 'submissions:pool' submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Pool</a>
- {% else %}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- {% endif %}
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ {% if submission %}
+ <a href="{% url 'submissions:pool' submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Pool</a>
+ {% else %}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ {% endif %}
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
diff --git a/submissions/templates/submissions/author_guidelines.html b/submissions/templates/submissions/author_guidelines.html
index 11428047bd7f81351d88040f9573652fa93e851d..e6af8c8f5f16b03f51f6a7cf89be5301d00a1929 100644
--- a/submissions/templates/submissions/author_guidelines.html
+++ b/submissions/templates/submissions/author_guidelines.html
@@ -5,12 +5,14 @@
{% load staticfiles %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
- <span class="breadcrumb-item">Author guidelines</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+ <span class="breadcrumb-item">Author guidelines</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/submissions/templates/submissions/new_submission.html b/submissions/templates/submissions/new_submission.html
index 0a12296251de12a1a80c8b11b4d396942437f47a..d89daa501a1b59d4bd72746bfce5daf5179bc4af 100644
--- a/submissions/templates/submissions/new_submission.html
+++ b/submissions/templates/submissions/new_submission.html
@@ -4,35 +4,38 @@
{% load bootstrap %}
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <h1>Submit a manuscript to SciPost
+ {% if form.arxiv_identifier_w_vn_nr.value %} <span class="my-1 py-0 text-blue">{{form.arxiv_identifier_w_vn_nr.value}}{% if form.submission_is_resubmission %} <small>(resubmission)</small>{% endif %}</span>{% endif %}
+ </h1>
+ </div>
+ </div>
+{% endblock %}
+
{% block content %}
<script>
-$(document).ready(function(){
- $('select#id_submitted_to_journal').on('change', function (){
- var selection = $(this).val();
- $("#id_proceedings, #id_submission_type").parents('.form-group').hide()
+ $(document).ready(function(){
+ $('select#id_submitted_to_journal').on('change', function (){
+ var selection = $(this).val();
+ $("#id_proceedings, #id_submission_type").parents('.form-group').hide()
- switch(selection){
- case "SciPostPhys":
- $("#id_submission_type").parents('.form-group').show()
- break;
- case "SciPostPhysProc":
- $("#id_proceedings").parents('.form-group').show()
- break;
- }
- }).trigger('change');
-});
+ switch(selection){
+ case "SciPostPhys":
+ $("#id_submission_type").parents('.form-group').show()
+ break;
+ case "SciPostPhysProc":
+ $("#id_proceedings").parents('.form-group').show()
+ break;
+ }
+ }).trigger('change');
+ });
</script>
<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1 class="card-title mb-0">Submit a manuscript to SciPost</h1>
- {% if form.arxiv_identifier_w_vn_nr.value %}<h2 class="my-1 py-0 text-blue">{{form.arxiv_identifier_w_vn_nr.value}}{% if form.submission_is_resubmission %} <small>(resubmission)</small>{% endif %}</h2>{% endif %}
- </div>
- </div>
- </div>
+
<div class="col-12">
<p class="mb-1">
Before submitting, make sure you agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.
@@ -50,7 +53,7 @@ $(document).ready(function(){
</div>
-<div class="row mb-5">
+<div class="row">
<div class="col-12">
{% if perms.scipost.can_submit_manuscript %}
diff --git a/submissions/templates/submissions/pool/base.html b/submissions/templates/submissions/pool/base.html
index ca638eb5ab558e81c5911ad27e2788d812086d5a..98873d2bc3e474dc6b401947511b4841931f125d 100644
--- a/submissions/templates/submissions/pool/base.html
+++ b/submissions/templates/submissions/pool/base.html
@@ -3,11 +3,13 @@
{% block body_class %}{{ block.super }} pool{% endblock %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0">
+ <div class="container-outside header">
<div class="container">
- {% block breadcrumb_items %}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- {% endblock %}
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ {% endblock %}
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 065b4f6f0ca9a687484f69e73cab75b6166c264b..5806e9d40bc7839f6cef44cc36e3a490039c5d37 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -21,7 +21,6 @@
{% block content %}
{% is_edcol_admin request.user as is_ECAdmin %}
- <a href="{% url 'submissions:pool' %}?test=1">See old pool layout</a>
<div class="row">
<div class="col-12">
<h1>SciPost Submissions Pool</h1>
diff --git a/submissions/templates/submissions/prefill_using_identifier.html b/submissions/templates/submissions/prefill_using_identifier.html
index 86f98da6f7473bc8f45e8cb192b09d94b1452693..1a9a35f5320ecc925991b712295943c386055749 100644
--- a/submissions/templates/submissions/prefill_using_identifier.html
+++ b/submissions/templates/submissions/prefill_using_identifier.html
@@ -4,11 +4,18 @@
{% block pagetitle %}: submit manuscript{% endblock pagetitle %}
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <h1>Submit a manuscript to SciPost</h1>
+ </div>
+ </div>
+{% endblock %}
+
{% block content %}
<div class="row">
<div class="col-12">
- <h1 class="highlight">Submit a manuscript to SciPost</h1>
<p class="mb-1">
Before submitting, make sure you agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.
</p>
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index 3471208851309ce3e53589897273ef9be5af682a..10e33636d13fb58b14578ba49b11d0ecb87bd1f2 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -3,12 +3,14 @@
{% block pagetitle %}: submission and refereeing procedure{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container-outside header">
<div class="container">
- <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
- <span class="breadcrumb-item">Submission and refereeing procedure</span>
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+ <span class="breadcrumb-item">Submission and refereeing procedure</span>
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 1e66d5504f90db0c682f1200c7ca359b3e341c83..a98239cdfab58ee3005ba7820c2c6c8ee2eb8b6d 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -7,12 +7,16 @@
{% block pagetitle %} Submission: {{ submission.title|truncatechars:40 }}{% endblock pagetitle %}
{% block breadcrumb %}
- <nav class="breadcrumb py-md-2 px-0">
+ <div class="container-outside breadcrumb-nav">
<div class="container">
- <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
- <span class="breadcrumb-item">{{submission.arxiv_identifier_w_vn_nr}}</span>
+ <nav class="breadcrumb">
+
+ <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+ <span class="breadcrumb-item">{{submission.arxiv_identifier_w_vn_nr}}</span>
+
+ </nav>
</div>
- </nav>
+ </div>
{% endblock %}
{% block content %}
diff --git a/webpack.config.js b/webpack.config.js
index d061e69100efbd834eb0fc61b4bed313e34990e5..b27be106e76544fa453dadb207f296cebe238ad2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,6 +13,7 @@ module.exports = {
"./scipost/static/scipost/assets/js/scripts.js",
],
homepage: [
+ "./scipost/static/scipost/assets/js/fader.js",
"./scipost/static/scipost/assets/js/newsticker.js",
],
},