Merge branch 'master' into development

journals/migrations/0007_auto_20180129_1814.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-01-29 17:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journals', '0006_merge_20180123_2040'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reference',
+            name='vor',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='reference',
+            name='vor_url',
+            field=models.URLField(blank=True),
+        ),
+    ]

journals/models.py

@@ -335,8 +335,8 @@ class Reference(models.Model):
     title = models.CharField(max_length=512)
     citation = models.CharField(max_length=512, blank=True)
 
-    vor = models.CharField(max_length=128)
-    vor_url = models.URLField()
+    vor = models.CharField(blank=True, max_length=128)
+    vor_url = models.URLField(blank=True)
 
     class Meta:
         unique_together = ('reference_number', 'publication')

journals/templates/journals/publication_detail.html

@@ -90,11 +90,13 @@
                 {% endfor %}
             </ul>
 
-            {% include 'partials/journals/references.html' with publication=publication %}
+
 
             {% if is_edcol_admin %}
                 {# This function is not available for public yet! #}
                 <em>The following is not available for the public yet:</em>
+                {% include 'partials/journals/references.html' with publication=publication %}
+                
                 {% if publication.funders_generic.exists %}
                     <h3>Funder{{ publication.funders_generic.count|pluralize }} for this publication:</h3>
                     <ul>

journals/templates/partials/journals/references.html

@@ -7,7 +7,11 @@
                 <span class="counter">[{{ reference.reference_number }}]</span>
                 <span class="authors">{{ reference.authors }}</span>,
                 <span class="title">{{ reference.title }}</span>{% if reference.citation %}, <span class="citation">{{ reference.citation|safe }}</span>{% endif %}
-                <span class="doi">doi: <a href="{{ reference.vor_url }}" target="_blank">{{ reference.vor }}</a></span>
+                {% if reference.vor_url and reference.vor %}
+                    <span class="doi">doi: <a href="{{ reference.vor_url }}" target="_blank">{{ reference.vor }}</a></span>
+                {% elif reference.vor_url %}
+                    <span class="doi"><a href="{{ reference.vor_url }}" target="_blank">link</a></span>
+                {% endif %}
             </li>
         {% endfor %}
     </ul>

scipost/static/scipost/assets/css/_list_group.scss

@@ -42,6 +42,6 @@ ul.references {
     }
     .doi {
         display: block;
-        margin: 0 0 0.2rem 1.5rem;
+        margin: 0 0 0.2rem 2rem;
     }
 }

scipost/static/scipost/assets/js/dynamic_loading.js

@@ -22,7 +22,7 @@ function dynamic_load_tab( target_tab ) {
 
 $(function(){
     // Change `tab` GET parameter for page-reload
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+    $('.tab-nav-container.dynamic a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         dynamic_load_tab( e.target )
     })
     $('[data-toggle="tab"][sp-autoload="true"]').tab('show');

scipost/templates/scipost/personal_page.html

@@ -40,7 +40,7 @@
 
         <div class="row">
             <div class="col-12">
-                <div class="tab-nav-container">
+                <div class="tab-nav-container dynamic">
                     <div class="tab-nav-inner">
                         <!-- Nav tabs -->
                         <ul class="nav btn-group personal-page-nav" role="tablist">