[Fmsystem-commits] [10040] logistic: java_lang

[Sigurd Nes]

Revision: 10040
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10040
Author:   sigurdne
Date:     2012-09-27 09:49:30 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
logistic: java_lang

Modified Paths:
--------------
    trunk/logistic/templates/base/datatable.xsl
    trunk/phpgwapi/templates/base/datatable_common.xsl

Modified: trunk/logistic/templates/base/datatable.xsl
===================================================================
--- trunk/logistic/templates/base/datatable.xsl 2012-09-27 09:07:12 UTC (rev 
10039)
+++ trunk/logistic/templates/base/datatable.xsl 2012-09-27 09:49:30 UTC (rev 
10040)
@@ -284,5 +284,10 @@
                        </xsl:otherwise>        
                </xsl:choose>
 -->
+               <xsl:choose>
+                       <xsl:when test="//js_lang != ''">
+                               var lang = <xsl:value-of select="//js_lang"/>;
+                       </xsl:when>
+               </xsl:choose>
        </script>
 </xsl:template>

Modified: trunk/phpgwapi/templates/base/datatable_common.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_common.xsl  2012-09-27 09:07:12 UTC 
(rev 10039)
+++ trunk/phpgwapi/templates/base/datatable_common.xsl  2012-09-27 09:49:30 UTC 
(rev 10040)
@@ -16,14 +16,6 @@
 </func:function>
 
 <xsl:template match="data">
-       <xsl:choose>
-               <xsl:when test="js_lang != ''">
-                       <script>
-                               var lang = <xsl:value-of select="js_lang"/>;
-                       </script>
-               </xsl:when>
-       </xsl:choose>
-
        <iframe id="yui-history-iframe" 
src="phpgwapi/js/yahoo/history/assets/blank.html" 
style="position:absolute;top:0; left:0;width:1px; 
height:1px;visibility:hidden;"></iframe>
        <input id="yui-history-field" type="hidden"/>
        <xsl:call-template name="yui_phpgw_i18n"/>
@@ -276,5 +268,12 @@
                                </xsl:for-each>
                        ];
                }
+
+               <xsl:choose>
+                       <xsl:when test="//js_lang != ''">
+                               var lang = <xsl:value-of select="//js_lang"/>;
+                       </xsl:when>
+               </xsl:choose>
+
        </script>
 </xsl:template>