From cf38653746cac4f24a8c971110dc31696b71cf30 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 15 Aug 2017 17:11:27 +0200
Subject: [PATCH] Update templates for new Card classes
---
.../journals/_publication_card_content.html | 4 +--
.../journals/journal_issue_detail.html | 8 ++----
.../journals/journal_landing_page.html | 20 ++++++-------
.../templates/journals/journal_recent.html | 10 +++----
.../journals/publication_detail.html | 6 ++++
.../partials/journals/publication_card.html | 3 ++
scipost/models.py | 1 +
.../scipost/assets/config/preconfig.scss | 18 ++++--------
scipost/static/scipost/assets/css/_cards.scss | 28 +++++++++++--------
scipost/templates/scipost/foundation.html | 26 ++++++++---------
scipost/templates/scipost/index.html | 20 ++++++-------
.../submissions/_required_actions_block.html | 6 ++--
.../submissions/admin/editorial_admin.html | 20 ++++++-------
13 files changed, 86 insertions(+), 84 deletions(-)
create mode 100644 journals/templates/partials/journals/publication_card.html
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index 8ba340a57..b58112307 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,5 +1,5 @@
-<div class="card-header mx-0 px-2">
- <h3 class="card-title mb-0 "><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
+<div class="card-header">
+ <h3 class="py-0"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
</div>
<div class="card-body publication-{{publication.id}}">
<p class="card-text mb-2">{{ publication.author_list }}</p>
diff --git a/journals/templates/journals/journal_issue_detail.html b/journals/templates/journals/journal_issue_detail.html
index 1d7c2fd8c..c15afdb79 100644
--- a/journals/templates/journals/journal_issue_detail.html
+++ b/journals/templates/journals/journal_issue_detail.html
@@ -29,12 +29,10 @@
<div class="row">
<div class="col-12">
- <ul class="list-group list-group-flush list-group-noborder">
+ <ul class="list-unstyled">
{% for paper in papers %}
- <li class="list-group-item">
- <div class="card card-grey card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
+ <li>
+ {% include 'partials/journals/publication_card.html' with publication=paper %}
</li>
{% endfor %}
</ul>
diff --git a/journals/templates/journals/journal_landing_page.html b/journals/templates/journals/journal_landing_page.html
index f1c4a81e3..1cd761620 100644
--- a/journals/templates/journals/journal_landing_page.html
+++ b/journals/templates/journals/journal_landing_page.html
@@ -19,15 +19,13 @@
<div class="row">
<div class="col-12">
- <ul class="list-group list-group-flush list-group-noborder">
+ <ul class="list-unstyled">
{% for paper in current_issue.publication_set.all|dictsort:"paper_nr" %}
- <li class="list-group-item">
- <div class="card card-grey card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
+ <li>
+ {% include 'partials/journals/publication_card.html' with publication=paper %}
</li>
{% empty %}
- <li class="list-group-item">
+ <li>
<h3>No publications found for this issue</h3>
</li>
{% endfor %}
@@ -44,15 +42,13 @@
</div>
<div class="row">
<div class="col-12">
- <ul class="list-group list-group-flush list-group-noborder">
+ <ul class="list-unstyled">
{% for paper in latest_issue.publication_set.all|dictsort:"paper_nr" %}
- <li class="list-group-item">
- <div class="card card-grey card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
+ <li>
+ {% include 'partials/journals/publication_card.html' with publication=paper %}
</li>
{% empty %}
- <li class="list-group-item">
+ <li>
<h3>No publications found for this issue</h3>
</li>
{% endfor %}
diff --git a/journals/templates/journals/journal_recent.html b/journals/templates/journals/journal_recent.html
index fc34bb5f9..d12a18090 100644
--- a/journals/templates/journals/journal_recent.html
+++ b/journals/templates/journals/journal_recent.html
@@ -18,15 +18,13 @@
<div class="row">
<div class="col-12">
- <ul class="list-group list-group-flush list-group-noborder">
+ <ul class="list-unstyled">
{% for paper in recent_papers %}
- <li class="list-group-item">
- <div class="card card-grey card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
+ <li>
+ {% include 'partials/journals/publication_card.html' with publication=paper %}
</li>
{% empty %}
- <li class="list-group-item"><h3>Sorry, no recent publications were found.</h3></li>
+ <li><h3>Sorry, no recent publications were found.</h3></li>
{% endfor %}
</ul>
</div>
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 908822960..beb1cfb48 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -74,6 +74,12 @@
<p>
{% for author in publication.authors.all %}
<a href="{{author.get_absolute_url}}">{{ author }}</a> {% if not forloop.last %} · {% endif %}
+
+ {% if forloop.last %}
+ {% if publication.authors_unregistered.exists %}
+ ·
+ {% endif %}
+ {% endif %}
{% endfor %}
{% for author in publication.authors_unregistered.all %}
{{ author }} {% if not forloop.last %} · {% endif %}
diff --git a/journals/templates/partials/journals/publication_card.html b/journals/templates/partials/journals/publication_card.html
new file mode 100644
index 000000000..e327036ab
--- /dev/null
+++ b/journals/templates/partials/journals/publication_card.html
@@ -0,0 +1,3 @@
+<div id="{{publication.doi_label}}" class="card card-grey card-publication">
+ {% include 'journals/_publication_card_content.html' with publication=publication %}
+</div>
diff --git a/scipost/models.py b/scipost/models.py
index 6df8cec1f..99c061935 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -154,6 +154,7 @@ class Remark(models.Model):
+ self.contributor.user.last_name + ' on '
+ self.date.strftime("%Y-%m-%d"))
+
###############
# Invitations #
###############
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index 61cf4941f..39a77066f 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -45,21 +45,17 @@ $gray-600: #ccc;
// Alerts
//
-// $alert-success-text: $scipost-darkblue;
-// $alert-warning-text: $scipost-darkblue;
-// $alert-danger-text: $scipost-darkblue;
$alert-border-radius: $base-border-radius;
// Cards
//
-$card-spacer-x: 0.75rem;
+
$card-border-radius: $base-border-radius;
-$card-border-color: $white;
-$card-cap-bg: transparent;
-// $btn-secondary-border-color: #f1f1f1; --- CHECK
-$card-shadow-color: #ccc; // --- CHECK
-$card-grey-border-bottom-color: #d0d1d5; // --- CHECK
-$card-grey-border-color: #e5e6e9 #dfe0e4 $card-grey-border-bottom-color; // --- CHECK
+$card-spacer-x: 0.75rem;
+$card-spacer-y: 0.5rem;
+$card-shadow-color: #ccc;
+$card-grey-border-bottom-color: #d0d1d5;
+$card-grey-border-color: #e5e6e9 #dfe0e4 $card-grey-border-bottom-color;
// breadcrumb
//
@@ -73,8 +69,6 @@ $input-btn-padding-x: .5rem;
$input-btn-padding-y: .25rem;
$input-btn-padding-y-sm: .15rem;
$btn-transition: none;
-// $input-padding-x: .5rem;
-// $input-padding-y: .25rem;
$input-height: calc(1.5rem + 2px);
$input-height-lg: calc(1.5rem + 2px);
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 00469bb6b..88d0e81b7 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -5,6 +5,15 @@
background-color: #F4F4F4;
border-color: $card-grey-border-color;
box-shadow: 0 1px 0 0 $card-shadow-color;
+
+ .card-header {
+ background: transparent;
+ border-bottom-color: #fff;
+ }
+
+ .card-footer {
+ background: transparent;
+ }
}
&.card-publication {
@@ -27,15 +36,15 @@
border-color: #f1f1f1;
}
-.card-header {
- padding: 0.5rem 0;
- margin: 0 0.75rem;
-}
+// .card-header {
+// padding: 0.5rem 0;
+// margin: 0 0.75rem;
+// }
-.card-footer {
- padding: 0.75rem 0 0 0;
- margin: 0 0.75rem 0.75rem 0.75rem;
-}
+// .card-footer {
+// padding: 0.75rem 0 0 0;
+// margin: 0 0.75rem 0.75rem 0.75rem;
+// }
.list-group-item > .card-body {
padding: 0.5rem;
@@ -52,9 +61,6 @@
.card-news {
.news-item .card-title {
- // background-color: $scipost-darkblue;
- // color: $scipost-light;
- // padding: 0.5rem;
color: $scipost-darkblue;
padding: 0.5rem 0 0.25rem 0;
border-bottom: 3px solid $scipost-light;
diff --git a/scipost/templates/scipost/foundation.html b/scipost/templates/scipost/foundation.html
index f4c78a69f..a331482fe 100644
--- a/scipost/templates/scipost/foundation.html
+++ b/scipost/templates/scipost/foundation.html
@@ -32,9 +32,9 @@
<div class="row">
<div class="col-12">
<div class="card-deck">
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">SciPost Board</h2>
+ <h2 class="highlight">SciPost Board</h2>
<ul>
<li>Chairman: Prof. J.-S. Caux</li>
<li>Secretary: Dr J. van Mameren</li>
@@ -44,10 +44,9 @@
</div>
</div>
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">Contact details</h2>
-
+ <h2 class="highlight">Contact details</h2>
<address class="px-2">
c/o Prof. <a href="mailto:jscaux@scipost.org">J.-S. Caux</a></br>
Institute of Physics</br>
@@ -61,10 +60,9 @@
</div>
</div>
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">Registration</h2>
-
+ <h2 class="highlight">Registration</h2>
<div class="px-2">
<p>
Dutch Chamber of Commerce nr 65280083.</br>
@@ -81,22 +79,22 @@
<div class="row">
<div class="col-12">
<div class="card-deck">
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">Registration</h2>
+ <h2 class="highlight">Registration</h2>
</div>
</div>
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">Yearly Reports</h2>
+ <h2 class="highlight">Yearly Reports</h2>
<p class="px-2">2016 (to be published)</p>
</div>
</div>
- <div class="card">
+ <div class="card border-0">
<div class="card-body">
- <h2 class="highlight">Financial Reports</h2>
+ <h2 class="highlight">Financial Reports</h2>
<p class="px-2">2016-7 (to be published)</p>
</div>
</div>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index fd8ab64ea..e4123e9a0 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -26,11 +26,11 @@
<div class="row">
<div class="col-lg-6">
<!-- Latest publications -->
- <div class="card card-grey px-3">
- <div class="card-header">
- <h2 class="card-title mb-0"><a href="{% url 'journals:journals' %}" class="text-black">Latest Publications</a></h2>
+ <div class="card card-grey px-4">
+ <div class="card-header px-0">
+ <h2><a href="{% url 'journals:journals' %}" class="text-black">Latest Publications</a></h2>
</div>
- <div class="card-body pt-0">
+ <div class="card-body p-0">
<ul class="list-group list-group-flush">
{% for publication in publications %}
<li class="list-group-item">
@@ -40,7 +40,7 @@
</li>
{% endfor %}
<li class="list-group-item">
- <div class="card-body pt-3">
+ <div class="card-body pt-3 mb-2">
<a href="{% url 'journals:journals' %}">All Journals</a>
</div>
</li>
@@ -51,11 +51,11 @@
<div class="col-lg-6">
<!-- Latest submissions -->
- <div class="card card-grey px-3">
- <div class="card-header">
- <h2 class="card-title mb-0"><a href="{% url 'submissions:submissions' %}" class="text-black">Latest Submissions</a></h2>
+ <div class="card card-grey px-4">
+ <div class="card-header px-0">
+ <h2><a href="{% url 'submissions:submissions' %}" class="text-black">Latest Submissions</a></h2>
</div>
- <div class="card-body pt-0">
+ <div class="card-body p-0">
<ul class="list-group list-group-flush">
{% for submission in submissions %}
<li class="list-group-item">
@@ -63,7 +63,7 @@
</li>
{% endfor %}
<li class="list-group-item">
- <div class="card-body pt-3">
+ <div class="card-body pt-3 mb-2">
<a href="{% url 'submissions:submissions' %}">All submissions</a>
</div>
</li>
diff --git a/submissions/templates/submissions/_required_actions_block.html b/submissions/templates/submissions/_required_actions_block.html
index f502005ef..33279aa05 100644
--- a/submissions/templates/submissions/_required_actions_block.html
+++ b/submissions/templates/submissions/_required_actions_block.html
@@ -1,7 +1,9 @@
{% if submission.cycle.has_required_actions %}
- <div class="card {% if submission.cycle.get_required_actions %}card-danger text-white{% else %}card-outline-success text-success{% endif %}">
+ <div class="card {% if submission.cycle.get_required_actions %}bg-danger text-white{% else %}border-success text-success{% endif %}">
+ <div class="card-header py-1 {% if not submission.cycle.get_required_actions %}bg-transparent border-0 pb-0{% endif %}">
+ <h3>Required actions:</h3>
+ </div>
<div class="card-body">
- <h3 class="card-title pt-0">Required actions:</h3>
<ul class="mb-0">
{% for action in submission.cycle.get_required_actions %}
<li>{{action.1}}</li>
diff --git a/submissions/templates/submissions/admin/editorial_admin.html b/submissions/templates/submissions/admin/editorial_admin.html
index 597226713..2ce345e54 100644
--- a/submissions/templates/submissions/admin/editorial_admin.html
+++ b/submissions/templates/submissions/admin/editorial_admin.html
@@ -20,18 +20,18 @@
</p>
<h3>Submissions currently in pre-screening</h3>
- <ul class="unstyled-list">
+ <ul class="list-unstyled">
{% for sub in submission_list.prescreening %}
<li>
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
</strong>
{% else %}
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
{% endif %}
</li>
{% empty %}
@@ -40,18 +40,18 @@
</ul>
<h3>Submissions currently in refereeing round</h3>
- <ul class="unstyled-list">
+ <ul class="list-unstyled">
{% for sub in submission_list.actively_refereeing %}
<li>
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
</strong>
{% else %}
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
{% endif %}
</li>
{% empty %}
@@ -60,18 +60,18 @@
</ul>
<h3>Submissions accepted</h3>
- <ul class="unstyled-list">
+ <ul class="list-unstyled">
{% for sub in submission_list.accepted %}
<li>
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
</strong>
{% else %}
<a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <br>latest activity: {{sub.latest_activity|timesince}} ago
+ <div class="pl-md-4">latest activity: {{sub.latest_activity|timesince}} ago</div>
{% endif %}
</li>
{% empty %}
@@ -82,7 +82,7 @@
<div class="col-md-5">
{% if submission %}
- <div class="card card-outline-secondary mt-2">
+ <div class="card border-secondary mt-2">
<div class="card-body">
{% include 'partials/submissions/admin/editorial_admin_summary.html' with submission=submission %}
</div>
--
GitLab