Changeset 36971 for main

Timestamp:

2022-12-06T14:05:46+13:00 (17 months ago)

Author:

kjdon

Message:

for group titles and descriptions, now look for displayItems in preference to <title>, <description> <shortDescription>

File:

• main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

@@ -279 +279 @@
   <xsl:template name="groupName">
     <xsl:param name="path"/>
-    <xsl:value-of select="/page/pageResponse/pathList/group[@path=$path]/title"/>
+    <xsl:variable name="groupElem" select="/page/pageResponse/pathList/group[@path=$path]"/>
+    <xsl:choose>
+      <xsl:when test="$groupElem/displayItem[@name='name']">
+        x<xsl:value-of select="$groupElem/displayItem[@name='name']"/>
+        </xsl:when>
+        <xsl:otherwise>
+          y<xsl:value-of select="$groupElem/title"/>
+        </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
   <xsl:template name="groupDescription">
@@ -292 +300 @@
 
   <xsl:template name="groupLinkWithImage">
-    <xsl:variable name="desc"><xsl:value-of select="description"/></xsl:variable>
+    <xsl:variable name="desc"><xsl:choose><xsl:when test="displayItem[@name='shortDescription']"><xsl:value-of select="displayItem[@name='shortDescription']"/></xsl:when><xsl:otherwise><xsl:value-of select="shortDescription"/></xsl:otherwise></xsl:choose></xsl:variable>
     <xsl:variable name="group_href"><xsl:value-of select="$library_name"/>/group/<xsl:if test="/page/pageRequest/paramList/param[@name='group']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='group']/@value"/>/</xsl:if><xsl:value-of select="@name"/></xsl:variable>
     
@@ -308 +316 @@
           <div class="groupLink ui-corner-all">
             <div class="groupLinkText ui-widget-content ui-corner-top">
-                <xsl:choose>
+              <xsl:choose>
+                            <xsl:when test="displayItem[@name='name']">
+                              <xsl:value-of select="displayItem[@name='name']"/>
+                            </xsl:when>
                     <xsl:when test="boolean(title)">
                         <xsl:value-of select="title"/>