Changeset 25398 for main/trunk/greenstone3/web/interfaces

Timestamp:

2012-04-17T19:57:53+12:00 (12 years ago)

Author:

ak19

Message:

gslib:langfrag used directly in document.xsl and documentbasket.xsl which used to call the document-editor-language-fragments template before, which itself then called gslib:langfrag. However, since gslib statements are expanded only once by TransformingReceptionist.java, the 2 document xsl files in the pages folder call gslib:langfrag directly now.

Location:

main/trunk/greenstone3/web/interfaces/oran/transform

Files:

• layouts/header.xsl (modified) (1 diff)
• pages/document.xsl (modified) (1 diff)
• pages/documentbasket.xsl (modified) (1 diff)
• util.xsl (modified) (1 diff)

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

@@ -404 +404 @@
     </xsl:template>
 
-    <!-- gslib:langfrag should get expanded in ../util.xsl -->
+    <!-- document-editor-language-fragments is no longer called from anywhere (document.xsl and documentbasket.xsl 
+         use to call it), since all the xsl pages wishing to make use of doc-editor-lang-fragments now directly 
+         call gslib:langfrag which is defined in ../util.xsl -->
     <xsl:template name="document-editor-language-fragments">
       <!--<gslib:langfrag name="dse"/>-->

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

@@ -349 +349 @@
             </td>
         </tr></table>
-        <xsl:call-template name="document-editor-language-fragments"/>
+        <gslib:langfrag name="dse"/><!--<xsl:call-template name="document-editor-language-fragments"/>-->
     </xsl:template>
     

main/trunk/greenstone3/web/interfaces/oran/transform/pages/documentbasket.xsl

@@ -36 +36 @@
             </xsl:for-each>
             
-            <xsl:call-template name="document-editor-language-fragments"/>
+            <gslib:langfrag name="dse"/><!--<xsl:call-template name="document-editor-language-fragments"/>-->
         </xsl:if>
     </xsl:template>

main/trunk/greenstone3/web/interfaces/oran/transform/util.xsl

@@ -678 +678 @@
   </xsl:template>
 
-  <!-- call function with the name prefix (e.g. dse) -->
+
+  <!-- This next template expands gslib:langfrag.
+       When debugging with o=skinandlibdoc, it's seen that <gslib:langfrag name='dse' /> gets expanded to:
+       <xsl:call-template name="langfrag">
+     <xsl:with-param name="name">dse</xsl:with-param>
+       </xsl:call-template>
+       Before the param can be used in this template, need to retrieve it by name with <xsl:param/>
+       as explained in http://www.maconstateit.net/tutorials/XML/XML05/xml05-05.aspx
+       -->
   <xsl:template name="langfrag">
-    <script type="text/javascript">      
-      <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, @name)"/>
+    <xsl:param name="name"/>
+    <script type="text/javascript">
+      <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceStringsAsJavascript($interface_name, /page/@lang, $name)"/>
     </script>
   </xsl:template>