From 955ed8dfd9a54c790b3375eb23b82214b5f59178 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sun, 2 Apr 2017 13:56:36 +0200
Subject: [PATCH] Add experimental journals page structure
---
.../journals/_publication_card_content.html | 8 +-
.../templates/journals/scipost_physics.html | 79 ++++++++++---------
.../scipost/assets/config/preconfig.scss | 8 +-
.../static/scipost/assets/css/_general.scss | 3 +-
.../static/scipost/assets/css/_navbar.scss | 6 ++
scipost/static/scipost/assets/css/_type.scss | 13 ++-
.../scipost/assets/css/scipost-physics.scss | 26 ++++++
scipost/static/scipost/assets/css/style.scss | 8 +-
scipost/templates/scipost/base.html | 3 +-
9 files changed, 100 insertions(+), 54 deletions(-)
create mode 100644 scipost/static/scipost/assets/css/scipost-physics.scss
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index 68cb63965..1995f4d25 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,9 +1,7 @@
-<div class="card-header">
- <h3><a href="{% url 'scipost:publication_detail' publication.doi_string %}">{{ publication.title }}</a></h3>
-</div>
<div class="card-block publication-{{publication.id}}">
- <p>{{ publication.author_list }}</p>
- <p>{{ publication.citation }} | published {{ publication.publication_date|date:'j F Y' }}</p>
+ <h3 class="card-title"><a href="{% url 'scipost:publication_detail' publication.doi_string %}">{{ publication.title }}</a></h3>
+ <p class="card-text">{{ publication.author_list }}</p>
+ <p class="card-text text-muted mb-2">{{ publication.citation }} | published {{ publication.publication_date|date:'j F Y' }}</p>
<p class="abstract" style="display:none;">{{ publication.abstract }}</p>
<div class="actions">
<button class="btn btn-secondary mr-3" data-toggle="toggle" data-target=".card-block.publication-{{publication.id}} .abstract">Toggle abstract</button>
diff --git a/journals/templates/journals/scipost_physics.html b/journals/templates/journals/scipost_physics.html
index 6aa469bf6..d19ab1788 100644
--- a/journals/templates/journals/scipost_physics.html
+++ b/journals/templates/journals/scipost_physics.html
@@ -1,58 +1,61 @@
{% extends 'scipost/base.html' %}
{% block pagetitle %}: SciPost Physics{% endblock pagetitle %}
+{% block body_class %}{{block.super}} journals{% endblock %}
+
+{% block secondary_navbar %}
+ <nav class="navbar navbar-secondary">
+ <div class="container">
+ <div>
+ <h2 class="banner d-inline-block"><a href="{% url 'journals:scipost_physics' %}">SciPost Physics</a></h2>
+
+ {% if current_issue %}
+ <h2 class="highlight-empty text-blue d-inline-block mb-0">Current issue: Vol. {{ current_issue.in_volume.number }} issue {{ current_issue.number }} (in progress)</h2>
+ {% elif latest_issue %}
+ <h2 class="highlight-empty text-blue d-inline-block mb-0">Latest issue: Vol. {{ latest_issue.in_volume.number }} issue {{ latest_issue.number }}</h2>
+ {% endif %}
+ </div>
+ <ul class="links">
+ <li><a href="{% url 'journals:scipost_physics_issues' %}">Issues</a></li>
+ <li><a class="active" href="{% url 'journals:scipost_physics_recent' %}">Recent</a></li>
+ <li><a href="{% url 'journals:scipost_physics_accepted' %}">Accepted</a></li>
+ <li><a href="{% url 'submissions:submissions' %}?to_journal=SciPostPhysics">Submissions</a></li>
+ <li><a href="{% url 'journals:scipost_physics_info_for_authors' %}">Info for authors</a></li>
+ <li><a href="{% url 'journals:scipost_physics_about' %}">About</a></li>
+ </ul>
+ </div>
+ </nav>
+{% endblock secondary_navbar %}
{% block content %}
-{% include 'journals/scipost_physics_menu.html' %}
-
{% if current_issue %}
-<div class="row">
- <div class="col-12">
- <div class="panel">
- <h2>Current issue: Vol. {{ current_issue.in_volume.number }} issue {{ current_issue.number }} (in progress)</h2>
- </div>
- </div>
-</div>
-
-<div class="publicationHeaderList">
<div class="row">
<div class="col-12">
- {% for paper in current_issue.publication_set.all|dictsort:"paper_nr" %}
- <div class="card card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
- {% endfor %}
- </div>
- </div>
-</div>
-<hr>
-{% endif %}
-
-{% if latest_issue %}
-<div class="row">
- <div class="col-12">
- <div class="panel">
- <h2>Latest issue: Vol. {{ latest_issue.in_volume.number }} issue {{ latest_issue.number }}</h2>
+ <ul class="list-group list-group-flush px-3">
+ {% for paper in current_issue.publication_set.all|dictsort:"paper_nr" %}
+ <li class="list-group-item">
+ {% include 'journals/_publication_card_content.html' with publication=paper %}
+ </li>
+ {% endfor %}
+ </ul>
</div>
</div>
-</div>
-
-<div class="publicationHeaderList">
+ <hr>
+{% elif latest_issue %}
<div class="row">
<div class="col-12">
- {% for paper in latest_issue.publication_set.all|dictsort:"paper_nr" %}
- <div class="card card-publication">
- {% include 'journals/_publication_card_content.html' with publication=paper %}
- </div>
- {% endfor %}
+ <ul class="list-group list-group-flush px-3">
+ {% for paper in latest_issue.publication_set.all|dictsort:"paper_nr" %}
+ <li class="list-group-item">
+ {% include 'journals/_publication_card_content.html' with publication=paper %}
+ </li>
+ {% endfor %}
+ </ul>
</div>
</div>
-</div>
{% endif %}
-
{% include 'journals/scipost_physics_footer.html' %}
-
{% endblock content %}
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index e924f4f07..76780e5c7 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -6,10 +6,10 @@
//
$grid-gutter-width-base: 20px;
$container-max-widths: (
- sm: 768px,
- md: 992px,
- lg: 1200px,
- xl: 1240px
+ sm: 728px,
+ md: 952px,
+ lg: 1160px,
+ xl: 1200px
);
.row {
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index b3f467cd0..965f626f7 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -1,7 +1,6 @@
.banner {
background-color: #002b49;
- line-height: 1.5;
- padding: 10px 20px;
+ padding: 15px 20px;
text-align: center;
border-radius: 1.4px;
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 351f6e47a..d4ac60165 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -45,3 +45,9 @@
.navbar-toggler-icon {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 43, 73, 1.0)");
}
+
+.navbar-secondary {
+ margin-top: -0.75rem;
+ margin-bottom: 1.25rem;
+ background-color: #f8f8f8;
+}
diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss
index 6c6ce87cc..00222fa5a 100644
--- a/scipost/static/scipost/assets/css/_type.scss
+++ b/scipost/static/scipost/assets/css/_type.scss
@@ -21,7 +21,6 @@ h1, h2, h3, h4, h5, h6 {
.highlight {
background-color: #f4f4f4;
- margin: 10px 0;
border-radius: 1.4px;
&.tight {
@@ -36,12 +35,20 @@ h1, h2, h3, h4, h5, h6 {
color: #6884C2;
}
+.highlight,
+.highlight-empty {
+ margin: 10px 0;
+}
+
h1.highlight,
-h2.highlight {
+h1.highlight-empty,
+h2.highlight,
+h2.highlight-empty {
padding: 15px;
}
-h3.highlight {
+h3.highlight,
+h3.highlight-empty {
padding: 10px;
}
diff --git a/scipost/static/scipost/assets/css/scipost-physics.scss b/scipost/static/scipost/assets/css/scipost-physics.scss
new file mode 100644
index 000000000..7f54a7c32
--- /dev/null
+++ b/scipost/static/scipost/assets/css/scipost-physics.scss
@@ -0,0 +1,26 @@
+.journals .navbar-secondary ul.links {
+ background-color: #dddddd;
+ display: block;
+ font-size: 16px;
+ padding: 0px;
+ border-radius: 1.4px;
+ margin-top: 0.5rem;
+ margin-bottom: -1.5rem;
+
+ > li {
+ display: inline-block;
+ margin: 0;
+ padding: 0.5rem 0.25rem;
+
+ a {
+ padding: 0.25rem 1.0rem;
+ border-radius: 1.4px;
+ display: block;
+
+ &.active {
+ border: 1px solid #6885c3;
+ color: #6885c3;
+ }
+ }
+ }
+}
diff --git a/scipost/static/scipost/assets/css/style.scss b/scipost/static/scipost/assets/css/style.scss
index b3b24f61e..1a56e74ef 100644
--- a/scipost/static/scipost/assets/css/style.scss
+++ b/scipost/static/scipost/assets/css/style.scss
@@ -38,9 +38,15 @@
*
*/
@import "general";
-
@import "about";
@import "comments";
@import "journals";
@import "personal_page";
@import "submissions";
+
+
+/**
+ * SciPost Journal styles
+ *
+ */
+ @import "scipost-physics";
diff --git a/scipost/templates/scipost/base.html b/scipost/templates/scipost/base.html
index baa04274b..6848765d4 100644
--- a/scipost/templates/scipost/base.html
+++ b/scipost/templates/scipost/base.html
@@ -25,9 +25,10 @@
{% endblock headsup %}
</head>
- <body>
+ <body class="{% block body_class %}{% endblock %}">
{% include 'scipost/header.html' %}
{% include 'scipost/navbar.html' %}
+ {% block secondary_navbar %}{% endblock secondary_navbar %}
{% include 'scipost/messages.html' %}
--
GitLab