[Fmsystem-commits] [12750] Property: fix ie form

[Sigurd Nes]

Revision: 12750
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12750
Author:   sigurdne
Date:     2015-02-16 09:23:43 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Property: fix ie form

Modified Paths:
--------------
    trunk/property/inc/class.uiXport.inc.php
    trunk/property/templates/base/invoice.xsl

Modified: trunk/property/inc/class.uiXport.inc.php
===================================================================
--- trunk/property/inc/class.uiXport.inc.php    2015-02-13 23:33:12 UTC (rev 
12749)
+++ trunk/property/inc/class.uiXport.inc.php    2015-02-16 09:23:43 UTC (rev 
12750)
@@ -543,6 +543,7 @@
                                'lang_submit'                    => 
lang('Submit'),
                                'lang_cancel'                    => 
lang('Cancel'),
                                'form_action'                    => 
$GLOBALS['phpgw']->link('/index.php', $link_data),
+                               'cancel_action'                  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice.index')),
                                'lang_save'                              => 
lang('save')
                        );
 

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2015-02-13 23:33:12 UTC (rev 
12749)
+++ trunk/property/templates/base/invoice.xsl   2015-02-16 09:23:43 UTC (rev 
12750)
@@ -1146,20 +1146,20 @@
 <xsl:template match="export">
        <xsl:apply-templates select="menu"/>
        <div align="left">
-               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="form_action">
-                               <xsl:value-of select="form_action"/>
-                       </xsl:variable>
-                       <form method="post" name="form" action="{$form_action}">
+               <xsl:variable name="form_action">
+                       <xsl:value-of select="form_action"/>
+               </xsl:variable>
+               <form method="post" name="form" action="{$form_action}">
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <xsl:choose>
+                                       <xsl:when test="msgbox_data != ''">
+                                               <tr>
+                                                       <td align="left" 
colspan="3">
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
                                <tr>
                                        <td valign="top">
                                                <xsl:value-of 
select="lang_select_conv"/>
@@ -1215,17 +1215,13 @@
                                                </input>
                                        </td>
                                </tr>
-                       </form>
+                       </table>
+               </form>
+               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                        <tr>
                                <td>
-                                       <xsl:variable name="cancel_action">
-                                               <xsl:value-of 
select="cancel_action"/>
-                                       </xsl:variable>
-                                       <xsl:variable name="lang_cancel">
-                                               <xsl:value-of 
select="lang_cancel"/>
-                                       </xsl:variable>
-                                       <form method="post" 
action="{$cancel_action}">
-                                               <input type="submit" 
name="done" value="{$lang_cancel}">
+                                       <form method="post" 
action="{cancel_action}">
+                                               <input type="submit" 
name="done" value="{lang_cancel}">
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="lang_cancel_statustext"/>
                                                        </xsl:attribute>