Changeset 30478 for main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.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/layouts/header.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -122 +122 @@
 
     <xsl:template name="init-direct-edit">
+             <!-- might be worth moving loading the JS file to earlier, to give time to load  -->
+         <script type="text/javascript" src="interfaces/{$interface_name}/js/direct-edit.js"><xsl:text> </xsl:text></script>    
         <script type="text/javascript">
-            <xsl:text disable-output-escaping="yes">
+          <xsl:text disable-output-escaping="yes">
+            $(document).ready(function() {          
                 de.onready(function() 
                 {
@@ -135 +138 @@
                     }
                 });
+             });                        
             </xsl:text>
         </script>
@@ -508 +512 @@
                             <nobr>
                                 <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='query']">
-                                    <xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs, /page/@lang)"/>
+<!--
+    <xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs, /page/@lang)"/>
+    -->
+                                  <xsl:with-param name="default" select="normalize-space($qs)"/>
+                                  
                                 </xsl:apply-templates>
                             </nobr>