[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6730] property: formatting / allrows at hook home
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6730] property: formatting / allrows at hook home |
|
Date: |
Wed, 05 Jan 2011 14:52:23 +0000 |
Revision: 6730
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6730
Author: sigurdne
Date: 2011-01-05 14:52:23 +0000 (Wed, 05 Jan 2011)
Log Message:
-----------
property: formatting / allrows at hook home
Modified Paths:
--------------
trunk/property/inc/class.botenant_claim.inc.php
trunk/property/inc/class.uitenant_claim.inc.php
trunk/property/inc/hook_home.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/tenant_claim.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.botenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.botenant_claim.inc.php 2011-01-04 13:26:06 UTC
(rev 6729)
+++ trunk/property/inc/class.botenant_claim.inc.php 2011-01-05 14:52:23 UTC
(rev 6730)
@@ -148,7 +148,7 @@
}
else
{
- return;
+ return array();
}
$GLOBALS['phpgw']->xslttpl->add_file(array('status_' .
$format));
Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php 2011-01-04 13:26:06 UTC
(rev 6729)
+++ trunk/property/inc/class.uitenant_claim.inc.php 2011-01-05 14:52:23 UTC
(rev 6730)
@@ -887,10 +887,6 @@
'lang_no_user'
=> lang('Select coordinator'),
'user_list'
=>
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
- 'status_list'
=>
$this->boproject->select_status_list('select',$project_values['status']),
- 'lang_no_status'
=> lang('Select status'),
- 'lang_status'
=> lang('Status'),
-
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
'lang_contact_phone'
=> lang('Contact phone'),
@@ -1167,9 +1163,7 @@
'lang_no_user'
=> lang('Select coordinator'),
'user_list'
=>
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
- 'status_list'
=>
$this->boproject->select_status_list('select',$project_values['status']),
'lang_no_status'
=> lang('Select status'),
- 'lang_status'
=> lang('Status'),
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
Modified: trunk/property/inc/hook_home.inc.php
===================================================================
--- trunk/property/inc/hook_home.inc.php 2011-01-04 13:26:06 UTC (rev
6729)
+++ trunk/property/inc/hook_home.inc.php 2011-01-05 14:52:23 UTC (rev
6730)
@@ -584,7 +584,8 @@
'responsible_type' => 'user',
'action' => 'approval',
'deadline' => '',
- 'created_by' => $accound_id
+ 'created_by' => $accound_id,
+ 'allrows' => true
);
$obj = CreateObject('property.sopending_action');
@@ -610,7 +611,8 @@
'responsible_type' => 'user',
'action' => 'approval',
'deadline' => '',
- 'created_by' => $accound_id
+ 'created_by' => $accound_id,
+ 'allrows' => true
);
$pending_approvals = $obj->get_pending_action($action_params);
@@ -634,7 +636,8 @@
'responsible_type' => 'user',
'action' => 'approval',
'deadline' => '',
- 'created_by' => $accound_id
+ 'created_by' => $accound_id,
+ 'allrows' => true
);
$pending_approvals = $obj->get_pending_action($action_params);
@@ -704,6 +707,7 @@
'action' => 'approval',
'deadline' => '',
'created_by' => '',
+ 'allrows' => true
);
$pending_approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
@@ -731,6 +735,7 @@
'action' => 'approval',
'deadline' => '',
'created_by' => '',
+ 'allrows' => true
);
$pending_approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
@@ -756,6 +761,7 @@
'action' => 'approval',
'deadline' => '',
'created_by' => '',
+ 'allrows' => true
);
$pending_approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
@@ -827,6 +833,7 @@
'action' => 'remind',
'deadline' => '',
'created_by' => $accound_id,
+ 'allrows' => true
);
$pending_reminder =
execMethod('property.sopending_action.get_pending_action', $action_params);
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2011-01-04 13:26:06 UTC (rev 6729)
+++ trunk/property/setup/phpgw_no.lang 2011-01-05 14:52:23 UTC (rev 6730)
@@ -477,6 +477,7 @@
delete workorder property no slett arbeidsordre
delivered property no Levert
delivery address property no Leveringsadresse
+deposit claim property no Krav mot depositum
description property no Beskrivelse
description order property no Bestilling til leverandør
descr property no Beskrivelse
@@ -976,6 +977,7 @@
lookup tenant property no Slå opp leietaker
lowest property no Lavest
mailing method is not chosen! (admin section) property no Mail
metode er ikke valgt! (admin seksjon)
+main claim property no Hovedkrav
make order property no Lag bestilling
manage property no Forvalte
manage groups property no Administrere grupper
Modified: trunk/property/templates/base/tenant_claim.xsl
===================================================================
--- trunk/property/templates/base/tenant_claim.xsl 2011-01-04 13:26:06 UTC
(rev 6729)
+++ trunk/property/templates/base/tenant_claim.xsl 2011-01-05 14:52:23 UTC
(rev 6730)
@@ -7,171 +7,23 @@
<xsl:when test="view">
<xsl:apply-templates select="view"/>
</xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="list"/>
- </xsl:otherwise>
</xsl:choose>
</xsl:template>
-<xsl:template match="list">
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2" 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 align="left">
- <xsl:call-template name="cat_filter"/>
- </td>
- <td align="center">
- <xsl:call-template name="status_filter"/>
- </td>
- <td align="right">
- <xsl:call-template name="search_field"/>
- </td>
- </tr>
- <tr>
- <td colspan="3" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2" align="center">
- <xsl:apply-templates select="table_header"/>
- <xsl:apply-templates select="values"/>
- <xsl:apply-templates select="table_add"/>
- </table>
-</xsl:template>
-<xsl:template match="table_header">
- <xsl:variable name="sort_time_created" select="sort_time_created"/>
- <xsl:variable name="sort_claim_id" select="sort_claim_id"/>
- <xsl:variable name="sort_project" select="sort_project"/>
- <xsl:variable name="sort_name" select="sort_name"/>
- <xsl:variable name="sort_category" select="sort_category"/>
-
- <tr class="th">
- <td width="10%" align="right">
- <a href="{$sort_claim_id}"
class="th_text"><xsl:value-of select="lang_claim_id"/></a>
- </td>
- <td width="10%" align="right">
- <a href="{$sort_project}" class="th_text"><xsl:value-of
select="lang_project"/></a>
- </td>
- <td width="40%">
- <a href="{$sort_name}" class="th_text"><xsl:value-of
select="lang_name"/></a>
- </td>
- <td width="20%" align="center">
- <a href="{$sort_time_created}"
class="th_text"><xsl:value-of select="lang_time_created"/></a>
- </td>
- <td width="10%" align="center">
- <a href="{$sort_category}"
class="th_text"><xsl:value-of select="lang_category"/></a>
- </td>
- <td width="5%" align="center">
- <xsl:value-of select="lang_status"/>
- </td>
- <td width="5%" align="center">
- <xsl:value-of select="lang_view"/>
- </td>
- <td width="5%" align="center">
- <xsl:value-of select="lang_edit"/>
- </td>
- <td width="5%" align="center">
- <xsl:value-of select="lang_delete"/>
- </td>
- </tr>
-</xsl:template>
-
-<xsl:template match="values">
- <xsl:variable name="lang_view_statustext"><xsl:value-of
select="lang_view_statustext"/></xsl:variable>
- <xsl:variable name="lang_edit_statustext"><xsl:value-of
select="lang_edit_statustext"/></xsl:variable>
- <xsl:variable name="lang_delete_statustext"><xsl:value-of
select="lang_delete_statustext"/></xsl:variable>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
-
- <td align="right">
- <xsl:value-of select="claim_id"/>
- </td>
- <td align="right">
- <xsl:value-of select="project_id"/>
- </td>
- <td align="left">
- <xsl:value-of select="name"/>
- </td>
- <td align="center">
- <xsl:value-of select="entry_date"/>
- </td>
- <td align="left">
- <xsl:value-of select="category"/>
- </td>
- <td align="left">
- <xsl:value-of select="status"/>
- </td>
- <td align="center">
- <xsl:variable name="link_view"><xsl:value-of
select="link_view"/></xsl:variable>
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_view"/></a>
- </td>
- <td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
- </td>
- <td align="center">
- <xsl:variable name="link_delete"><xsl:value-of
select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
- </td>
- </tr>
-</xsl:template>
-
-<xsl:template match="table_add">
- <tr>
- <td height="50">
- <xsl:variable name="add_action"><xsl:value-of
select="add_action"/></xsl:variable>
- <xsl:variable name="lang_add"><xsl:value-of
select="lang_add"/></xsl:variable>
- <form method="post" action="{$add_action}">
- <input type="submit" name="add"
value="{$lang_add}" onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_add_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- </tr>
-</xsl:template>
-
<!-- add / edit -->
- <xsl:template match="edit">
+ <xsl:template match="edit" xmlns:php="http://php.net/xsl";>
<script type="text/javascript">
self.name="first_Window";
function tenant_lookup()
{
- Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ Window1=window.open('<xsl:value-of
select="tenant_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
</script>
<div class="yui-navset" id="edit_tabview">
<div class="yui-content">
-
-
<xsl:variable name="edit_url"><xsl:value-of
select="edit_url"/></xsl:variable>
<form name="form" method="post"
action="{$edit_url}">
<table cellpadding="2" cellspacing="2"
width="79%" align="left">
@@ -392,35 +244,61 @@
<td>
<input
type="hidden" name="tenant_id" value="{value_tenant_id}"></input>
<input
size="{size_last_name}" type="text" name="last_name" value="{value_last_name}"
onClick="tenant_lookup();" readonly="readonly">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of select="lang_tenant_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
<input
size="{size_first_name}" type="text" name="first_name"
value="{value_first_name}" onClick="tenant_lookup();" readonly="readonly">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of select="lang_tenant_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
</tr>
+<!--
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="php:function('lang', 'deposit claim')" />
+ </td>
+ <td>
+ <input
type="text" name="values[deposit_claim]" value="{value_deposit_claim}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'deposit claim')" />
+
</xsl:attribute>
+ </input>
+ <xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
+ </td>
+ </tr>
+ <tr align="left">
+ <td valign="top" >
+ <xsl:value-of
select="php:function('lang', 'remark')" />
+ </td>
+ <td align="left">
+ <textarea
cols="60" rows="6" name="values[deposit_claim_text]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_remark_statustext"/>
+
</xsl:attribute>
+
<xsl:value-of select="value_deposit_claim_text"/>
+ </textarea>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="php:function('lang', 'main claim')" />
+ </td>
+ </tr>
+-->
<xsl:call-template
name="b_account_form"/>
-
<tr>
<td valign="top">
<xsl:value-of
select="lang_amount"/>
</td>
<td>
<input
type="text" name="values[amount]" value="{value_amount}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of select="lang_amount_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
<xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
@@ -440,12 +318,9 @@
<xsl:value-of
select="lang_remark"/>
</td>
<td align="left">
-
- <textarea
cols="60" rows="6" name="values[remark]" onMouseout="window.status='';return
true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <textarea
cols="60" rows="6" name="values[remark]">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_remark_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
<xsl:value-of select="value_remark"/>
</textarea>
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2011-01-04 13:26:06 UTC (rev
6729)
+++ trunk/property/templates/base/workorder.xsl 2011-01-05 14:52:23 UTC (rev
6730)
@@ -770,26 +770,16 @@
</xsl:choose>
</td>
<td>
- <xsl:choose>
- <xsl:when
test="charge_tenant='1'">
- <input type="checkbox"
name="values[charge_tenant]" value="1" checked="checked"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox"
name="values[charge_tenant]" value="1" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[charge_tenant]" value="1">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_charge_tenant_statustext"/>
+ </xsl:attribute>
+ <xsl:if test="charge_tenant =
'1'">
+ <xsl:attribute
name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6730] property: formatting / allrows at hook home,
Sigurd Nes <=