Changeset 32601 for main/trunk

Timestamp:

2018-11-14T10:02:08+13:00 (5 years ago)

Author:

davidb

Message:

Introduction of double-quote gsf element to make writing JS within XSLT less cumbersome to write

File:

• main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl (modified) (2 diffs)

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

@@ -127 +127 @@
         </xsl:for-each>
             <xsl:apply-templates/>
-        <xslt:value-of select="''" />
+        <xslt:value-of select="''" /> <!-- to ensure that the div tag does not collapse into one of the form <div/> -->
       </div>
     </xsl:template>
 
+    <xsl:template match="gsf:dquote"><xslt:text disable-output-escaping="yes">"</xslt:text></xsl:template>
+    <!--
+        While double-quotes do map to entities in HTML, technically single quotes don't need to go through
+        this process: they can just be typed literally, and so this means there isn't strictly a need
+        for the following rule, but included for completeness.  A long time ago it might have been that IE
+        did need the character to be entity-mapped -->
+    <xsl:template match="gsf:squote"><xslt:text disable-output-escaping="yes">'</xslt:text></xsl:template>  
+    
     <xsl:template match="gsf:image">
         <xslt:variable name="metaName">
@@ -334 +342 @@
                 <!-- a document link -->
                 <xslt:variable name="bookswitch">
-                    <xslt:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/>
+                  <xslt:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/>
                 </xslt:variable>
+                  
                 <a>
                         <xsl:if test="@target">