diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 33940701b942ba18c7fc8f0b7c2fa3efc316ce38..1c5bd9fd8ceccb39c701bff188943518bd3b8d61 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -4,9 +4,13 @@
{% block breadcrumb %}
<nav class="submenu">
- <span class="item">Go directly to Journal:</span>
+ <span class="item">Our Journals:</span>
{% for journal in journals %}
- <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
+ {% 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>
{% endblock %}
diff --git a/journals/views.py b/journals/views.py
index 6dbf0f2d7188ecbefad6f81675997141db67bcec..a6e7f7a07866bfc29282365ea443f8ad0afd7b89 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -37,7 +37,7 @@ from guardian.decorators import permission_required
def journals(request):
'''Main landing page for Journals application.'''
- context = {'journals': Journal.objects.active().order_by('name')}
+ context = {'journals': Journal.objects.order_by('name')}
return render(request, 'journals/journals.html', context)
diff --git a/news/models.py b/news/models.py
index 0961cbe72c6a1c31e6a449044d3e5cef6191fe18..77637dad968fcaa031addf2307f5fb9efadab477 100644
--- a/news/models.py
+++ b/news/models.py
@@ -15,6 +15,7 @@ class NewsItem(models.Model):
class Meta:
db_table = 'scipost_newsitem'
+ ordering = ['-date']
def __str__(self):
return self.date.strftime('%Y-%m-%d') + ', ' + self.headline
diff --git a/news/templates/news/news_card_content.html b/news/templates/news/news_card_content.html
index e8e7c611190571a378eaea59bb53ceafbe01d371..546022da3e88e5b41de5f8b1afba128cdcf341ea 100644
--- a/news/templates/news/news_card_content.html
+++ b/news/templates/news/news_card_content.html
@@ -1,8 +1,8 @@
<div class="card-block news-item" id="news_{{news.id}}">
- <h3 class="card-title mb-0">{{news.headline}}</h3>
- <div class="px-1 mt-1">
- <h4 class="text-muted">{{news.date|date:'Y-n-j'}}</h4>
- <div>{{news.blurb|linebreaks}}</div>
+ <h2 class="card-title">{{news.headline}}</h2>
+ <div>
+ <div class="text-muted date">{{news.date|date:'j F Y'}}</div>
+ <div class="pb-3">{{news.blurb|safe}}</div>
{% if news.followup_link %}
<a href="{{news.followup_link}}">{{news.followup_link_text}}</a>
diff --git a/news/templates/news/news_card_content_for_api.html b/news/templates/news/news_card_content_for_api.html
index 37e55edb21ba3131115cc549fe48d0aeea2d0bbd..0e2bd7c77767a6b5b2ab23a4570709ab4323fcd5 100644
--- a/news/templates/news/news_card_content_for_api.html
+++ b/news/templates/news/news_card_content_for_api.html
@@ -3,7 +3,7 @@
<div>
<h5 class="text-muted mb-2">{{date}}</h5>
<div>
- {{blurb|slice:":90"}} (...)
+ {{blurb|truncatechars_html:90|safe}}
<br>
<a href="{% url 'news:news' %}#news_{{id}}" class="my-1 d-inline-block">Read more</a>
diff --git a/news/templates/news/news_card_content_short.html b/news/templates/news/news_card_content_short.html
index 8565202ba8833c425769a0f073fd5a8338a47832..bcf34ac858fc6d4f9c702def2e7b81b1fb74a925 100644
--- a/news/templates/news/news_card_content_short.html
+++ b/news/templates/news/news_card_content_short.html
@@ -3,7 +3,7 @@
<div>
<h5 class="text-muted mb-2">{{news.date|date:'j F Y'}}</h5>
<div>
- {{news.blurb|slice:":90"}} (...)
+ {{news.blurb|truncatechars_html:90|safe}}
<br>
<a href="{% url 'news:news' %}#news_{{news.id}}" class="my-1 d-inline-block">Read more</a>
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 3445743bcf0b178f8d1ac0e09fc0f335572dae06..da2d4976425059a1eb3be43a6e753df274454cfe 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -52,9 +52,18 @@
.card-news {
.news-item .card-title {
- background-color: $scipost-darkblue;
- color: $scipost-light;
- padding: 0.5rem;
+ // background-color: $scipost-darkblue;
+ // color: $scipost-light;
+ // padding: 0.5rem;
+ color: $scipost-darkblue;
+ padding: 0.5rem 0 0.25rem 0;
+ border-bottom: 3px solid $scipost-light;
+ display: inline-block;
+ margin-bottom: 0.5rem;
+ }
+
+ .news-item .date {
+ margin-bottom: 1.5rem;
}
}
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 146bc7345cd37e78a879524c69e51d9c1fd5ef63..0021920522e687e5f92235ec65bfe2a74dc02314 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -28,3 +28,10 @@ body #MathJax_Message {
max-width: 1100px;
margin: 0 auto;
}
+
+footer .logos a {
+ width: 25%;
+ display: inline-block;
+ max-width: 100px;
+ padding: 0 0.25rem;
+}
diff --git a/scipost/static/scipost/assets/css/_homepage.scss b/scipost/static/scipost/assets/css/_homepage.scss
index a7d4f973288b8f9d762524d9e51f1295ea72b2f4..48b81fe5fc598da01246b20bf091a3a02f48298f 100644
--- a/scipost/static/scipost/assets/css/_homepage.scss
+++ b/scipost/static/scipost/assets/css/_homepage.scss
@@ -82,10 +82,6 @@
padding-left: 40px;
margin-top: 0;
- height: 100%;
- position: absolute;
- right: 0;
- top: 0;
&:before {
content: '';
diff --git a/scipost/static/scipost/images/doaj_logo_200.jpg b/scipost/static/scipost/images/doaj_logo_200.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3ed892b44b70c64254a63d5436696e89ce0f6dde
Binary files /dev/null and b/scipost/static/scipost/images/doaj_logo_200.jpg differ
diff --git a/scipost/templates/scipost/comments_block.html b/scipost/templates/scipost/comments_block.html
index ba9a2e069b566a3b13c7b599494bc8dd355a22bd..89cb34eb3003e938a4b989ce601b6266f46c4b3c 100644
--- a/scipost/templates/scipost/comments_block.html
+++ b/scipost/templates/scipost/comments_block.html
@@ -4,7 +4,7 @@
<div class="col-12">
<div class="card card-grey">
<div class="card-block">
- <h2 class="card-title mb-0">{% if type_of_object %} on this {{type_of_object}}{% endif %}</h2>
+ <h2 class="card-title mb-0">Comments{% if type_of_object %} on this {{type_of_object}}{% endif %}</h2>
<a href="javascript:;" data-toggle="toggle" data-target="#commentslist">Toggle comments view</a>
</div>
</div>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 839508d7cdcd54945a2c025afb4b129cbe46ebdf..6a4824519656a18bdab668c64c071350f3930305 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -7,9 +7,13 @@
{% block breadcrumb %}
<nav class="submenu">
- <span class="item">Go directly to Journal:</span>
+ <span class="item">Our Journals:</span>
{% for journal in journals %}
- <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
+ {% 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>
{% endblock %}
@@ -108,6 +112,28 @@
<div class="card-footer"><a href="{% url 'news:news' %}">More news</a></div>
</div><!-- End news -->
+ <!-- Partners --><!-- Disabled
+ <div class="card card-grey">
+ <div class="card-block">
+ <h2 class="card-title">
+ <a href="{% url 'partners:partners' %}">Partners</a>
+ </h2>
+
+ <div>
+ <p>Institutions: consider joining our <a href="{% url 'partners:partners' %}">Supporting Partners Board</a>.</p>
+ Recently joined:
+ <ul class="mt-1">
+ {% for agreement in current_agreements %}
+ <li><strong>{{agreement.partner.institution.name}}</strong><br>
+ {{agreement.partner.institution.get_country_display}}</li>
+
+ {% endfor %}
+ </ul>
+
+ </div>
+ </div>
+ </div>--><!-- End Partners -->
+
<!-- Summarized -->
<div class="card card-grey">
<div class="card-block">
@@ -150,10 +176,12 @@
</div>
</div>
</div>
- <div class="col-lg-6">
- <h1>SciPost is a member of</h1>
+ <div class="col-lg-6 logos">
+ <h1>SciPost participates in</h1>
<br/>
<a href="//www.crossref.org" target="_blank"><img src="//assets.crossref.org/logo/crossref-logo-200.svg" width="100" alt="Crossref logo"></a>
+ <a href="//www.doaj.org" target="_blank"><img src="{% static 'scipost/images/doaj_logo_200.jpg' %}" width="90" alt="DOAJ logo"></a>
+ <a href="//www.clockss.org" target="_blank"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" width="80" alt="Clockss logo"></a>
</div>
</div>
</footer>
diff --git a/scipost/views.py b/scipost/views.py
index 66ab962a32015b64bb561bce5607a80565826c58..91377587af73700beabe27c9b5545bba1d4bb9f1 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -40,6 +40,7 @@ from journals.models import Publication, Issue, Journal
from news.models import NewsItem
from submissions.models import Submission, EditorialAssignment, RefereeInvitation,\
Report, EICRecommendation
+from partners.models import MembershipAgreement
from theses.models import ThesisLink
@@ -177,11 +178,10 @@ def index(request):
context = {
'latest_newsitem': NewsItem.objects.all().order_by('-date').first(),
'submissions': Submission.objects.public().order_by('-submission_date')[:3],
- 'issues': Issue.objects.published().order_by('-start_date')[:3],
- 'journals': Journal.objects.active().order_by('name'),
+ 'journals': Journal.objects.order_by('name'),
'publications': Publication.objects.published().order_by('-publication_date',
- '-paper_nr')[:3]
-
+ '-paper_nr')[:3],
+ 'current_agreements': MembershipAgreement.objects.now_active()[:2],
}
return render(request, 'scipost/index.html', context)