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

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

@@ -1,24 +1,26 @@
 <div class="grid-item">
-  {% for field in fields -%}
+{% for field in fields -%}
-  {{ field.separator }}
+  {%- set rendered = field.content|render -%}
-  {%- if field.wrapper_element -%}
+  {%- if rendered|striptags|trim is not empty or rendered|striptags('<img>')|trim is not empty -%}
-  <{{ field.wrapper_element }}{{ field.wrapper_attributes }}>
+    {{ field.separator }}
+    {%- if field.wrapper_element -%}
+      <{{ field.wrapper_element }}{{ field.wrapper_attributes }}>
     {%- endif %}
     {%- if field.label -%}
-    {%- if field.label_element -%}
+      {%- 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 -%}
-    {%- else -%}
+        {{ field.label }}{{ field.label_suffix }}
-    {{ field.label }}{{ field.label_suffix }}
+      {%- endif %}
-    {%- endif %}
     {%- endif %}
     {%- if field.element_type -%}
-    <{{ field.element_type }}{{ field.element_attributes }}>{{ field.content }}</{{ field.element_type }}>
+      <{{ field.element_type }}{{ field.element_attributes }}>{{ field.content }}</{{ field.element_type }}>
     {%- else -%}
-    {{ field.content }}
+      {{ field.content }}
     {%- endif %}
     {%- if field.wrapper_element -%}
-  </{{ field.wrapper_element }}>
+      </{{ field.wrapper_element }}>
+    {%- endif %}
   {%- endif %}
-  {%- endfor %}
+{%- endfor %}
 </div>