Merge branch 'bnewbold-refs-apis'

1 files changed, 14 insertions, 13 deletions

diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index abf7ace0..4652f4a2 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -84,9 +84,9 @@
     Published
     {% if release.container.ident %}
       in <a href="/container/{{ release.container.ident }}"><span itemprop="name">{{ release.container.name }}</span></a>
-    {% elif release.extra and release.extra.container_name %}
+    {%- elif release.extra and release.extra.container_name %}
       in <span itemprop="name">{{ release.extra.container_name }}</span>
-    {% endif %}
+    {%- endif %}
   {% else %}
     Released
     {% if release.release_type %}
@@ -95,26 +95,27 @@
     {% if release.container %}
       in <a href="/container/{{ release.container.ident }}"><span itemprop="name">{{ release.container.name }}</span></a>
     {% endif %}
-  {% endif %}
+  {% endif -%}
   {% if release.publisher %}
     by <span itemprop="publisher">{{ release.publisher }}</span>
   {%- endif %}.
 
   <p>
-  {% if release.volume != None %}
-    Volume {{ release.volume }}
-    {%- if release.issue != None %}, {% endif %}
-  {% endif %}
-  {% if release.issue != None %}
-    Issue {{ release.issue}}
+  {% set comma = joiner(", ") %}
+  {% if release.release_year != None %}
+    {{ release.release_year }} &nbsp;
   {% endif %}
-  {% if release.pages != None %}
+  {% if release.volume != None %}
+    {{- comma() }}Volume {{ release.volume -}}
+  {%- endif %}
+  {%- if release.issue != None %}
+    {{- comma() }}Issue {{ release.issue -}}
+  {%- endif %}
+  {%- if release.pages != None %}
+    {{- comma() }}
     {% if release.pages[0].isdigit() %}p{% endif -%}
     {{ release.pages }}
   {% endif %}
-  {% if release.release_year != None %}
-    ({{ release.release_year }})
-  {% endif %}
 </div>
 
 {% if release.abstracts != [] %}