[Phpgroupware-cvs] property/skins/default/invoice.xsl, 1.1.1.6

[nomail]

Update of /property/skins/default
Modified Files:
        Branch: 
          invoice.xsl

date: 2004/04/26 18:52:25;  author: sigurdne;  state: Exp;  lines: +15 -13

Log Message:
no message
=====================================================================
Index: property/skins/default/invoice.xsl
diff -u property/skins/default/invoice.xsl:1.1.1.5 
property/skins/default/invoice.xsl:1.1.1.6
--- property/skins/default/invoice.xsl:1.1.1.5  Mon Apr 26 17:01:37 2004
+++ property/skins/default/invoice.xsl  Mon Apr 26 18:52:25 2004
@@ -518,6 +518,17 @@
        </xsl:template>
 
 
+       <xsl:template match="cal_info">
+               <xsl:variable name="stylesheet"><xsl:value-of 
select="stylesheet"/></xsl:variable>
+               <xsl:variable name="stylesheet_title"><xsl:value-of 
select="stylesheet_title"/></xsl:variable>
+               <xsl:variable name="calendar_source"><xsl:value-of 
select="calendar_source"/></xsl:variable>
+               <xsl:variable name="calendar_setup_source"><xsl:value-of 
select="calendar_setup_source"/></xsl:variable>
+               <xsl:variable name="calendar_lang"><xsl:value-of 
select="calendar_lang"/></xsl:variable>
+               <link rel="stylesheet" type="text/css" media="all" 
href="{$stylesheet}" title="{$stylesheet_title}"/>
+               <script type="text/javascript" 
src="{$calendar_source}"></script>
+               <script type="text/javascript" 
src="{$calendar_setup_source}"></script>
+               <script type="text/javascript" src="{$calendar_lang}"></script>
+       </xsl:template>
 
 <!-- list_voucher_paid -->
 
@@ -537,6 +548,7 @@
                                Window1=window.open('<xsl:value-of 
select="property_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
                        }               
                </script>
+               <xsl:apply-templates select="cal_info"/>
 
                <xsl:call-template name="menu"/> 
                <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
@@ -809,6 +821,7 @@
                                Window1=window.open('<xsl:value-of 
select="property_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
                        }               
                </script>
+               <xsl:apply-templates select="cal_info"/>
 
                <xsl:call-template name="menu"/> 
                <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
@@ -1214,18 +1227,6 @@
 
 <!-- add / edit -->
 
-       <xsl:template match="cal_info">
-               <xsl:variable name="stylesheet"><xsl:value-of 
select="stylesheet"/></xsl:variable>
-               <xsl:variable name="stylesheet_title"><xsl:value-of 
select="stylesheet_title"/></xsl:variable>
-               <xsl:variable name="calendar_source"><xsl:value-of 
select="calendar_source"/></xsl:variable>
-               <xsl:variable name="calendar_setup_source"><xsl:value-of 
select="calendar_setup_source"/></xsl:variable>
-               <xsl:variable name="calendar_lang"><xsl:value-of 
select="calendar_lang"/></xsl:variable>
-               <link rel="stylesheet" type="text/css" media="all" 
href="{$stylesheet}" title="{$stylesheet_title}"/>
-               <script type="text/javascript" 
src="{$calendar_source}"></script>
-               <script type="text/javascript" 
src="{$calendar_setup_source}"></script>
-               <script type="text/javascript" src="{$calendar_lang}"></script>
-       </xsl:template>
-
 <!-- import -->
 
        <xsl:template match="import">
@@ -1786,6 +1787,7 @@
 <!-- rollback -->
 
        <xsl:template match="rollback">
+               <xsl:apply-templates select="cal_info"/>
                <xsl:call-template name="menu"/> 
                <div align="left">
                <table cellpadding="2" cellspacing="2" width="80%" 
align="center">