SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit c3c37075 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Merge branch 'release'

parents 482dd8d3 18ba03b6
No related branches found
No related tags found
No related merge requests found
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
{% endblock %} {% endblock %}
{% block secondary_navbar %} {% block secondary_navbar %}
<nav class="navbar navbar-secondary"> <div class="container my-2">
<div class="container my-2"> <nav class="navbar navbar-secondary px-0">
<div>
<h2 class="banner d-inline-block mr-2"><a href="{% url 'scipost:landing_page' journal.doi_string %}">{{journal}}</a></h2> <h2 class="banner d-inline-block mr-2"><a href="{% url 'scipost:landing_page' journal.doi_string %}">{{journal}}</a></h2>
<ul class="links"> <ul class="links">
{% if journal.active or request.user.is_staff %} {% if journal.active or request.user.is_staff %}
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
</ul> </ul>
</div> </div>
</nav> </nav>
</div>
{% endblock secondary_navbar %} {% endblock secondary_navbar %}
......
<div class="card-block publication-{{publication.id}}"> <div class="card-block publication-{{publication.id}}">
<h3 class="card-title"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3> <h3 class="card-title"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
<p class="card-text">{{ publication.author_list }}</p> <p class="card-text">{{ publication.author_list }}</p>
<p class="card-text text-muted">{{ publication.citation }} - published {{ publication.publication_date|date:'j F Y' }} | <a href="javascript:;" class="btn btn-outline-primary btn-sm mx-2" data-toggle="toggle" data-target=".card-block.publication-{{publication.id}} .abstract">Toggle abstract</a> <a href="{{publication.get_absolute_url}}/pdf" target="_blank">pdf</a></p> <p class="card-text text-muted">{{ publication.citation }} - published {{ publication.publication_date|date:'j F Y' }} | <a href="javascript:;" class="mx-2" data-toggle="toggle" data-target=".card-block.publication-{{publication.id}} .abstract">Toggle abstract</a> <a href="{{publication.get_absolute_url}}/pdf" target="_blank">pdf</a></p>
<p class="abstract mb-0 py-2" style="display:none;">{{ publication.abstract }}</p> <p class="abstract mb-0 py-2" style="display:none;">{{ publication.abstract }}</p>
</div> </div>
...@@ -74,4 +74,9 @@ ...@@ -74,4 +74,9 @@
margin-top: -0.75rem; margin-top: -0.75rem;
margin-bottom: 0; margin-bottom: 0;
background-color: transparent; background-color: transparent;
> div {
overflow-x: auto;
white-space: nowrap;
}
} }
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<hr> <hr>
{% endif %} {% endif %}
<div class="col-12"> <div class="col-12" id="undergoing_rec_{{rec.id}}">
<div class="card card-outline-secondary"> <div class="card card-outline-secondary">
{% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %} {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
</div> </div>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
{% for recommendation in recommendations_undergoing_voting %} {% for recommendation in recommendations_undergoing_voting %}
<li class="list-group-item"> <li class="list-group-item">
<div class="card-block"> <div class="card-block">
<a href="#prepare_rec_{{recommendation.id}}">{{recommendation.submission.title}}</a> <a href="#undergoing_rec_{{recommendation.id}}">{{recommendation.submission.title}}</a>
<p class="text-muted my-0">{{recommendation.submission.author_list}}</p> <p class="text-muted my-0">{{recommendation.submission.author_list}}</p>
<p class="my-0">Formulated on {{recommendation.date_submitted}}</p> <p class="my-0">Formulated on {{recommendation.date_submitted}}</p>
</div> </div>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% for submission in submissions_in_pool %} {% for submission in submissions_in_pool %}
<li class="list-group-item"> <li class="list-group-item">
<div class="card-block"> <div class="card-block" style="overflow: auto;">
<a href="#pool_submission_{{submission.id}}">{{submission.title}}</a> <a href="#pool_submission_{{submission.id}}">{{submission.title}}</a>
<p class="text-muted mb-1">{{submission.author_list}}</p> <p class="text-muted mb-1">{{submission.author_list}}</p>
<p class="label label-secondary label-sm my-2">{{submission.get_status_display}}</p> <p class="label label-secondary label-sm my-2">{{submission.get_status_display}}</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment