From 72be1d6733673b4f6d9299da38cc5333507d5710 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 7 Dec 2018 14:39:58 +0100
Subject: [PATCH] ///
---
.../journals/publication_detail.html | 104 +++++++++---------
.../migrations/0004_merge_20181207_1008.py | 16 +++
ontology/templates/ontology/base.html | 2 +-
ontology/templates/ontology/ontology.html | 4 +-
.../migrations/0010_merge_20181207_1008.py | 16 +++
.../static/scipost/assets/css/_general.scss | 4 +-
.../static/scipost/assets/css/_labels.scss | 2 +
scipost/templates/scipost/header.html | 2 +-
.../migrations/0050_merge_20181207_1008.py | 16 +++
.../submissions/submission_topics.html | 35 ++++++
.../submissions/submission_detail.html | 2 +-
11 files changed, 144 insertions(+), 59 deletions(-)
create mode 100644 notifications/migrations/0004_merge_20181207_1008.py
create mode 100644 preprints/migrations/0010_merge_20181207_1008.py
create mode 100644 submissions/migrations/0050_merge_20181207_1008.py
create mode 100644 submissions/templates/partials/submissions/submission_topics.html
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 1ff09c5e7..3c80d5322 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -96,67 +96,67 @@
</div>
</div>
{% endif %}
- <hr/>
+ <hr class="mt-5 mb-4"/>
{% if publication.topics.all or perms.scipost.can_manage_ontology %}
- <div class="card">
- <div class="card-header">
- <a href="{% url 'ontology:ontology' %}">Ontology</a>/<a href="{% url 'ontology:topics' %}">Topics</a>
- </div>
- <div class="card-body">
- <ul class="list-inline mb-0">
- {% for topic in publication.topics.all %}
- <li class="list-inline-item p-1"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'journals:publication_remove_topic' doi_label=publication.doi_label slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</li>
- {% empty %}
- <li class="list-inline-item">No Topic has yet been associated to this Publication</li>
- {% endfor %}
- </ul>
- {% if perms.scipost.can_manage_ontology %}
+ <h3 class="mt-2">Ontology / Topics</h3>
+ See full <a href="{% url 'ontology:ontology' %}">Ontology</a> or <a href="{% url 'ontology:topics' %}">Topics</a> database.
+ <br>
+ <br>
+
+ <div>
+ {% for topic in publication.topics.all %}
+ <span class="label label-secondary"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'journals:publication_remove_topic' doi_label=publication.doi_label slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</span>
+ {% empty %}
+ <div>No Topic has yet been associated to this Publication</div>
+ {% endfor %}
+ </div>
+
+ {% if perms.scipost.can_manage_ontology %}
+
+ <br>
<ul class="list-inline">
<li class="list-inline-item">
- <form class="form-inline" action="{% url 'journals:publication_add_topic' doi_label=publication.doi_label %}" method="post">
- <ul class="list-inline">
- <li class="list-inline-item">Add an existing Topic:</li>
- <li class="list-inline-item">{% csrf_token %}{{ select_topic_form }}</li>
- <li class="list-inline-item"><input class="btn btn-outline-secondary" type="submit" value="Link"></li>
- </ul>
- </form>
+ <form class="form-inline" action="{% url 'journals:publication_add_topic' doi_label=publication.doi_label %}" method="post">
+ <ul class="list-inline">
+ <li class="list-inline-item">Add an existing Topic:</li>
+ <li class="list-inline-item">{% csrf_token %}{{ select_topic_form }}</li>
+ <li class="list-inline-item"><input class="btn btn-outline-secondary" type="submit" value="Link"></li>
+ </ul>
+ </form>
</li>
<li class="list-inline-item p-2">Can't find the Topic you need? <a href="{% url 'ontology:topic_create' %}" target="_blank">Create it</a> (opens in new window)</li>
</ul>
- {% endif %}
- </div>
- </div>
- <br>
- {% endif %}
+ {% endif %}
- <div class="card">
- <div class="card-header">
- Author{{ publication.authors.all|length|pluralize }}/Affiliation{{ affiliations_list|length|pluralize }}: mappings to Contributors and <a href="{% url 'organizations:organizations' %}" target="_blank">Organizations</a>
- </div>
- <div class="card-body">
- <ul class="list-inline m-1">
- {% for author in publication.authors.all %}
- <li class="list-inline-item mr-1">
- {% for aff in affiliations_list %}
- {% if aff in author.affiliations.all %}
- <sup>{{ forloop.counter }} </sup>
- {% endif %}
- {% endfor %}
- {% if author.is_registered %}
- <a href="{{ author.contributor.get_absolute_url }}">{{ author.contributor.user.first_name }} {{ author.contributor.user.last_name }}</a>{% else %}{{ author.unregistered_author.first_name }} {{ author.unregistered_author.last_name }}{% endif %}{% if not forloop.last %},
- {% endif %}
- </li>
- {% endfor %}
- </ul>
+ {% endif %}
- <ul class="list list-unstyled m-2">
- {% for aff in affiliations_list %}
- <li><sup>{{ forloop.counter }}</sup> <a href="{{ aff.get_absolute_url }}">{{ aff.full_name_with_acronym }}</a></li>
- {% endfor %}
- </ul>
- </div>
- </div>
+ <h3 class="mt-4">
+ Author{{ publication.authors.all|length|pluralize }} / Affiliation{{ affiliations_list|length|pluralize }}: mappings to Contributors and Organizations
+ </h3>
+ See all <a href="{% url 'organizations:organizations' %}" target="_blank">Organizations</a>.
+ <br>
+
+ <ul class="list-inline my-2">
+ {% for author in publication.authors.all %}
+ <li class="list-inline-item mr-1">
+ {% for aff in affiliations_list %}
+ {% if aff in author.affiliations.all %}
+ <sup>{{ forloop.counter }} </sup>
+ {% endif %}
+ {% endfor %}
+ {% if author.is_registered %}
+ <a href="{{ author.contributor.get_absolute_url }}">{{ author.contributor.user.first_name }} {{ author.contributor.user.last_name }}</a>{% else %}{{ author.unregistered_author.first_name }} {{ author.unregistered_author.last_name }}{% endif %}{% if not forloop.last %},
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+
+ <ul class="list list-unstyled my-2 mx-3">
+ {% for aff in affiliations_list %}
+ <li><sup>{{ forloop.counter }}</sup> <a href="{{ aff.get_absolute_url }}">{{ aff.full_name_with_acronym }}</a></li>
+ {% endfor %}
+ </ul>
{% if publication.get_all_funders %}
<div class="card">
diff --git a/notifications/migrations/0004_merge_20181207_1008.py b/notifications/migrations/0004_merge_20181207_1008.py
new file mode 100644
index 000000000..354bbc873
--- /dev/null
+++ b/notifications/migrations/0004_merge_20181207_1008.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-12-07 09:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('notifications', '0002_notification_url_code'),
+ ('notifications', '0003_notification_url_code'),
+ ]
+
+ operations = [
+ ]
diff --git a/ontology/templates/ontology/base.html b/ontology/templates/ontology/base.html
index a3e8e4173..55ce8fa41 100644
--- a/ontology/templates/ontology/base.html
+++ b/ontology/templates/ontology/base.html
@@ -1,7 +1,7 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <div class="container-outside header">
+ <div class="breadcrumb-container">
<div class="container">
<nav class="breadcrumb hidden-sm-down">
{% block breadcrumb_items %}
diff --git a/ontology/templates/ontology/ontology.html b/ontology/templates/ontology/ontology.html
index 4f78199e0..49096ef6c 100644
--- a/ontology/templates/ontology/ontology.html
+++ b/ontology/templates/ontology/ontology.html
@@ -3,8 +3,8 @@
{% block pagetitle %}: Ontology{% endblock pagetitle %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Welcome</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Welcome</span>
{% endblock %}
{% block content %}
diff --git a/preprints/migrations/0010_merge_20181207_1008.py b/preprints/migrations/0010_merge_20181207_1008.py
new file mode 100644
index 000000000..3b60e6cdc
--- /dev/null
+++ b/preprints/migrations/0010_merge_20181207_1008.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-12-07 09:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('preprints', '0009_merge_20180915_1337'),
+ ('preprints', '0009_auto_20181123_1000'),
+ ]
+
+ operations = [
+ ]
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index ee17d2151..9acf59de0 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -58,7 +58,7 @@ header {
img {
padding: 0;
- margin: .75rem 0rem .25rem;
+ margin: .65rem 0rem .25rem;
}
p {
@@ -114,7 +114,7 @@ header {
@media screen and (min-width: 768px) {
header {
img {
- margin: 1rem 0.5rem;
+ margin: .75rem 0.5rem;
}
}
}
diff --git a/scipost/static/scipost/assets/css/_labels.scss b/scipost/static/scipost/assets/css/_labels.scss
index 21a4fa5c5..5d5a41080 100644
--- a/scipost/static/scipost/assets/css/_labels.scss
+++ b/scipost/static/scipost/assets/css/_labels.scss
@@ -62,6 +62,8 @@ $label-transition: all .2s ease-in-out !default;
white-space: nowrap;
vertical-align: middle;
user-select: none;
+ margin-right: 3px;
+ margin-bottom: 3px;
// cursor: default;
border: $label-border-width solid transparent;
box-shadow: $label-box-shadow;
diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html
index e7cb64b6e..45650f3d0 100644
--- a/scipost/templates/scipost/header.html
+++ b/scipost/templates/scipost/header.html
@@ -5,7 +5,7 @@
<div class="container">
<div class="d-md-flex justify-content-between">
<div class="logobox">
- <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="160" /></a>
+ <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="180" /></a>
</div>
<ul class="navbar-nav">
diff --git a/submissions/migrations/0050_merge_20181207_1008.py b/submissions/migrations/0050_merge_20181207_1008.py
new file mode 100644
index 000000000..5e58ef5c8
--- /dev/null
+++ b/submissions/migrations/0050_merge_20181207_1008.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-12-07 09:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0039_auto_20181011_0746'),
+ ('submissions', '0049_auto_20181204_2040'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/templates/partials/submissions/submission_topics.html b/submissions/templates/partials/submissions/submission_topics.html
new file mode 100644
index 000000000..6f4d50c6d
--- /dev/null
+++ b/submissions/templates/partials/submissions/submission_topics.html
@@ -0,0 +1,35 @@
+{% load user_groups %}
+
+{% is_scipost_admin request.user as is_scipost_admin %}
+{% is_edcol_admin request.user as is_edcol_admin %}
+
+{% if submission.topics.all or is_scipost_admin or is_edcol_admin %}
+ <h3 class="mt-4">Ontology / Topics</h3>
+ See full <a href="{% url 'ontology:ontology' %}">Ontology</a> or <a href="{% url 'ontology:topics' %}">Topics</a> database.
+ <br>
+ <br>
+
+ <div>
+ {% for topic in submission.topics.all %}
+ <span class="label label-secondary"><a href="{% url 'ontology:topic_details' slug=topic.slug %}">{{ topic }}</a>{% if perms.scipost.can_manage_ontology %} <a href="{% url 'submissions:submission_remove_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr slug=topic.slug %}"><i class="fa fa-times-circle text-danger"></i></a>{% endif %}</span>
+ {% empty %}
+ <div>No Topic has yet been associated to this Submission</div>
+ {% endfor %}
+ </div>
+ {% if perms.scipost.can_manage_ontology %}
+
+ <br>
+ <ul class="list-inline">
+ <li class="list-inline-item">
+ <form class="form-inline" action="{% url 'submissions:submission_add_topic' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}" method="post">
+ <ul class="list-inline">
+ <li class="list-inline-item">Add an existing Topic:</li>
+ <li class="list-inline-item">{% csrf_token %}{{ select_topic_form }}</li>
+ <li class="list-inline-item"><input class="btn btn-outline-secondary" type="submit" value="Link"></li>
+ </ul>
+ </form>
+ </li>
+ <li class="list-inline-item p-2">Can't find the Topic you need? <a href="{% url 'ontology:topic_create' %}" target="_blank">Create it</a> (opens in new window)</li>
+ </ul>
+ {% endif %}
+{% endif %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 4519fd1c8..fbd21cc19 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -89,8 +89,8 @@
{% include 'partials/submissions/submission_status.html' with submission=submission %}
+ {% include 'partials/submissions/submission_topics.html' with submission=submission %}
<br/>
- {% include 'partials/submissions/submission_topics_card.html' with submission=submission %}
{% if submission.author_comments %}
<h3>Author comments upon resubmission</h3>
--
GitLab