diff --git a/comments/templates/comments/_comment_identifier.html b/comments/templates/comments/_comment_identifier.html index 3407a7c0bdd69ec7dc9a6b8b613de50112a87dd9..f30c460f3925344561cf1272f2c3c705523c92c9 100644 --- a/comments/templates/comments/_comment_identifier.html +++ b/comments/templates/comments/_comment_identifier.html @@ -11,20 +11,21 @@ {% endblock comment_author %} on {{comment.date_submitted|date:'Y-m-d'}} </h3> - <h4> - {% if comment.in_reply_to_comment %} - (in reply to <a href="#comment_id{{comment.in_reply_to_comment.id}}">{{comment.in_reply_to_comment.comment.get_author_str}}</a> on {{comment.in_reply_to_comment.date_submitted|date:'Y-m-d'}}) - {% elif comment.in_reply_to_report %} - (in reply to <a href="#report_id{{comment.in_reply_to_report.id}}"> + {% if comment.in_reply_to_comment or comment.in_reply_to_report %} + <h4> + {% if comment.in_reply_to_comment %} + (in reply to <a href="#comment_id{{comment.in_reply_to_comment.id}}">{{comment.in_reply_to_comment.comment.get_author_str}}</a> on {{comment.in_reply_to_comment.date_submitted|date:'Y-m-d'}}) + {% elif comment.in_reply_to_report %} + (in reply to <a href="#report_id{{comment.in_reply_to_report.id}}"> - {% if not comment.in_reply_to_report.anonymous %} - {{comment.in_reply_to_report.get_author_str}} - {% else %} - Report {{comment.in_reply_to_report.id}} - {% endif %} + {% if not comment.in_reply_to_report.anonymous %} + {{comment.in_reply_to_report.get_author_str}} + {% else %} + Report {{comment.in_reply_to_report.id}} + {% endif %} - </a> on {{comment.in_reply_to_report.date_submitted|date:'Y-m-d'}}) - {% endif %} - - </h4> + </a> on {{comment.in_reply_to_report.date_submitted|date:'Y-m-d'}}) + {% endif %} + </h4> + {% endif %} </div> diff --git a/journals/templates/journals/_base.html b/journals/templates/journals/_base.html index 6d7c6e157845bb455fe581b7a28b85f6b7cb2783..4e2522bd0cd7e8c4439e59498dfe7a597d12bebb 100644 --- a/journals/templates/journals/_base.html +++ b/journals/templates/journals/_base.html @@ -46,7 +46,7 @@ <footer class="secondary container-fluid py-2"> <div class="row my-1"> <div class="col-12"> - SciPost Physics is published by the SciPost Foundation under the journal doi: 10.21468/SciPostPhys and ISSN 2542-4653. + {{journal}} is published by the SciPost Foundation under the journal doi: 10.21468/{{journal.name}} and ISSN {{journal.issn}}. </div> </div> </footer> diff --git a/journals/urls/general.py b/journals/urls/general.py index b9f90678b2d804bfb5982bb6e0292ae1ab7e2adf..3640ba9b65015047c71210d700f8cb3efb9bf9ce 100644 --- a/journals/urls/general.py +++ b/journals/urls/general.py @@ -6,7 +6,7 @@ from journals import views as journals_views urlpatterns = [ # Journals - url(r'^$', journals_views.journals, name='journals'), + url(r'^$', TemplateView.as_view(template_name='journals/journals.html'), name='journals'), url(r'^journals_terms_and_conditions$', TemplateView.as_view(template_name='journals/journals_terms_and_conditions.html'), name='journals_terms_and_conditions'), diff --git a/journals/views.py b/journals/views.py index c7cea10a03cfac4dc3857169001eb12d429376cf..78e630e43c74249d3d3163422a152292b86cb7c3 100644 --- a/journals/views.py +++ b/journals/views.py @@ -28,10 +28,6 @@ from guardian.decorators import permission_required # Journals ############ -def journals(request): - return render(request, 'journals/journals.html') - - def landing_page(request, doi_string): journal = get_object_or_404(Journal, doi_string=doi_string)