Merge branch 'master' of https://git.library.upei.ca/rdrew/olivesbooks

templates/views/views-view-fields--solr-search-content.html.twig

@@ -1,13 +1,14 @@
 <div class="grid-item">
-  {% for field in fields -%}
+{% for field in fields -%}
+  {%- set rendered = field.content|render -%}
+  {%- if rendered|striptags|trim is not empty or rendered|striptags('<img>')|trim is not empty -%}
     {{ field.separator }}
     {%- if field.wrapper_element -%}
       <{{ field.wrapper_element }}{{ field.wrapper_attributes }}>
     {%- endif %}
     {%- if field.label -%}
       {%- if field.label_element -%}
-    <{{ field.label_element }}{{ field.label_attributes }}>{{ field.label }}{{ field.label_suffix }}</{{
+        <{{ field.label_element }}{{ field.label_attributes }}>{{ field.label }}{{ field.label_suffix }}</{{ field.label_element }}>
-      field.label_element }}>
       {%- else -%}
         {{ field.label }}{{ field.label_suffix }}
       {%- endif %}
@@ -20,5 +21,6 @@
     {%- if field.wrapper_element -%}
       </{{ field.wrapper_element }}>
     {%- endif %}
-  {%- endfor %}
+  {%- endif %}
+{%- endfor %}
 </div>