Tidy up publication template for missing fields

_includes/publication-venue.html

-{% if entry.jorurnal %}{{ entry.journal }}{% elsif entry.booktitle %}{{ entry.booktitle }}{% elsif entry.institution %}{{ entry.institution }}{% elsif entry.school %}{{ entry.school }}{% endif %}
+{% if include.entry.jorurnal %}{{ include.entry.journal }}{% elsif include.entry.booktitle %}{{ include.entry.booktitle }}{% elsif include.entry.institution %}{{ include.entry.institution }}{% elsif include.entry.school %}{{ include.entry.school }}{% endif %}

_layouts/publication-entry.html

@@ -4,5 +4,5 @@
 </div>
 <p class="pub-title h4"><a href="{{ details }}">{{ entry.title }}</a></p>
 <p class="pub-authors">{% include publication-authors.html authors=entry.author_array %}</p>
-<p class="pub-venue">{% include publication-venue.html %}</p>
+<p class="pub-venue">{% include publication-venue.html entry=entry %}</p>
 

_layouts/publication.html

@@ -7,16 +7,16 @@ menu: false
     <div class="card">
       <div class="card-block">
         <h5 class="card-title">Venue</h5>
-        <p class="card-text">{{ page.entry.booktitle }}</p>
+        <p class="card-text">{% include publication-venue.html entry=page.entry %}</p>
         <h5 class="card-title">Publication Year</h5>
         <p class="card-text">{{ page.entry.year }}</p>
-        <h5 class="card-title">Keywords</h5>
-        <p class="card-text">{{ page.entry.keywords }}</p>
-        <h5 class="card-title">Identifiers</h5>
+        {% if page.entry.keywords %}<h5 class="card-title">Keywords</h5>
+        <p class="card-text">{{ page.entry.keywords }}</p>{% endif %}
+        {% if page.entry.doi or page.entry.isbn %}<h5 class="card-title">Identifiers</h5>
         <ul class="site-card-list">
-          <li>DOI: <a href="http://dx.doi.org/{{ page.entry.doi }}">{{ page.entry.doi }}</a></li>
-          <li>ISBN: {{ page.entry.isbn }}</li>
-        </ul>
+          {% if page.entry.doi %}<li>DOI: <a href="http://dx.doi.org/{{ page.entry.doi }}">{{ page.entry.doi }}</a></li>{% endif %}
+          {% if page.entry.isbn %}<li>ISBN: {{ page.entry.isbn }}</li>{% endif %}
+        </ul>{% endif %}
       </div>
     </div>
   </div>
@@ -32,11 +32,16 @@ menu: false
     {% endif %}
 
     <h3>Full Text</h3>
-    <p>{{ page.entry.numpages }} pages</p>
+    {% if page.entry.numpages %}<p>{{ page.entry.numpages }} pages</p>{% endif %}
+    {% if page.entry.doi or page.link %}
     <ul class="fa-ul">
       {% if page.link %}<li><a href="{{ page.link }}"><i class="fa fa-li fa-file-text-o"></i>Authors' Preprint</a></li>{% endif %}
-      <li><a href="http://dx.doi.org/{{ page.entry.doi }}"><i class="fa fa-li fa-external-link"></i>Published Edition</a></li>
+      {% if page.entry.doi %}<li><a href="http://dx.doi.org/{{ page.entry.doi }}"><i class="fa fa-li
+      fa-external-link"></i>Published Edition</a></li>{% endif %}
     </ul>
+    {% else %}
+    <p>Available on request</p>
+    {% endif %}
 
     {% comment %}
     <h3>Supplementary Material</h3>