Changeset 30478 for main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

Timestamp:

2016-04-20T22:56:11+12:00 (8 years ago)

Author:

davidb

Message:

Changes in the XSL and JS code to support the new approach taken to client-side XSLT (using Saxon-CE JS library in the browser). Also the reintroduction of the DirectEdit (Seaweed) template. Not on by default but a simple matter to call the re-instated template for projects that would like to make use of it, such as the digital music stand DL collection. Some white-space changes also occured. This was not deliberate, but would have been quite fiddly to tease out from other changes in the file, so consequently left in.

File:

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

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -117 +117 @@
     <!-- If editing, be aware that the Document Basket looks for specific classes that this template bakes in (key points marked with ***) -->
     <xsl:template name="wrapDocumentNodes">
+            <xsl:variable name="nodeID" select="@nodeID"/>
         <a name="{@nodeID}"><xsl:text> </xsl:text></a>
         
@@ -128 +129 @@
                         <xsl:attribute name="src">
                             <xsl:choose>
-                                <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or util:oidIsMatchOrParent(@nodeID, /page/pageResponse/document/@selectedNode)">
+                                <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or util:oidIsMatchOrParent($nodeID, /page/pageResponse/document/@selectedNode)">
                                     <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'collapse_image')"/>
                                 </xsl:when>
@@ -585 +586 @@
                     <xsl:choose>
                         <xsl:when test="not(name())">
-                            <xsl:value-of select="." disable-output-escaping="yes"/>
+                          <xsl:value-of select="." disable-output-escaping="yes"/>
                         </xsl:when>
                         <xsl:when test="name() = 'annotation'">