From cbae0608c1c9e1a71df938d65ed29f715c733e21 Mon Sep 17 00:00:00 2001
From: Joeli Takala <joeli.takala@helsinki.fi>
Date: Thu, 21 Sep 2023 20:06:26 +0300
Subject: [PATCH] Fixed bugs in the twig template logic

---
 src/view/search-results.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/view/search-results.inc b/src/view/search-results.inc
index 9e099dd3c..c7bd962b0 100644
--- a/src/view/search-results.inc
+++ b/src/view/search-results.inc
@@ -57,8 +57,8 @@
           {%- if propval.label %}
             {%~ if propval.exvocab and propval.exvocab != propval.vocab ~%}{# if the property is located in a another vocabulary #}
         <span class="versal value">{{ propval.label }}</span>
-            {%- else  %}<span class="versal kolmas value">{{ propval.label(request.contentLang) }}</span>{%  endif -%}
-          {%- if propval.lang and (propval.lang != request.lang) or explicit_langcodes %}<span class="versal"> ({{ propval.lang }})</span>{% endif -%}{%- if not loop.last %}<span class="versal">,</span>{% endif -%}
+            {%- else  %}<span class="versal value">{{ propval.label(request.contentLang) }}</span>{%  endif -%}
+          {%- if propval.lang and (propval.lang != request.lang) or explicit_langcodes %}<span class="versal"> ({{ propval.lang }})</span>{% endif -%}{%- if not loop.last %}<span class="versal">, </span>{% endif -%}
         {% endif -%}
         {%- else %} {# Literals (no URI), eg. alternative labels as properties #}
         <span class="versal {%~ if propval.type == 'skos:altLabel' %}replaced {% endif ~%} value">{{ propval.label }}{%~ if not loop.last ~%},{%~ endif ~%}</span>
@@ -90,11 +90,11 @@
         <span class="property-click skosmos-tooltip-wrapper skosmos-tooltip t-top" data-title="{{ property.type }}">
           <i class="property-hover fa-solid fa-globe"></i>
         </span>
-        <div class="property-values">
+        <span class="property-values">
           {%~ for propval in property.values ~%} {# loop through ConceptMappingPropertyValue objects #}
           {%~ if propval.exVocab ~%}<span class="redirected-vocab-id prefLabel">{{ propval.exVocab.shortName }}: </span>{%~ endif ~%}<span class="versal value">{{ propval.label(request.contentLang) }}</span>{%~ if propval.label(request.contentLang).lang != request.contentLang ~%}<span class="versal value"> ({{ propval.label(request.contentLang).lang }})</span>{%~ endif ~%}{%~ if loop.last == false ~%}<span class="versal">, </span>{%~ endif ~%}
           {%~ endfor ~%}
-        </div>
+        </span>
       </li>
       {%~ endif ~%}
     {%~ endfor ~%}
@@ -109,6 +109,7 @@
       <span class="property-values">
       {%~ for propval in property.values ~%} {# loop through ConceptPropertyValue objects #}
         <span class="versal value">{{ propval.label }}</span>
+        {%- if loop.last == false %}<span class="versal">, </span>{% endif -%}
       {%~ endfor ~%}
       </span>
     </li>