fix #304 (don't output info into HTML) and suppress "Description:" if…

… info not present
clarin-eric · Jun 26, 2024 · 54affe5 · 54affe5
1 parent 029a55f
commit 54affe5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/SIS/clarin/modules/centre.xql b/SIS/clarin/modules/centre.xql
@@ -175,15 +175,17 @@ declare function cm:get-centre-info($id, $lang) {
         cm:get-default-info($id)
 
     return
-        cm:parseFormatRef($info)
+        cm:parseFormatRef($info, $id)
 };
 
-declare function cm:parseFormatRef($info) {
+declare function cm:parseFormatRef($info,$id) {
     if ($info)
     then
         (
-        element info {
+        element span {
             $info/@*,
+            attribute {"id"} {concat("desctext",$id)},
+            attribute {"class"} {"desctext"},
             for $node in $info/node()
             return
                 if ($node/self::p)

diff --git a/SIS/clarin/views/view-centre.xq b/SIS/clarin/views/view-centre.xq
@@ -136,11 +136,11 @@ else
                                 else ()
                             }
                             {
-                                if ($centre-info)
+                                if ($centre-info/*)
                                 then
                                     <div>
                                         <span class="heading">Description: </span>
-                                        <span id="desctext{$id}" class="desctext">{$centre-info}</span>
+                                        {$centre-info}
                                     </div>
                                 else
                                     ()