diff --git a/colleges/templates/colleges/college_detail.html b/colleges/templates/colleges/college_detail.html index 1feebb19c081152159d2dba4808017400d1104f4..7db7610edad0d75092f5f4df92d347417f5d3b21 100644 --- a/colleges/templates/colleges/college_detail.html +++ b/colleges/templates/colleges/college_detail.html @@ -11,7 +11,7 @@ <span class="breadcrumb-item">Editorial College ({{ discipline|get_discipline_display }})</span> {% endblock %} -{% block pagetitle %}: Fellowships{% endblock pagetitle %} +{% block pagetitle %}: College ({{ discipline|get_discipline_display }}){% endblock pagetitle %} {% block content %} diff --git a/colleges/templates/colleges/colleges.html b/colleges/templates/colleges/colleges.html index 06e5fd95fd1779066010fd5e37c7e862517e60d1..3ad8a7c115a7298b570e744dfff8d91f8bae5efb 100644 --- a/colleges/templates/colleges/colleges.html +++ b/colleges/templates/colleges/colleges.html @@ -10,7 +10,7 @@ <a href="{% url 'colleges:colleges' %}" class="breadcrumb-item">Colleges</a> {% endblock %} -{% block pagetitle %}: Fellowships{% endblock pagetitle %} +{% block pagetitle %}: Colleges{% endblock pagetitle %} {% block content %} diff --git a/journals/templates/journals/about.html b/journals/templates/journals/about.html index 6f0dae719fc32acc9b4f765611218001b67ca305..42aaaac1603d69de0fd69c8746ce4c2d58dbe1bf 100644 --- a/journals/templates/journals/about.html +++ b/journals/templates/journals/about.html @@ -14,15 +14,12 @@ {% block content %} {{ block.super }} - <div class="row"> - <div class="col-12"> - <h2 class="m-1">About {{ journal.name }}</h2> - </div> - </div> <div class="row"> - <div class="col-12"> + <div class="col-lg-5"> + <h2 class="m-1">About {{ journal.name }}</h2> + <br> <ul> <li><a href="#description">Description</a></li> <li><a href="#scope">Scope</a></li> @@ -31,6 +28,14 @@ <li><a href="#sub_and_ed">Submission and Editorial Process</a></li> <li><a href="#genuineOA">Genuine Open Access</a></li> </ul> + </div> + <div class="col-lg-7"> + {% include 'submissions/_guidelines_dl.html' with journal=journal %} + </div> + </div> + + <div class="row"> + <div class="col-12"> <h2 class="highlight" id="description"> Description diff --git a/journals/templates/journals/journal_list.html b/journals/templates/journals/journal_list.html index 776aa0ee53ddca7407af82ba2904c0257275e89c..286cc52306c75811e9ce5e1870d6efc228d89484 100644 --- a/journals/templates/journals/journal_list.html +++ b/journals/templates/journals/journal_list.html @@ -31,6 +31,23 @@ {% block content %} + {% if discipline %} + <ul class="list-inline"> + <li class="list-inline-item p-1"><strong>Quick links:</strong></li> + {% for journal in object_list %} + {% if journal.active or perms.scipost.can_view_pool %} + <li class="list-inline-item px-2 py-1 {{ journal.doi_label }}"> + <a href="{{ journal.get_absolute_url }}">{{ journal.doi_label|cut:"SciPost" }}</a> + {% if journal.has_DOAJ_Seal %} +  <a href="https://doaj.org" class="float-right"><img src="{% static 'scipost/images/DOAJ_Seal_logo_big.png' %}" alt="DOAJ Seal" width="16em"></a> + {% endif %} + </li> + {% endif %} + {% endfor %} + </ul> + {% endif %} + + <h1 class="highlight">SciPost {% if discipline %}{{ discipline|get_discipline_display }} {% endif %}Journals</h1> <div class="row"> @@ -46,45 +63,56 @@ </div> </div> - <br> - {% if not discipline %} - <div class="row"> - <div class="col-12"> - - <table class="table table-bordered table-secondary"> - <thead class="thead-dark"> - <tr> - <th><h3>Branch of Science</h3></th> - <th><h3>Fields<br><small><em>(click to see list of Journals)</em></small></h3></th> - </tr> - </thead> - <tbody> - {% for branch in scipost_disciplines %} - {% with object_list|journals_in_branch:branch.0 as journals_branch %} - <tr> - <td class="align-middle"> - {{ branch.0 }} - </td> - <td> - {% for discipline in branch.1 %} + <div class="row"> + <div class="col-12"> + + <table class="table table-bordered table-secondary"> + <thead class="thead-dark"> + <tr> + <th><h3>Branch of Science</h3></th> + <th><h3>Fields<br><small><em>(click to see field-specific detailed list)</em></small></h3></th> + </tr> + </thead> + <tbody> + {% for branch in scipost_disciplines %} + {% with object_list|journals_in_branch:branch.0 as journals_branch %} + <tr> + <td class="align-middle"> + {{ branch.0 }} + </td> + <td> + {% for discipline in branch.1 %} {% with journals_branch|journals_in_discipline:discipline.0 as journals_disc %} {% if journals_disc|length > 0 %} <a href={% url 'journals:journals' discipline=discipline.0 %}><button type="button" class="btn btn-primary btn-sm"><small>{{ discipline.1 }}</small></button></a> {% else %} <button type="button" class="btn btn-sm btn-outline-secondary m-1"><small><em>{{ discipline.1 }}</em></small></button> {% endif %} - {% endwith %} + {% endwith %} {% endfor %} </td> </tr> {% endwith %} - {% endfor %} - </tbody> - </table> + {% endfor %} + </tbody> + </table> + </div> + </div> + + <h2 class="highlight">Full list of our Journals</h2> + <div class="card-columns"> + {% for journal in object_list %} + {% if journal.active or perms.scipost.can_view_pool %} + <div class="card"> + <div class="card-header {{ journal.doi_label }}"> + <a href="{{ journal.get_absolute_url }}">{{ journal.name }}</a> + </div> + </div> + {% endif %} + {% endfor %} </div> - </div> {% else %} diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html index a5e8e74ba4bb0b36c356e6e2c21762e2a14c039a..440915fc1c78a57b02b0ecaf8db4507d028bcb1a 100644 --- a/scipost/templates/scipost/navbar.html +++ b/scipost/templates/scipost/navbar.html @@ -47,7 +47,7 @@ <thead class="thead-dark"> <tr> <th class="px-2 py-1"><small>Branch of Science</small></th> - <th class="px-2 py-1"><small>Fields (click to see list of Journals)</em></small></th> + <th class="px-2 py-1"><small>Fields (click to see field-specific detailed list)</em></small></th> </tr> </thead> <tbody>