From ed046e595ca6727338633f5f7d1ae2bfc5637867 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 29 Oct 2018 06:08:47 +0000
Subject: [PATCH] Sync 2
---
celerybeat.pid | 1 -
scipost/templates/scipost/header.html | 12 +++----
.../templates/scipost/index_sidebar_2.html | 33 +++++++++----------
3 files changed, 20 insertions(+), 26 deletions(-)
delete mode 100644 celerybeat.pid
diff --git a/celerybeat.pid b/celerybeat.pid
deleted file mode 100644
index 887a0ee2e..000000000
--- a/celerybeat.pid
+++ /dev/null
@@ -1 +0,0 @@
-30193
diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html
index 5dfb2df66..e7cb64b6e 100644
--- a/scipost/templates/scipost/header.html
+++ b/scipost/templates/scipost/header.html
@@ -40,13 +40,11 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
{% for journal in journals %}
- <!-- <li class="nav-item"> -->
- {% if journal.active %}
- <a href="{{ journal.get_absolute_url }}" class="dropdown-item">{{journal}}</a>
- {% else %}
- <a href="{% url 'journal:about' journal.name %}" class="dropdown-item">{{journal}}</a>
- {% endif %}
- <!-- </li> -->
+ {% if journal.active %}
+ <a href="{{ journal.get_absolute_url }}" class="dropdown-item">{{journal}}</a>
+ {% elif perms.scipost.can_view_pool %}
+ <a href="{% url 'journal:about' journal.name %}" class="dropdown-item">{{journal}}</a>
+ {% endif %}
{% endfor %}
</div>
</li>
diff --git a/scipost/templates/scipost/index_sidebar_2.html b/scipost/templates/scipost/index_sidebar_2.html
index cef0e81f3..6008391db 100644
--- a/scipost/templates/scipost/index_sidebar_2.html
+++ b/scipost/templates/scipost/index_sidebar_2.html
@@ -50,31 +50,28 @@
<hr class="lg">
-<!-- Partners -->
-<div class="py-3" id="partners">
- <h2>Partners</h2>
+<!-- Sponsors -->
+<div class="py-3" id="sponsors">
+ <h2>Sponsors</h2>
<p>
- SciPost guarantees free online access to all publications in all its Journals and does not charge any article processing fees for publishing. Supporting Partners provide operating funds to SciPost through a cost-slashing consortial model.
+ SciPost guarantees free online access to all publications in all its Journals and does not charge any article processing fees for publishing. Sponsors provide operating funds to SciPost through a cost-slashing consortial model.
</p>
<p>
- Institutions: consider joining our <a href="{% url 'partners:partners' %}">Supporting Partners Board</a>. SciPost cannot exist without your support. Look at our <a href="{% static 'scipost/SPB/SciPost_Supporting_Partners_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a>.
+We invite <a href="{% url 'organizations:organizations' %}">organizations benefitting from SciPost's activities</a> to join our growing <a href="{% url 'sponsors:sponsors' %}">list of Sponsors</a>. Look at our <a href="{% static 'sponsors/SciPost_Sponsors_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'sponsors/SciPost_Sponsorship_Agreement.pdf' %}">Sponsorship Agreement template</a>.
</p>
<p>
- <span style="color: red;">Scientists, please help us out:</span> if it is not listed on our <a href="{% url 'partners:partners' %}">Partners page</a>, please encourage your institution (through a librarian, Open Access officer, director, ...) to join by <a href="{% url 'petitions:petition' slug='join-SPB' %}">signing our petition</a>, and by personally emailing them directly using this <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'petitions/petition_email.html' %}{% endautoescape %}&cc=partners@scipost.org">email template</a>.
+ <span style="color: red;">Scientists, please help us out:</span> Please petition your local librarian/director/... to consider sponsoring us. You can use this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
</p>
-
- <p>Do you or somebody you know have the means to make a difference?
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
-">
-<input type="image" src="https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
-</form>
- </p>
-
-</div><!-- End Partners -->
+ <p>Do you or somebody you know have the means to make a difference?</p>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+ ">
+ <input type="image" src="//www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online!">
+ <img alt="" border="0" src="//www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
+ </form>
+</div><!-- End Sponsors -->
<hr class="lg">
--
GitLab