[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7124] property: send/close button on send order
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7124] property: send/close button on send order |
|
Date: |
Tue, 15 Mar 2011 10:30:02 +0000 |
Revision: 7124
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7124
Author: sigurdne
Date: 2011-03-15 10:30:00 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
property: send/close button on send order
Modified Paths:
--------------
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/wo_hour.xsl
Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php 2011-03-15 09:56:56 UTC (rev
7123)
+++ trunk/property/inc/class.uiwo_hour.inc.php 2011-03-15 10:30:00 UTC (rev
7124)
@@ -1180,11 +1180,16 @@
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
}
+ $workorder_id = phpgw::get_var('workorder_id'); // in
case of bigint
+ if( phpgw::get_var('done', 'bool') )
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.index', 'workorder_id'=> $workorder_id));
+ }
+
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'files'));
$show_cost = phpgw::get_var('show_cost',
'bool');
$show_details = true;//phpgw::get_var('show_details',
'bool');
- $workorder_id = phpgw::get_var('workorder_id'); // in
case of bigint
$to_email = phpgw::get_var('to_email',
'email');
$update_email = phpgw::get_var('update_email',
'bool');
$send_order = phpgw::get_var('send_order',
'bool');
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2011-03-15 09:56:56 UTC (rev 7123)
+++ trunk/property/setup/phpgw_no.lang 2011-03-15 10:30:00 UTC (rev 7124)
@@ -204,13 +204,13 @@
auto tax property no Auto MVA
b_account property no Budsjett konto
back to admin property no Tilbake til Admin
-back to calculation property no Tilbake til kalkulsajon
+back to calculation property no Tilbake til kalkulasjon
back to entity property no Returner til entitet
back to investment list property no Tilbake til liste over
investeringer
back to list property no Tilbake til liste
back to the list property no Tilbake til liste
-back to the ticket list property no Tilbake til meldings
liste uten å lagre
-back to the workorder list property no Tilbake til bestilling
liste
+back to the ticket list property no Tilbake til
meldingsliste uten å lagre
+back to the workorder list property no Tilbake til
bestillingsliste
base property no Grunnlag
base description property no Beskrivelse av grunnlag
basis property no Basis
Modified: trunk/property/templates/base/wo_hour.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.xsl 2011-03-15 09:56:56 UTC (rev
7123)
+++ trunk/property/templates/base/wo_hour.xsl 2011-03-15 10:30:00 UTC (rev
7124)
@@ -382,7 +382,20 @@
</tr>
<xsl:choose>
<xsl:when test="table_send !=''">
-
<tr><td><xsl:apply-templates select="table_send"/></td></tr>
+
<tr>
+
<td colspan='2'>
+
<input type="submit" name="send_order"
value="{table_send/lang_send_order}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="table_send/lang_send_order_statustext"/>
+
</xsl:attribute>
+
</input>
+
<input type="submit" name="done"
value="{table_done/lang_done}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="table_done/lang_done_statustext"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
</tr>
</xsl:when>
</xsl:choose>
@@ -545,16 +558,24 @@
</tr>
<xsl:choose>
<xsl:when test="table_send !=''">
- <tr><td><xsl:apply-templates
select="table_send"/></td></tr>
+ <tr>
+ <td colspan='2'>
+ <input type="submit" name="send_order"
value="{table_send/lang_send_order}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_send/lang_send_order_statustext"/>
+ </xsl:attribute>
+ </input>
+ <input type="submit" name="done"
value="{table_done/lang_done}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_done/lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
</xsl:when>
</xsl:choose>
</form>
-<xsl:choose>
- <xsl:when test="table_send !=''">
- <tr><td><xsl:apply-templates select="table_done"/></td></tr>
- </xsl:when>
-</xsl:choose>
- </table>
+</table>
<script type="text/javascript">
var property_js = <xsl:value-of select="property_js" />;
@@ -1913,11 +1934,9 @@
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
<xsl:value-of
select="lang_done_statustext"/>
- <xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
</form>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7124] property: send/close button on send order,
Sigurd Nes <=