From dd6d56eb27b972d7cfadf39816dc6d8951bf8b80 Mon Sep 17 00:00:00 2001 From: Jorran de Wit <jorrandewit@outlook.com> Date: Mon, 15 May 2017 21:58:20 +0200 Subject: [PATCH] Overhaul frontpage --- journals/managers.py | 5 + journals/models.py | 4 +- .../journals/_publication_details_small.html | 5 + news/templates/news/news_card_content.html | 2 +- .../news/news_card_content_short.html | 12 + .../scipost/assets/config/preconfig.scss | 5 +- .../scipost/assets/css/_breadcrumb.scss | 8 + scipost/static/scipost/assets/css/_cards.scss | 10 + scipost/static/scipost/assets/css/_grid.scss | 6 +- scipost/static/scipost/assets/css/_icons.scss | 6 + scipost/static/scipost/assets/css/_type.scss | 4 + scipost/templates/scipost/footer.html | 2 +- scipost/templates/scipost/index.html | 323 +++++++++--------- scipost/templates/scipost/navbar.html | 3 + scipost/views.py | 8 +- .../_submission_card_content_sparse.html | 2 +- 16 files changed, 226 insertions(+), 179 deletions(-) create mode 100644 journals/templates/journals/_publication_details_small.html create mode 100644 news/templates/news/news_card_content_short.html diff --git a/journals/managers.py b/journals/managers.py index e9dafca3f..3d5c8e916 100644 --- a/journals/managers.py +++ b/journals/managers.py @@ -5,6 +5,11 @@ from django.utils import timezone from .constants import STATUS_PUBLISHED, STATUS_DRAFT +class JournalManager(models.Manager): + def active(self): + return self.filter(active=True) + + class IssueManager(models.Manager): def get_published(self, *args, **kwargs): try: diff --git a/journals/models.py b/journals/models.py index a50ff6459..c065ef235 100644 --- a/journals/models.py +++ b/journals/models.py @@ -9,7 +9,7 @@ from .behaviors import doi_journal_validator, doi_volume_validator,\ from .constants import SCIPOST_JOURNALS, SCIPOST_JOURNALS_DOMAINS,\ STATUS_DRAFT, STATUS_PUBLISHED, ISSUE_STATUSES from .helpers import paper_nr_string, journal_name_abbrev_citation -from .managers import IssueManager, PublicationManager +from .managers import IssueManager, PublicationManager, JournalManager from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS from scipost.fields import ChoiceArrayField @@ -31,6 +31,8 @@ class Journal(models.Model): issn = models.CharField(max_length=16, default='2542-4653') active = models.BooleanField(default=True) + objects = JournalManager() + def __str__(self): return self.get_name_display() diff --git a/journals/templates/journals/_publication_details_small.html b/journals/templates/journals/_publication_details_small.html new file mode 100644 index 000000000..6f3ebd454 --- /dev/null +++ b/journals/templates/journals/_publication_details_small.html @@ -0,0 +1,5 @@ + +<h3><a href="{{publication.get_absolute_url}}">{{publication.title}}</a></h3> + +<p class="font-weight-bold mb-1">{{ publication.author_list }}</p> +<p class="text-muted mb-2">{{ publication.citation }} | published {{ publication.publication_date|date:'j F Y' }}</p> diff --git a/news/templates/news/news_card_content.html b/news/templates/news/news_card_content.html index c034d9e95..d586cf303 100644 --- a/news/templates/news/news_card_content.html +++ b/news/templates/news/news_card_content.html @@ -1,4 +1,4 @@ -<div class="card-block px-0 pt-1 news-item"> +<div class="card-block px-0 pt-0 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 font-weight-bold">{{news.date|date:'Y-n-j'}}</h4> diff --git a/news/templates/news/news_card_content_short.html b/news/templates/news/news_card_content_short.html new file mode 100644 index 000000000..8f68e48a3 --- /dev/null +++ b/news/templates/news/news_card_content_short.html @@ -0,0 +1,12 @@ +<div class="card-block px-0 py-2 news-item"> + <h3 class="card-title mb-0 pb-0">{{news.headline}}</h3> + <div> + <h4 class="text-muted font-weight-bold">{{news.date|date:'Y-n-j'}}</h4> + <div> + {{news.blurb|slice:":180"}} (...) + + <br> + <a href="{% url 'news:news' %}#news_{{news.id}}" class="my-1 d-inline-block">Read more</a> + </div> + </div> +</div> diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss index e5b43ec35..6dbd70d62 100644 --- a/scipost/static/scipost/assets/config/preconfig.scss +++ b/scipost/static/scipost/assets/config/preconfig.scss @@ -20,7 +20,8 @@ $container-max-widths: ( // $card-spacer-x: 0.75rem; $card-border-radius: 0.15rem; -$card-border-color: rgba(238, 238, 238, 0.5); +$card-border-color: #fff; +$card-cap-bg: transparent; // Colors // @@ -53,7 +54,7 @@ $input-padding-y: .25rem; $list-group-bg: transparent; $list-group-item-padding-x: 0; $list-group-item-padding-y: 0; -$list-group-border-color: #f1f1f1; +$list-group-border-color: #eee; // Fonts // diff --git a/scipost/static/scipost/assets/css/_breadcrumb.scss b/scipost/static/scipost/assets/css/_breadcrumb.scss index ffba7ecbb..ae39d14a6 100644 --- a/scipost/static/scipost/assets/css/_breadcrumb.scss +++ b/scipost/static/scipost/assets/css/_breadcrumb.scss @@ -6,3 +6,11 @@ margin-bottom: 0; } } + +nav.as-submenu .breadcrumb-item + .breadcrumb-item::before { + content: '|'; +} + +.breadcrumb-item.no-divider::before { + content: none !important; +} diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss index a8625fded..3f7f0027d 100644 --- a/scipost/static/scipost/assets/css/_cards.scss +++ b/scipost/static/scipost/assets/css/_cards.scss @@ -17,6 +17,16 @@ } } +.card-header { + padding: 0.5rem 0; + margin: 0 0.75rem 0 0.75rem; +} + +.card-footer { + padding: 0.75rem 0 0 0; + margin: 0 0.75rem 0.75rem 0.75rem; +} + .list-group-item > .card-block { padding: 0.5rem; } diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss index 9b9a5b243..bf3dcdaa9 100644 --- a/scipost/static/scipost/assets/css/_grid.scss +++ b/scipost/static/scipost/assets/css/_grid.scss @@ -21,6 +21,10 @@ img { footer.secondary { color: $scipost-darkblue; background: transparent; - border-top: 1px solid $scipost-darkblue; + border-top: 2px solid $scipost-darkblue; text-align: center; + + a { + color: $scipost-lightblue; + } } diff --git a/scipost/static/scipost/assets/css/_icons.scss b/scipost/static/scipost/assets/css/_icons.scss index 9f68baa05..15f34d802 100644 --- a/scipost/static/scipost/assets/css/_icons.scss +++ b/scipost/static/scipost/assets/css/_icons.scss @@ -16,3 +16,9 @@ transform: rotate(180deg); } } + +.floating-rss-icon { + position: absolute; + top: 0.75rem; + right: 0.75rem; +} diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss index 56cb21439..5fef73cc4 100644 --- a/scipost/static/scipost/assets/css/_type.scss +++ b/scipost/static/scipost/assets/css/_type.scss @@ -19,6 +19,10 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; } +h1 > a { + color: $scipost-darkblue; +} + .highlight { background-color: #f4f4f4; border-radius: 1.4px; diff --git a/scipost/templates/scipost/footer.html b/scipost/templates/scipost/footer.html index cf0e93dc2..ada3d585a 100644 --- a/scipost/templates/scipost/footer.html +++ b/scipost/templates/scipost/footer.html @@ -1,6 +1,6 @@ {% load staticfiles %} <footer class="container-fluid py-2"> - <div class="row"> + <div class="row mt-2"> <div class="col-md-4"> Copyright © <a href="{% url 'scipost:foundation' %}" target="_">SciPost Foundation</a>. diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html index 6ae0ba1ba..da667970a 100644 --- a/scipost/templates/scipost/index.html +++ b/scipost/templates/scipost/index.html @@ -2,188 +2,173 @@ {% load staticfiles %} -{% block content %} - - <div class="row"> - <div class="col-12"> - <div class="card-deck mb-2"> - <!-- News --> - <div class="card card-grey card-news"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'news:news' %}">News</a><a style="float: right;" href="{% url 'scipost:feeds' %}"><img src="{% static 'scipost/images/feed-icon-14x14.png' %}" alt="Feed logo" width="14"></a></h1> - <h4 class="card-subtitle mb-0 pb-0 text-muted">Latest news and announcements.</h4> - <ul class="list-group list-group-flush"> - {% for item in latest_newsitems %} - <li class="list-group-item"> - {% include 'news/news_card_content.html' with news=item %} - </li> - {% empty %} - <li class="list-group-item"> - No current newsitems found. - </li> - {% endfor %} - <ul> - </div> - </div><!-- End news --> - - - - {% if not user.is_authenticated %} - <!-- Register --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'scipost:register' %}">Register</a></h1> - <p>Professional scientists (PhD students and above) can become Contributors to SciPost by filling the - <a href="{% url 'scipost:register' %}">registration form</a>.</p> - <h4>Registered contributors can among others:</h4> - <ul> - <li>Submit manuscripts to SciPost Journals</li> - <li>Post reports and comments</li> - <li>Express opinions on contributions</li> - <li>Subscribe to feeds</li> - <li>Use productivity tools</li> - </ul> - </div> - </div><!-- End register --> - {% else %} - <!-- About --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'scipost:about' %}">About SciPost</a></h1> - <h4 class="card-subtitle mb-2 text-muted">SciPost is a complete scientific publication portal managed by active professional scientists.</h4> - <p>It is purely online-based and offers openly, globally and perpetually accessible science.</p> - <h3><a href="{% url 'scipost:about' %}#advisory_board">Advisory Board</a></h3> - <h3><a href="{% url 'scipost:call' %}">A call for openness</a></h3> - <h3><a href="{% url 'scipost:quick_tour' %}">Quick Tour</a></h3> - <h3><a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a></h3> - <h3><a href="{% url 'scipost:about' %}">Read more</a></h3> - <h4><em>In the press:</em></h4> - <ul> - <li><a href="{% static 'scipost/press/SciPost_in_FOM_expres_mei_2016.pdf' %}">FOM expres 5/2016</a> (<a href="{% static 'scipost/press/SciPost_in_FOM_expres_mei_2016_eng.pdf' %}">English vn</a>)</li> - <li><a href="http://www.uva.nl/en/news-events/news/uva-news/content/news/2016/10/open-access-platform-scipost-launches-inaugural-edition-of-first-journal.html">Inaugural issue 10/2016</a></li> - </ul> - </div> - </div><!-- End about --> - {% endif %} - - <!-- Latest submissions --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'journals:journals' %}">Latest Submissions</a></h1> - <ul class="list-group list-group-flush"> - {% for submission in submissions %} - <li class="list-group-item"> - {% include 'submissions/_submission_card_content_sparse.html' with submission=submission %} - </li> - {% endfor %} - </ul> - </div> - </div><!-- End latest submissions --> - - <!-- Latest publications --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'journals:journals' %}">Latest Publications</a></h1> - <ul class="list-group list-group-flush"> - {% for publication in publications %} - <li class="list-group-item"> - <div class="card-block px-0"> - {% include 'journals/_publication_single_short_summary.html' with publication=publication %} - </div> - </li> - {% endfor %} - </ul> - <p class="text-center mt-3" style="color: red;"><em>If you support and believe in our mission, <br/>be a pioneer and submit a manuscript!</em></p> - </div> - </div><!-- End latest publications --> - </div><!-- End deck --> - - <div class="card-deck"> +{% block breadcrumb %} + {% if journals|length > 1 %} + <nav class="breadcrumb py-md-2 px-0 as-submenu"> + <div class="container"> + <span class="breadcrumb-item">Go direct to Journal:</span> + {% for journal in journals %} + <a href="{{journal.get_absolute_url}}" class="breadcrumb-item {% if forloop.counter == 1 %} ml-2 no-divider{% endif %}">{{journal}}</a> + {% endfor %} + </div> + </nav> + {% endif %} +{% endblock %} - <!-- Journals --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title"><a href="{% url 'journals:journals' %}">Journals</a></h1> - <h4 class="card-subtitle m text-muted">SciPost publishes a portfolio of high-quality two-way open access scientific journals.</h4> - <p>All SciPost Journals implement the stringent <a href="/FAQ#pwr">peer-witnessed refereeing</a> principle.</p> - <p>All Journals are fully managed by professional scientists.</p> - <h3><a href="{% url 'scipost:about' %}#editorial_college_physics">Editorial College (Physics)</a></h3> - <h3><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a></h3> +{% block content %} - <br/> + <div class="row pt-2"> + <div class="col-md-7"> + <!-- Latest publications --> + <div class="card card-grey"> + <div class="card-header"> + <h1 class="card-title mb-0"><a href="{% url 'journals:journals' %}">Latest Publications</a></h1> + </div> + <div class="card-block pt-0"> + <ul class="list-group list-group-flush"> + {% for publication in publications %} + <li class="list-group-item"> + <div class="card-block px-0"> + {% include 'journals/_publication_details_small.html' with publication=publication %} + </div> + </li> + {% endfor %} + </ul> + <p class="text-center mt-3 text-danger">If you support and believe in our mission, <br/>be a pioneer and submit a manuscript!</p> + </div> + </div><!-- End latest publications --> - <p>View and comment on (login required) recent <a href="{% url 'submissions:submissions' %}">Submissions</a></p> - </div> - </div><!-- End journals --> + <!-- Latest submissions --> + <div class="card card-grey"> + <div class="card-header"> + <h1 class="card-title mb-0"><a href="{% url 'submissions:submissions' %}">Latest Submissions</a></h1> + </div> + <div class="card-block pt-0"> + <ul class="list-group list-group-flush"> + {% for submission in submissions %} + <li class="list-group-item"> + {% include 'submissions/_submission_card_content_sparse.html' with submission=submission %} + </li> + {% endfor %} + </ul> + </div> + </div><!-- End latest submissions --> + </div> + <div class="col-md-5"> + <!-- Latest issues --> + <div class="card card-grey"> + <div class="card-header border-0 pb-0"> + <h2 class="card-title mb-0"><a href="/issues/">Issues</a></h2> + </div> + <div class="card-block"> + <ul class="m-0"> + {% for issue in issues %} + <li> + <a href="{{issue.get_absolute_url}}">{{issue}}</a> + </li> + {% endfor %} + </ul> + </div> + <div class="card-footer"> + <a href="{% url 'journal:issues' 'SciPostPhys' %}">All issues</a> + </div> + </div><!-- End latest issues --> + + <!-- News --> + <div class="card card-grey"> + <div class="card-header border-0"> + <h2 class="card-title mb-0"> + <a href="{% url 'news:news' %}">News</a> + <a class="floating-rss-icon" href="{% url 'scipost:feeds' %}"> + <img src="{% static 'scipost/images/feed-icon-14x14.png' %}" alt="Feed logo" width="14"> + </a> + </h2> + <h4 class="card-subtitle pb-0 text-muted">Latest news and announcements.</h4> + </div> + <div class="card-block"> + <ul class="list-group list-group-flush"> + {% for item in latest_newsitems %} + <li class="list-group-item"> + {% include 'news/news_card_content_short.html' with news=item %} + </li> + {% empty %} + <li class="list-group-item"> + No current newsitems found. + </li> + {% endfor %} + </ul> + </div> + <div class="card-footer"><a href="{% url 'news:news' %}">More news</a></div> + </div><!-- End news --> + {% if not user.is_authenticated %} + <!-- Register --> <div class="card card-grey"> <div class="card-block"> - <h1 class="card-title"><a href="{% url 'commentaries:commentaries' %}">Commentaries</a></h1> - <p>SciPost Commentaries allow Contributors to comment and build on all existing literature.</p> - <br/> - <h3><a href="{% url 'commentaries:howto' %}">SciPost Commentaries how-to</a></h3> - <h3><a href="{% url 'commentaries:request_commentary' %}">Request a new Commentary Page</a></h3> + <h2 class="card-title mb-0"><a href="{% url 'scipost:register' %}">Register</a></h2> + <p class="m-0">Professional scientists (PhD students and above) can become Contributors to SciPost by filling the <a href="/register">registration form</a>.</p> </div> - </div><!-- End commentaries --> - - <!-- Theses --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title"><a href="{% url 'theses:theses' %}">Theses</a></h1> - <p>SciPost Theses allow Contributors to find Master's, Ph.D. and Habilitation theses relevant to their work.</p> - <br/> - <h3><a href="{% url 'theses:request_thesislink' %}">Request a new Thesis Link</a></h3> - </div> - </div><!-- End theses --> - - {% if not user.is_authenticated %} - <!-- About --> - <div class="card card-grey"> - <div class="card-block"> - <h1 class="card-title mb-0"><a href="{% url 'scipost:about' %}">About SciPost</a></h1> - <h4 class="card-subtitle mb-2 text-muted">SciPost is a complete scientific publication portal managed by active professional scientists.</h4> - <p>It is purely online-based and offers openly, globally and perpetually accessible science.</p> - <h3><a href="{% url 'scipost:about' %}#advisory_board">Advisory Board</a></h3> - <h3><a href="{% url 'scipost:call' %}">A call for openness</a></h3> - <h3><a href="{% url 'scipost:quick_tour' %}">Quick Tour</a></h3> - <h3><a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a></h3> - <h3><a href="{% url 'scipost:about' %}">Read more</a></h3> - <h4><em>In the press:</em></h4> - <ul> - <li><a href="{% static 'scipost/press/SciPost_in_FOM_expres_mei_2016.pdf' %}">FOM expres 5/2016</a> (<a href="{% static 'scipost/press/SciPost_in_FOM_expres_mei_2016_eng.pdf' %}">English vn</a>)</li> - <li><a href="http://www.uva.nl/en/news-events/news/uva-news/content/news/2016/10/open-access-platform-scipost-launches-inaugural-edition-of-first-journal.html">Inaugural issue 10/2016</a></li> - </ul> - </div> - </div><!-- End about --> - {% endif %} - - </div><!-- End deck --> + </div><!-- End Register --> + {% endif %} + + <!-- Summarized --> + <div class="card card-grey"> + <div class="card-block"> + <h2 class="card-title"> + <a href="{% url 'journals:journals' %}">Journals</a> + </h2> + <h4 class="card-subtitle pt-0 text-muted">SciPost publishes a portfolio of high-quality two-way open access scientific journals.</h4> + <p> + All SciPost Journals implement the stringent <a href="{% url 'scipost:FAQ' %}#pwr">peer-witnessed refereeing</a> principle. + <br> + All Journals are fully managed by professional scientists. + </p> + <p> + <a href="{% url 'scipost:about' %}#editorial_college_physics">Editorial College (Physics)</a> + <br> + <a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a> + </p> + <h2 class="card-title"> + <a href="{% url 'commentaries:commentaries' %}">Commentaries</a> + </h2> + <p>SciPost Commentaries allow Contributors to comment and build on all existing literature.</p> + <h2 class="card-title"> + <a href="{% url 'theses:theses' %}">Theses</a> + </h2> + <p>SciPost Theses allow Contributors to find Master's, Ph.D. and Habilitation theses relevant to their work.</p> + </div> + </div><!-- End Summarized --> </div> </div> +</div> - <hr> - <div class="row"> - <div class="col-md-6"> - <h1>SciPost is endorsed by</h1> - <div class="row"> - <div class="col-md-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> - <div class="col-md-6"> - <a href="//www.fom.nl" target="_blank"><img style="max-height: 55px; width: auto;" src="{% static 'scipost/images/FOMlogo_fc.jpg' %}" alt="FOM logo"></a> - <p style="font-size: 80%" class="mt-1">FOM is part of NWO</p> +{% endblock %} + +{% block secondary_footer %} +<footer class="secondary pt-3"> + <div class="container text-left"> + <div class="row"> + <div class="col-md-6"> + <h1>SciPost is endorsed by</h1> + <div class="row"> + <div class="col-md-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> + <div class="col-md-6"> + <a href="//www.fom.nl" target="_blank"><img style="max-height: 55px; width: auto;" src="{% static 'scipost/images/FOMlogo_fc.jpg' %}" alt="FOM logo"></a> + <p style="font-size: 80%" class="mt-1">FOM is part of NWO</p> + </div> </div> </div> - </div> - <div class="col-md-6"> - <h1>SciPost is a member of</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> + <div class="col-md-6"> + <h1>SciPost is a member of</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> + </div> </div> </div> - - +</footer> {% endblock %} diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html index 181b9fc24..e7ddeed5d 100644 --- a/scipost/templates/scipost/navbar.html +++ b/scipost/templates/scipost/navbar.html @@ -16,6 +16,9 @@ <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 %} <li class="nav-item highlighted"> diff --git a/scipost/views.py b/scipost/views.py index babdffec0..3ec24227d 100644 --- a/scipost/views.py +++ b/scipost/views.py @@ -37,7 +37,7 @@ from .utils import Utils, EMAIL_FOOTER, SCIPOST_SUMMARY_FOOTER, SCIPOST_SUMMARY_ from commentaries.models import Commentary from comments.models import Comment -from journals.models import Publication +from journals.models import Publication, Issue, Journal from news.models import NewsItem from submissions.models import Submission, EditorialAssignment, RefereeInvitation,\ Report, EICRecommendation @@ -173,8 +173,10 @@ def index(request): '''Main page.''' context = { 'latest_newsitems': NewsItem.objects.all().order_by('-date')[:2], - 'submissions': Submission.objects.public().order_by('-submission_date')[:4], - 'publications': Publication.objects.published().order_by('-publication_date')[:4] + 'submissions': Submission.objects.public().order_by('-submission_date')[:5], + 'publications': Publication.objects.published().order_by('-publication_date')[:5], + 'issues': Issue.objects.published().order_by('-start_date')[:4], + 'journals': Journal.objects.active().order_by('name') } return render(request, 'scipost/index.html', context) diff --git a/submissions/templates/submissions/_submission_card_content_sparse.html b/submissions/templates/submissions/_submission_card_content_sparse.html index 906b925ab..dd0ba18f3 100644 --- a/submissions/templates/submissions/_submission_card_content_sparse.html +++ b/submissions/templates/submissions/_submission_card_content_sparse.html @@ -1,7 +1,7 @@ {% extends 'submissions/_submission_card_base.html' %} {% block cardblock_class_block %}px-0{% endblock %} -{% block title_class_block %}pb-0 mb-0{% endblock %} +{% block title_class_block %}pb-0{% endblock %} {% block card_block_footer %} {{block.super}} -- GitLab