Changeset 38104 for main/trunk/greenstone3/web

Timestamp:

2023-09-12T12:02:26+12:00 (9 months ago)

Author:

kjdon

Message:

in the gs2 interface, the home page defines serviceList template, to override the one in gslib. due to the way the pagexsl and gslibxsl were combined, the gslib template was coming second, and therefore being used. I have made this add gslib elements into the page first, then the page elements, so that the page elements will override the gslib ones

File:

• main/trunk/greenstone3/web/interfaces/core/transform/expand-gslib.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/core/transform/expand-gslib.xsl

@@ -41 +41 @@
     </xsl:for-each>
     
-    <xsl:call-template name="expand_gslib_elements" />
-    
     <!-- add content of gslib to the page stylesheet -->
     <xsl:for-each select="/pageAndGslibXsl/gslibXsl/xsl:stylesheet">
       <xsl:call-template name="expand_gslib_elements" />
     </xsl:for-each>
-    
+
+        <!-- now add all the page elements, so that they come *AFTER* the 
+gslib ones -->
+    <xsl:call-template name="expand_gslib_elements" />
       </xsl:for-each>
     </xslt:stylesheet>