diff --git a/news/templates/news/news_card_content.html b/news/templates/news/news_card_content.html index e97cd043f686cc612984aea9d3c2087c9686d7d9..f80216f05b273731cd57510e8e57a716c1f3da4c 100644 --- a/news/templates/news/news_card_content.html +++ b/news/templates/news/news_card_content.html @@ -1,12 +1,26 @@ -<div class="p-3 mb-3 bg-light news-item scipost-bar" id="news_{{news.id}}"> - <h3 class="title">{{news.headline}}</h3> - <h5 class="sub-title">{{news.date|date:'j F Y'}}</h5> - <p class="mb-0">{{ news.blurb|safe }}</p> +<div class="p-3 mb-3 bg-light news-item scipost-bar" id="news_{{ news.id }}"> + <h3 class="title">{{ news.headline }}</h3> + <h5 class="sub-title">{{ news.date|date:'j F Y' }}</h5> {% if news.image %} - <img class="d-flex mr-3 {{ news.image.css_class }}" src="{{ news.image.url }}" alt="image"/> + <div class="row"> + <div class="col-sm-3 col-lg-2"> + <img class="mb-3 mb-sm-0 {{ news.image.css_class }}" src="{{ news.image.url }}" alt="image"/> + </div> + <div class="col-sm-9 col-lg-10"> + <p class="mb-0">{{ news.blurb|safe }}</p> + </div> + </div> + {% else %} + <p class="mb-0">{{ news.blurb|safe }}</p> {% endif %} {% if news.followup_link %} <a class="mt-3 d-inline-block" href="{{ news.followup_link }}">{{ news.followup_link_text }}</a> {% endif %} + {% if perms.scipost.can_manage_news %} + <br> + <br> + <a href="{% url 'news:newsitem_update' pk=news.id %}">Edit news item</a> · + <a href="{% url 'news:newsitem_delete' pk=news.id %}" class="text-danger">Delete</a> + {% endif %} </div> diff --git a/news/templates/news/news_manage.html b/news/templates/news/news_manage.html index 315a294a155f10c435c3da1d8795d677ef538798..6d734f0f360277c872af7214933e7691e064dba0 100644 --- a/news/templates/news/news_manage.html +++ b/news/templates/news/news_manage.html @@ -4,86 +4,99 @@ {% block pagetitle %}: News Management{% endblock pagetitle %} +{% block breadcrumb %} + <nav class="breadcrumb-nav"> + <div class="container"> + <ol class="breadcrumb"> + <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li> + <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span> + <li class="breadcrumb-item active">News Management</span> + </ol> + </div> + </nav> +{% endblock %} + {% block content %} <div class="row"> - <div class="col-12"> - <h1>News Management</h1> - </div> -</div> + <div class="col-12"> + <h1 class="highlight">News Management</h1> - -<hr/> -<div class="row"> - <div class="col-12"> - <h1>NewsLetters</h1> - <a href="{% url 'news:newsletter_create' %}">Add a NewsLetter</a> - <br/><br/> - {% for nl in newsletters %} - <div class="card"> - <div class="card-header" data-toggle="collapse" href="#collapse{{ nl.id }}" aria-expanded="false" aria-controls="collapse{{ nl.id }}"> - {{ nl }} - (status: {% if nl.published %}published{% else %}unpublished{% endif %}) - </div> - <div class="card-body collapse" id="collapse{{ nl.id }}"> - <div class="row"> - <div class="col-6"> - <a href="{{ nl.get_absolute_url }}" target="_blank">View this Newsletter in a separate window</a> - <br/><br/> - <h3>NewsItems included in this Newsletter:</h3> - <ul> - {% for nt in nl.newsletternewsitemstable_set.all|dictsort:'order' %} - <li>{{ nt.newsitem }}{% if not nt.newsitem.published %} <span class="text-danger">WARNING: unpublished</span>{% endif %}</li> - {% empty %} - <li>No associated NewsItems found</li> - {% endfor %} - </ul> - </div> - <div class="col-6"> - <h3>Actions:</h3> - <ul> - <li><a href="{% url 'news:newsletter_update' pk=nl.id %}">Update</a></li> - <li><a href="{% url 'news:newsletter_update_ordering' pk=nl.id %}">Update items ordering</a></li> - <li><a href="{% url 'news:newsletter_delete' pk=nl.id %}">Delete</a></li> - <li> - Add a News Item to this Newsletter: - <form class="d-block mt-2 mb-3" action="{% url 'news:add_newsitem_to_newsletter' nlpk=nl.id %}" method="post"> - {% csrf_token %} - {{ add_ni_to_nl_form|bootstrap }} - <input type="submit" name="submit" value="Add" class="btn btn-outline-secondary"> - </form> - </li> - </ul> - </div> - </div> - </div> - {% endfor %} + <h2 class="highlight">Newsletters</h2> + <a href="{% url 'news:newsletter_create' %}">Add a Newsletter</a> + <br/> + <br/> + {% for nl in newsletters %} + <div class="card mb-2"> + <div class="card-header" data-toggle="collapse" href="#collapse{{ nl.id }}" aria-expanded="false" aria-controls="collapse{{ nl.id }}"> + {{ nl }} + (status: {{ nl.published|yesno:'published,unpublished' }}) + </div> + <div class="card-body collapse" id="collapse{{ nl.id }}"> + <div class="row"> + <div class="col-6"> + <a href="{{ nl.get_absolute_url }}" target="_blank">View this Newsletter in a separate window</a> + <br/> + <br/> + <h3>News Items included in this Newsletter:</h3> + <ul> + {% for nt in nl.newsletternewsitemstable_set.all|dictsort:'order' %} + <li>{{ nt.newsitem }}{% if not nt.newsitem.published %} <span class="text-danger">WARNING: unpublished</span>{% endif %}</li> + {% empty %} + <li>No associated NewsItems found</li> + {% endfor %} + </ul> + </div> + <div class="col-6"> + <h3>Actions:</h3> + <ul> + <li><a href="{% url 'news:newsletter_update' pk=nl.id %}">Update</a></li> + <li><a href="{% url 'news:newsletter_update_ordering' pk=nl.id %}">Update items ordering</a></li> + <li><a href="{% url 'news:newsletter_delete' pk=nl.id %}">Delete</a></li> + <li> + Add a News Item to this Newsletter: + <form class="d-block mt-2 mb-3" action="{% url 'news:add_newsitem_to_newsletter' nlpk=nl.id %}" method="post"> + {% csrf_token %} + {{ add_ni_to_nl_form|bootstrap }} + <input type="submit" name="submit" value="Add" class="btn btn-outline-secondary"> + </form> + </li> + </ul> + </div> + </div> + </div> + </div> + {% endfor %} </div> - </div> - -<hr/> +</div> <div class="row"> - <div class="col-12"> - <h1>NewsItems</h1> - <a href="{% url 'news:newsitem_create' %}">Add a NewsItem</a> - <br/><br/> - <table class="table"> - <thead> - <th>Item</th> - <th>Published?</th> - <th>On homepage?</th> - <th>Actions</th> - <th></th> - </thead> - {% for ni in newsitems %} - <tr> - <td>{{ ni }}</td> - <td>{{ ni.published }}</td> - <td>{{ ni.on_homepage }}</td> - <td><a href="{% url 'news:newsitem_update' pk=ni.id %}">Update</a></td> - <td><a href="{% url 'news:newsitem_delete' pk=ni.id %}">Delete</a></td> - </tr> - {% endfor %} - </table> - </div> + <div class="col-12"> + <h2 class="highlight">News items</h2> + <a href="{% url 'news:newsitem_create' %}">Add a News item</a> + <br/> + <br/> + <table class="table table-hover"> + <thead> + <th>Item</th> + <th>Publication date</th> + <th>Published?</th> + <th>On homepage?</th> + <th>Actions</th> + </thead> + </tbody> + {% for ni in newsitems %} + <tr> + <td>{{ ni.headline }}</td> + <td>{{ ni.date }}</td> + <td><i class="fa fa-{{ ni.published|yesno:'check text-success,times text-danger' }}"></i> {{ ni.published|yesno:'Yes,No' }}</td> + <td><i class="fa fa-{{ ni.on_homepage|yesno:'check text-success,times text-danger' }}"></i> {{ ni.on_homepage|yesno:'Yes,No' }}</td> + <td> + <a href="{% url 'news:newsitem_update' pk=ni.id %}">Update</a> · + <a href="{% url 'news:newsitem_delete' pk=ni.id %}" class="text-danger">Delete</a> + </td> + </tr> + {% endfor %} + </tbody> + </table> + </div> </div> {% endblock content %} diff --git a/news/templates/news/newsitem_confirm_delete.html b/news/templates/news/newsitem_confirm_delete.html index a2d678e164e830abe25fb5da88ff797da8640f1b..cd82b762d74ccde92ddff0b6bdd7ddab7f14e56a 100644 --- a/news/templates/news/newsitem_confirm_delete.html +++ b/news/templates/news/newsitem_confirm_delete.html @@ -2,17 +2,29 @@ {% load bootstrap %} -{% block pagetitle %}: Delete NewsItem{% endblock pagetitle %} +{% block pagetitle %}: Delete News Item{% endblock pagetitle %} + + +{% block breadcrumb %} + <nav class="breadcrumb-nav"> + <div class="container"> + <ol class="breadcrumb"> + <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li> + <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span> + <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span> + <li class="breadcrumb-item active" aria-current="page">Delete {{ object.headline|truncatechars:20 }}</span> + </ol> + </div> + </nav> +{% endblock %} {% block content %} <div class="row"> <div class="col-12"> - <h1 class="highlight">Delete NewsItem</h1> - {{ object }} - </div> -</div> -<div class="row"> - <div class="col-12"> + <h1 class="highlight">Delete News Item</h1> + {% include 'news/news_card_content.html' with news=object %} + + <form method="post"> {% csrf_token %} <h3 class="mb-2">Are you sure you want to delete this NewsItem?</h3> diff --git a/news/templates/news/newsitem_create.html b/news/templates/news/newsitem_create.html index fafb194eb0675d2a731236c9b4077babaf39140f..d063d7a57251cacd314a956666f94152503c6ac7 100644 --- a/news/templates/news/newsitem_create.html +++ b/news/templates/news/newsitem_create.html @@ -2,11 +2,28 @@ {% load bootstrap %} -{% block pagetitle %}: NewsItems{% endblock pagetitle %} +{% block pagetitle %}: Create News Item{% endblock pagetitle %} + +{% block breadcrumb %} + <nav class="breadcrumb-nav"> + <div class="container"> + <ol class="breadcrumb"> + <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li> + <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span> + <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span> + <li class="breadcrumb-item active" aria-current="page">Create News Item</span> + </ol> + </div> + </nav> +{% endblock %} + {% block content %} + <div class="row"> <div class="col-12"> + <h1 class="highlight">Create News Item</h1> + <form action="{% url 'news:newsitem_create' %}" method="post" enctype="multipart/form-data"> {% csrf_token %} {{ form|bootstrap }} diff --git a/news/templates/news/newsitem_list.html b/news/templates/news/newsitem_list.html index 55ca7da1345164f6678641a358fe84ccb5164698..c1a590bdadd3752b8738131a831853a59597581d 100644 --- a/news/templates/news/newsitem_list.html +++ b/news/templates/news/newsitem_list.html @@ -45,11 +45,9 @@ {% endif %} {% for item in object_list %} - <div class="card card-grey card-news"> - {% include 'news/news_card_content.html' with news=item %} - </div> + {% include 'news/news_card_content.html' with news=item %} {% empty %} - <div>No news found.</div> + <div>No news found.</div> {% endfor %} {% if is_paginated %} diff --git a/news/templates/news/newsitem_update.html b/news/templates/news/newsitem_update.html index c4b6415688da9843a1bf619acb3518e8241041cd..85af2b0902b4f4506ce094bbb9d2804096aafde7 100644 --- a/news/templates/news/newsitem_update.html +++ b/news/templates/news/newsitem_update.html @@ -2,32 +2,30 @@ {% load bootstrap %} -{% block pagetitle %}: NewsItems{% endblock pagetitle %} +{% block pagetitle %}: News Items{% endblock pagetitle %} -{% block breadcrumb_items %} -{{ block.super }} -<a href="{% url 'news:news' %}" class="breadcrumb-item">News</a> -<a href="{% url 'news:manage' %}" class="breadcrumb-item">Manage</a> -<span class="breadcrumb-item">Update NewsItem</span> -{% endblock breadcrumb_items %} +{% block breadcrumb %} + <nav class="breadcrumb-nav"> + <div class="container"> + <ol class="breadcrumb"> + <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li> + <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span> + <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span> + <li class="breadcrumb-item active" aria-current="page">{{ object.headline|truncatechars:20 }}</span> + </ol> + </div> + </nav> +{% endblock %} -{% block content %} -<div class="row"> - <div class="col-12"> - <h1>News Item to update:</h1> - <div class="card card-grey card-news"> - {% include 'news/news_card_content.html' with news=object %} - </div> - </div> -</div> - - <hr/> +{% block content %} <div class="row"> <div class="col-12"> - <h1>Edit it here:</h1> + <h1 class="highlight">Update News Item</h1> + {% include 'news/news_card_content.html' with news=object %} + <br> <form action="{% url 'news:newsitem_update' pk=object.id %}" method="post" enctype="multipart/form-data"> {% csrf_token %} {{ form|bootstrap }} diff --git a/news/templates/news/newsletter_create.html b/news/templates/news/newsletter_create.html index 1313af25d9e64feded62fe20c49e575c9097ab9f..f9e0c71bf0b9e67c5d61bb21a3aa56682be066e4 100644 --- a/news/templates/news/newsletter_create.html +++ b/news/templates/news/newsletter_create.html @@ -2,11 +2,28 @@ {% load bootstrap %} -{% block pagetitle %}: NewsLetters{% endblock pagetitle %} +{% block pagetitle %}: Create Newsletter{% endblock pagetitle %} + +{% block breadcrumb %} + <nav class="breadcrumb-nav"> + <div class="container"> + <ol class="breadcrumb"> + <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li> + <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span> + <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span> + <li class="breadcrumb-item active" aria-current="page">Create Newsletter</span> + </ol> + </div> + </nav> +{% endblock %} + {% block content %} + <div class="row"> <div class="col-12"> + <h1 class="highlight">Create Newsletter</h1> + <form action="{% url 'news:newsletter_create' %}" method="post"> {% csrf_token %} {{ form|bootstrap }} diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss index 518ce2e67e9ca8fa18752492e5ba9de97c3b7880..897ada679dc72c4a504f42b772ebddcb01eb5897 100644 --- a/scipost/static/scipost/assets/config/preconfig.scss +++ b/scipost/static/scipost/assets/config/preconfig.scss @@ -71,7 +71,7 @@ $card-gray-border-color: $scipost-lightblue $gray-100 $gray-100; // breadcrumb // -$breadcrumb-bg: #f0f0f0; +$breadcrumb-bg: #f3f3f3; $breadcrumb-active-color: $scipost-darkblue; $breadcrumb-divider-color: $scipost-orange; diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss index 2b37d0e4dbcd4d4d0193dfbc0515e64a70d938f5..831d8f277e21a5bbfe43ec8150c4cf58ff0fa6e2 100644 --- a/scipost/static/scipost/assets/css/_cards.scss +++ b/scipost/static/scipost/assets/css/_cards.scss @@ -41,3 +41,7 @@ background-color: #f9f9f9; } } + +.news-item { + border: 1px solid #e6e6e6; +} diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss index 58dcbac79216d7687d2228414c26469f593299dc..25eaf4be511e129b03a7ebd4ff795218854903f2 100644 --- a/scipost/static/scipost/assets/css/_general.scss +++ b/scipost/static/scipost/assets/css/_general.scss @@ -84,3 +84,7 @@ header { } } } + +.loading { + text-align: center; +} diff --git a/scipost/static/scipost/assets/css/_nav.scss b/scipost/static/scipost/assets/css/_nav.scss index 52b552088e82562ee1e69c837ab654461eb47cf1..01dc3d374a40095b5612746cf9fd6f4f9f1cdfb1 100644 --- a/scipost/static/scipost/assets/css/_nav.scss +++ b/scipost/static/scipost/assets/css/_nav.scss @@ -88,3 +88,40 @@ border-top: 3px solid $scipost-darkblue; } } + +.tab-nav-container { + display: block; + text-align: center; + border-bottom: 3px solid $scipost-darkblue; + + .tab-nav-inner { + display: inline-block; + + .nav li { + border: 0; + background-color: initial; + + &:hover, + &:active { + background-color: initial; + } + + a:hover, + a.active { + color: $scipost-darkblue; + text-decoration: underline; + + &:before { + border-bottom: 11px solid $scipost-darkblue; + border-left: 11px solid transparent; + border-right: 11px solid transparent; + content: ""; + display: inline-block; + position: absolute; + right: 40%; + bottom: 0; + } + } + } + } +} diff --git a/scipost/static/scipost/assets/css/_personal_page.scss b/scipost/static/scipost/assets/css/_personal_page.scss index d2e06dd17613933bf3f8b4e3386a4c8183a0d872..c3fa6ee4b2f1cd8d6ce039445bdedbb12fb8cd85 100644 --- a/scipost/static/scipost/assets/css/_personal_page.scss +++ b/scipost/static/scipost/assets/css/_personal_page.scss @@ -1,3 +1,12 @@ table.availabilities { width: 100%; } + + +.personal-page .tab-pane { + min-height: 5rem; + + .loading { + margin: 5rem; + } +} diff --git a/scipost/templates/partials/scipost/personal_page/account.html b/scipost/templates/partials/scipost/personal_page/account.html index ddf054d3e9537be03c4a8e67b20fe944513cfe33..f73d083d7337c3062dc20ef1a0159ea4c7b35929 100644 --- a/scipost/templates/partials/scipost/personal_page/account.html +++ b/scipost/templates/partials/scipost/personal_page/account.html @@ -15,7 +15,7 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title mb-0">Your Account</h2> </div> diff --git a/scipost/templates/partials/scipost/personal_page/author_replies.html b/scipost/templates/partials/scipost/personal_page/author_replies.html index c32a02349bf9941297e6914918d58498ed3a1966..a5068722c3e1149064836afaa894da4d9ebd8604 100644 --- a/scipost/templates/partials/scipost/personal_page/author_replies.html +++ b/scipost/templates/partials/scipost/personal_page/author_replies.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title mb-0">Your Author Replies</h2> </div> diff --git a/scipost/templates/partials/scipost/personal_page/commentaries.html b/scipost/templates/partials/scipost/personal_page/commentaries.html index bf1d0b90f02df8276a103a1b4844e64dc4e7d190..650c2b9a04d7dc7a62d0536a0894f283b729af29 100644 --- a/scipost/templates/partials/scipost/personal_page/commentaries.html +++ b/scipost/templates/partials/scipost/personal_page/commentaries.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title">Commentaries</h2> <ul class="mb-0"> diff --git a/scipost/templates/partials/scipost/personal_page/comments.html b/scipost/templates/partials/scipost/personal_page/comments.html index 1466d8477f36e59b054ccd273781f5cda0b4a0c8..afd1f9eca1422294b339fd3ceff48762d8b70a88 100644 --- a/scipost/templates/partials/scipost/personal_page/comments.html +++ b/scipost/templates/partials/scipost/personal_page/comments.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title mb-0">Your Comments</h2> </div> diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html index 14e5d9d805b5ba5f24b06105172da5a597d7df00..bbd6ecd476264e7ec2fc5b8f3ed57c852d88703f 100644 --- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html +++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html @@ -2,7 +2,7 @@ {% is_scipost_admin request.user as is_scipost_admin %} <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title mb-0">Pending Editorial Actions</h2> </div> diff --git a/scipost/templates/partials/scipost/personal_page/publications.html b/scipost/templates/partials/scipost/personal_page/publications.html index 1e29ff93c32b4ad589cf9dc0d4737e010efdd45f..c6edcf9e635d0fc6db7f6f93b55269eb3f547307 100644 --- a/scipost/templates/partials/scipost/personal_page/publications.html +++ b/scipost/templates/partials/scipost/personal_page/publications.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title">Publications</h2> <ul class="mb-0"> @@ -22,7 +22,7 @@ <ul class="list-unstyled"> {% for pub in own_publications %} <li> - <div class="card card-gray card-publication" id="{{pub.doi_label}}"> + <div class="card bg-light card-publication" id="{{pub.doi_label}}"> {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %} </div> </li> diff --git a/scipost/templates/partials/scipost/personal_page/refereeing.html b/scipost/templates/partials/scipost/personal_page/refereeing.html index db74050aa064de3399ba05166e70a2a704b849b6..0edec98fd031230cdb26e1a101c1e9f085e21aac 100644 --- a/scipost/templates/partials/scipost/personal_page/refereeing.html +++ b/scipost/templates/partials/scipost/personal_page/refereeing.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title">Refereeing Tasks</h2> <ul class="mb-0"> diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html index daa032d13b9b81b13a47687fa740c0f657889255..31d42257039ae868ebc5e9b919cd0ff708fde503 100644 --- a/scipost/templates/partials/scipost/personal_page/submissions.html +++ b/scipost/templates/partials/scipost/personal_page/submissions.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title">Submissions</h2> <ul class="mb-0"> diff --git a/scipost/templates/partials/scipost/personal_page/theses.html b/scipost/templates/partials/scipost/personal_page/theses.html index 94c2b6630c3dcbc654eba5ac0dffbe7a41181d33..33fdc2a4be19b584994d2009d5953c1444110a96 100644 --- a/scipost/templates/partials/scipost/personal_page/theses.html +++ b/scipost/templates/partials/scipost/personal_page/theses.html @@ -1,6 +1,6 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h2 class="card-title">Theses</h2> <ul class="mb-0"> diff --git a/scipost/templates/scipost/claim_authorships.html b/scipost/templates/scipost/claim_authorships.html index 8d6a69a099be178c373320f4ad2311b7cbccd8a5..b87730a549c9d4fc22f771106bff240b586dcb57 100644 --- a/scipost/templates/scipost/claim_authorships.html +++ b/scipost/templates/scipost/claim_authorships.html @@ -29,7 +29,7 @@ <div class="row"> <div class="col-12"> {% for pub in publication_authorships_to_claim %} - <div class="card card-gray card-publication" id="{{pub.doi_label}}"> + <div class="card bg-light card-publication" id="{{pub.doi_label}}"> {% include 'journals/_publication_card_content.html' with publication=pub %} <div class="card-footer"> <form class="d-inline-block" action="{% url 'scipost:claim_pub_authorship' publication_id=pub.id claim=1 %}" method="post"> diff --git a/scipost/templates/scipost/comments_block.html b/scipost/templates/scipost/comments_block.html index aad8b68e5e456f14504bdf1a8068487d49450dbf..0c4ba8c56121e1c74e871ce8b728fabaf7f15eec 100644 --- a/scipost/templates/scipost/comments_block.html +++ b/scipost/templates/scipost/comments_block.html @@ -2,7 +2,7 @@ <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <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> diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html index b48c766d67fdbe009375dcc820a291ad01bb64b3..01aebfd42a64ec3ed1c930122d1de74fa4de7faf 100644 --- a/scipost/templates/scipost/personal_page.html +++ b/scipost/templates/scipost/personal_page.html @@ -5,16 +5,12 @@ {% block pagetitle %}: personal page{% endblock pagetitle %} -{% block breadcrumb %} - <div class="container-outside header"> - <div class="container"> - <h1>Welcome to your SciPost Personal Page{% if appellation %}, {{ appellation }}{% endif %}</h1> - </div> - </div> -{% endblock %} +{% block body_class %}{{ block.super }} personal-page{% endblock %} {% block content %} + <h1 class="highlight">Welcome to your SciPost Personal Page{% if appellation %}, {{ appellation }}{% endif %}</h1> + {% if needs_validation %} <div class="row"> diff --git a/scipost/templates/scipost/vet_registration_requests.html b/scipost/templates/scipost/vet_registration_requests.html index 4e85559c4a89cbb89f502be59f2a692ef4c00b95..6a9b397bb5f44beb374eff21b1b4eee22d51775d 100644 --- a/scipost/templates/scipost/vet_registration_requests.html +++ b/scipost/templates/scipost/vet_registration_requests.html @@ -25,7 +25,7 @@ $(function() { <div class="row"> <div class="col-12"> - <div class="card card-gray"> + <div class="card bg-light"> <div class="card-body"> <h1 class="card-title">SciPost Registration requests to vet:</h1> <p class="card-text mb-0"> diff --git a/submissions/templates/submissions/submission_list.html b/submissions/templates/submissions/submission_list.html index 81e16932b7ed25e5b0d82df9e6e34d3959f66edb..6e04c3fcc823bf6cec74c8b982740f1463b2c4f5 100644 --- a/submissions/templates/submissions/submission_list.html +++ b/submissions/templates/submissions/submission_list.html @@ -9,35 +9,33 @@ {% block content %} <div class="row"> <div class="col-md-4"> - <div class="card card-gray"> - <div class="card-body min-height-190"> - <h1 class="card-title">SciPost Submissions</h1> - <h3><a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a></h3> - <h3><a href="{% url 'submissions:author_guidelines' %}">Author guidelines</a></h3> - <h3><a href="{% url 'submissions:referee_guidelines' %}">Referee guidelines</a></h3> - <h3><a href="{% url 'submissions:submit_manuscript' %}">Submit a manuscript to SciPost</a></h3> - </div> + <div class="p-3 mb-3 bg-light scipost-bar border min-height-190"> + <h2>SciPost Submissions</h2> + <p> + <a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and refereeing procedure</a> + <br> + <a href="{% url 'submissions:author_guidelines' %}">Author guidelines</a> + <br> + <a href="{% url 'submissions:referee_guidelines' %}">Referee guidelines</a> + </p> + <h4><a href="{% url 'submissions:submit_manuscript' %}">Submit a manuscript to SciPost</a></h4> </div> </div> <div class="col-md-4"> - <div class="card card-gray"> - <div class="card-body min-height-190"> - <h2 class="card-title">Search SciPost Submissions:</h2> - <form action="{% url 'submissions:submissions' %}" class="small" method="get"> - {{ form|bootstrap:'4,8,sm' }} - <input class="btn btn-sm btn-outline-secondary" type="submit" value="Search"/> - </form> - </div> + <div class="p-3 mb-3 bg-light scipost-bar border min-height-190"> + <h2 class="card-title">Search SciPost Submissions:</h2> + <form action="{% url 'submissions:submissions' %}" class="small" method="get"> + {{ form|bootstrap:'4,8,sm' }} + <input class="btn btn-sm btn-outline-secondary" type="submit" value="Search"/> + </form> </div> </div> <div class="col-md-4"> - <div class="card card-gray"> - <div class="card-body min-height-190"> - <h2>View SciPost Submissions</h2> - <ul> - <li>Physics: last <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=1 %}">week</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=4 %}">month</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=52 %}">year</a></li> - </ul> - </div> + <div class="p-3 mb-3 bg-light scipost-bar border min-height-190"> + <h2>View SciPost Submissions</h2> + <ul> + <li>Physics: last <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=1 %}">week</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=4 %}">month</a> <a href="{% url 'submissions:browse' discipline='physics' nrweeksback=52 %}">year</a></li> + </ul> </div> </div> </div>