|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14700] more on buttons |
| Date: | Fri, 05 Feb 2016 11:52:59 +0000 |
Revision: 14700
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14700
Author: sigurdne
Date: 2016-02-05 11:52:58 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
more on buttons
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
branches/dev-syncromind/property/inc/class.uiadmin_location.inc.php
branches/dev-syncromind/property/inc/class.uiagreement.inc.php
branches/dev-syncromind/property/inc/class.uialarm.inc.php
branches/dev-syncromind/property/inc/class.uiasync.inc.php
branches/dev-syncromind/property/inc/class.uibudget.inc.php
branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
branches/dev-syncromind/property/inc/class.uicustom.inc.php
branches/dev-syncromind/property/inc/class.uidocument2.inc.php
branches/dev-syncromind/property/inc/class.uientity.inc.php
branches/dev-syncromind/property/inc/class.uigab.inc.php
branches/dev-syncromind/property/inc/class.uigeneric.inc.php
branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
branches/dev-syncromind/property/inc/class.uijasper.inc.php
branches/dev-syncromind/property/inc/class.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uipricebook.inc.php
branches/dev-syncromind/property/inc/class.uiproject.inc.php
branches/dev-syncromind/property/inc/class.uirequest.inc.php
branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
branches/dev-syncromind/property/inc/class.uitemplate.inc.php
branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
branches/dev-syncromind/property/inc/class.uitts.inc.php
branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
branches/dev-syncromind/property/templates/base/lookup.entity.xsl
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-05 11:52:58 UTC (rev 14700)
@@ -581,6 +581,19 @@
//
}
//
},
<xsl:choose>
+ <xsl:when test="new_item">
+ {
+ text: "<xsl:value-of
select="php:function('lang', 'new')"/>",
+ sUrl: '<xsl:value-of
select="new_item"/>',
+
+ action: function (e, dt, node,
config) {
+ var sUrl =
config.sUrl;
+
window.open(sUrl, '_self');
+ }
+ },
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
<xsl:when test="select_all = '1'">
{
text: "<xsl:value-of
select="php:function('lang', 'select all')"/>",
Modified: branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -134,27 +134,16 @@
$data = array(
'datatable_name' => $appname,
- 'form' => array(
- 'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_entity.edit',
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- )
- )
- )
- ),
'datatable' => array(
'source' => self::link(array(
'menuaction' =>
'property.uiadmin_entity.index',
'type' => $this->type,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_entity.edit',
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -387,22 +376,6 @@
$data = array(
'datatable_name' => $appname,
- 'form' => array(
- 'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_entity.edit_category',
-
'entity_id' => $entity_id,
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- )
- )
- )
- ),
'datatable' => array(
'source' => self::link(array(
'menuaction' =>
'property.uiadmin_entity.category',
@@ -410,6 +383,11 @@
'type' => $this->type,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_entity.edit_category',
+
'entity_id' => $entity_id,
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -1260,18 +1238,6 @@
array
(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_entity.edit_attrib_group',
-
'entity_id' => $entity_id,
-
'cat_id' => $cat_id,
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- ),
- array
- (
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array
(
@@ -1292,6 +1258,12 @@
'type' => $this->type,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_entity.edit_attrib_group',
+
'entity_id' => $entity_id,
+
'cat_id' => $cat_id,
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -1496,18 +1468,6 @@
array
(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_entity.edit_attrib',
-
'entity_id' => $entity_id,
-
'cat_id' => $cat_id,
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- ),
- array
- (
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array
(
@@ -1529,6 +1489,12 @@
'type' => $this->type,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_entity.edit_attrib',
+
'entity_id' => $entity_id,
+
'cat_id' => $cat_id,
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -2084,18 +2050,6 @@
array
(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_entity.edit_custom_function',
-
'entity_id' => $entity_id,
-
'cat_id' => $cat_id,
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- ),
- array
- (
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array
(
@@ -2117,6 +2071,12 @@
'type' => $this->type,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_entity.edit_custom_function',
+
'entity_id' => $entity_id,
+
'cat_id' => $cat_id,
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uiadmin_location.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiadmin_location.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiadmin_location.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -134,14 +134,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_location.edit'
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array(
'menuaction' => 'admin.uimainscreen.mainscreen'
@@ -156,6 +148,9 @@
'menuaction' =>
'property.uiadmin_location.index',
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_location.edit'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -611,15 +606,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_location.edit_attrib_group',
-
'type_id' => $type_id
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array(
'menuaction' => 'property.uiadmin_location.index'
@@ -635,6 +621,10 @@
'type_id' => $type_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_location.edit_attrib_group',
+
'type_id' => $type_id
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -907,15 +897,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiadmin_location.edit_attrib',
-
'type_id' => $type_id
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('cancel'),
'href' =>
self::link(array(
'menuaction' => 'property.uiadmin_location.index'
@@ -931,6 +912,10 @@
'type_id' => $type_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiadmin_location.edit_attrib',
+
'type_id' => $type_id
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uiagreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiagreement.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiagreement.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -279,22 +279,13 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiagreement.edit',
- 'role'
=> $this->role
- )),
- 'class' =>
'new_item'
- ), /*
array(
'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiagreement.columns',
role:'{$this->role}'},{closeAction:'reload'})"
- ) */
+ )
)
)
),
@@ -311,6 +302,10 @@
'status_id' => $this->status_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiagreement.edit',
+ 'role'
=> $this->role
+ )),
'download' => self::link(array(
'menuaction' =>
'property.uiagreement.download',
'status_id' => $this->status_id,
Modified: branches/dev-syncromind/property/inc/class.uialarm.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uialarm.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uialarm.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -194,20 +194,6 @@
$data = array(
'datatable_name' => $appname . ': ' .
$function_msg,
- 'form' => array(
- 'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uialarm.edit'
- )),
- 'class' =>
'new_item'
- )
- )
- )
- ),
'datatable' => array(
'source' => self::link(array(
'menuaction' =>
'property.uialarm.index',
@@ -215,6 +201,9 @@
'filter' => $this->filter,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uialarm.edit'
+ )),
'allrows' => true,
'editor' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uiasync.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiasync.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiasync.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -118,16 +118,6 @@
'datatable_name' => $appname,
'form' => array(
'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiasync.edit'
- )),
- 'class' =>
'new_item'
- )
- )
)
),
'datatable' => array(
@@ -135,6 +125,9 @@
'menuaction' =>
'property.uiasync.index',
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiasync.edit'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uibudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uibudget.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uibudget.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -515,15 +515,9 @@
if($acl_add)
{
- $data['form']['toolbar']['item'][] = array
- (
- 'type' => 'link',
- 'value' => lang('new'),
- 'href' => self::link(array(
- 'menuaction' =>
'property.uibudget.add'
- )),
- 'class' => 'new_item'
- );
+ $data['datatable']['new_item'] =
self::link(array(
+
'menuaction' => 'property.uiasync.edit'
+ ));
}
$uicols = array(
@@ -700,15 +694,9 @@
if($acl_add)
{
- $data['form']['toolbar']['item'][] = array
- (
- 'type' => 'link',
- 'value' => lang('new'),
- 'href' => self::link(array(
+ $data['datatable']['new_item'] =
self::link(array(
'menuaction' =>
'property.uibudget.add_basis'
- )),
- 'class' => 'new_item'
- );
+ ));
}
$uicols = array(
Modified: branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -131,12 +131,6 @@
'name' =>
'cat_id',
'text' =>
lang('category') . ':',
'list' =>
$categories,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array('menuaction' => 'property.uicondition_survey.add')),
- 'class' =>
'new_item'
)
),
),
@@ -146,6 +140,7 @@
'phpgw_return_as' => 'json')),
'download' =>
self::link(array('menuaction' => 'property.uicondition_survey.download',
'export' => true, 'allrows' =>
true)),
+ 'new_item' =>
self::link(array('menuaction' => 'property.uicondition_survey.add')),
'allrows' => true,
'editor_action' =>
self::link(array('menuaction' =>
'property.uicondition_survey.edit_survey_title')),
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uicustom.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uicustom.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uicustom.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -120,16 +120,6 @@
'datatable_name' => $appname,
'form' => array(
'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uicustom.edit'
- )),
- 'class' =>
'new_item'
- )
- )
)
),
'datatable' => array(
@@ -138,6 +128,9 @@
'cat_id' => $this->cat_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uicustom.edit'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uidocument2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uidocument2.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uidocument2.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -169,12 +169,6 @@
'text' =>
lang('category') . ':',
'list' =>
$categories,
),
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array('menuaction' => 'property.uidocument.edit')),
- 'class' =>
'new_item'
- ),
/*
array(
'type' => 'link',
'value' => lang('download'),
@@ -189,6 +183,7 @@
'phpgw_return_as' => 'json')),
'editor_action' =>
'property.uidocument2.edit_survey_title',
'field' => $columns,
+ 'new_item'
=>self::link(array('menuaction' => 'property.uidocument.edit')),
'allrows' => true,
// 'left_click_action' =>
'console.log',
// 'dbl_click_action' =>
'alert', // Only one of them (or none..)
Modified: branches/dev-syncromind/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uientity.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uientity.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -1119,17 +1119,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uientity.edit',
-
'entity_id' => $this->entity_id,
-
'cat_id' => $this->cat_id,
- 'type'
=> $this->type
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -1196,6 +1185,12 @@
'export' => true,
'allrows' => true
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uientity.edit',
+
'entity_id' => $this->entity_id,
+
'cat_id' => $this->cat_id,
+ 'type'
=> $this->type
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array()
Modified: branches/dev-syncromind/property/inc/class.uigab.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigab.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uigab.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -225,15 +225,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uigab.add',
- 'from'
=> 'index'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -242,6 +233,10 @@
'menuaction' =>
'property.uigab.index',
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uigab.add',
+ 'from'
=> 'index'
+ )),
'download' => self::link(array(
'menuaction' =>
'property.uigab.download',
'export' => true,
Modified: branches/dev-syncromind/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigeneric.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uigeneric.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -320,17 +320,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uigeneric.add',
-
'appname' => $this->bo->appname,
- 'type'
=> $this->type,
-
'type_id' => $this->type_id
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -353,6 +342,12 @@
'type_id' => $this->type_id,
'export' => true,
'allrows' => true)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uigeneric.add',
+
'appname' => $this->bo->appname,
+ 'type'
=> $this->type,
+
'type_id' => $this->type_id
+ )),
'allrows' => true,
'editor_action' =>
self::link(array('menuaction' => 'property.uigeneric.edit_field',
'appname' => $this->appname,
Modified: branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -280,14 +280,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiinvestment.add'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -296,6 +288,9 @@
'menuaction' =>
'property.uiinvestment.index',
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiinvestment.add'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uijasper.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uijasper.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uijasper.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -180,15 +180,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uijasper.edit',
- 'app'
=> $this->app
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -204,8 +195,10 @@
'skip_origin' => true,
'allrows' => true
)),
- // 'download' => self::link(array(
- // )),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uijasper.edit',
+ 'app'
=> $this->app
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -962,16 +962,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uilocation.add',
-
'type_id' => $type_id,
-
'parent' => $this->location_code
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -991,6 +981,11 @@
'block_query' => $block_query,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uilocation.add',
+
'type_id' => $type_id,
+
'parent' => $this->location_code
+ )),
'download' =>
self::link(array('menuaction' => 'property.uilocation.download',
'type_id' => $type_id,
'lookup' => $lookup,
Modified: branches/dev-syncromind/property/inc/class.uipricebook.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uipricebook.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uipricebook.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -528,14 +528,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uipricebook.edit_agreement_group'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -546,6 +538,9 @@
'filter' => $this->filter,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uipricebook.edit_agreement_group'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
@@ -1220,15 +1215,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uipricebook.edit_activity',
-
'agreement_group' => $this->cat_id
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -1242,6 +1228,10 @@
// 'download' => self::link(array(
//
// )),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uipricebook.edit_activity',
+
'agreement_group' => $this->cat_id
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array()
@@ -1454,14 +1444,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('cancel'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uipricebook.activity'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -1473,6 +1455,9 @@
'activity_id' => $activity_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uipricebook.activity'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiproject.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiproject.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -365,14 +365,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiproject.add'
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -410,6 +402,9 @@
'skip_origin' => true,
'allrows' => true
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiproject.add'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array()
Modified: branches/dev-syncromind/property/inc/class.uirequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -624,14 +624,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uirequest.add'
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -676,6 +668,9 @@
'export' => true,
'allrows' => true,
'list_descr' => true)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uirequest.add'
+ )),
'allrows' => true,
'select_all' => !!$project_id,
'editor_action' => array(),
Modified: branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -238,16 +238,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiresponsible.edit',
-
'appname' => $this->appname,
-
'location' => $this->location
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -259,6 +249,11 @@
'appname' => $this->appname,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiresponsible.edit',
+
'appname' => $this->appname,
+
'location' => $this->location
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -264,15 +264,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uis_agreement.edit',
- 'role'
=> $this->role
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -297,6 +288,10 @@
'menuaction' =>
'property.uis_agreement.download',
'id' => $id
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uis_agreement.edit',
+ 'role'
=> $this->role
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array()
Modified: branches/dev-syncromind/property/inc/class.uitemplate.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitemplate.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uitemplate.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -223,15 +223,9 @@
}
else
{
- $params1 = array(
- 'type' => 'link',
- 'value' => lang('new'),
- 'href' => self::link(array(
- 'menuaction' =>
'property.uitemplate.edit_template'
- )),
- 'class' => 'new_item'
- );
- array_push($data['form']['toolbar']['item'],
$params1);
+ $data['datatable']['new_item'] =
self::link(array(
+ 'menuaction' =>
'property.uitemplate.edit_template' ));
+
}
$parameters = array
@@ -486,15 +480,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uitemplate.edit_hour',
-
'template_id' => $template_id,
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('Cancel'),
'href' =>
self::link(array(
'menuaction' => 'property.uitemplate.index',
@@ -511,6 +496,10 @@
'template_id' => $template_id,
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uitemplate.edit_hour',
+
'template_id' => $template_id,
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -187,16 +187,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiproject.index',
-
'lookup' => '1',
- 'from'
=> 'tenant_claim'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -205,6 +195,11 @@
'menuaction' =>
'property.uitenant_claim.index',
'phpgw_return_as' => 'json'
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiproject.index',
+
'lookup' => '1',
+ 'from'
=> 'tenant_claim'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array(
Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php 2016-02-05
08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php 2016-02-05
11:52:58 UTC (rev 14700)
@@ -825,12 +825,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array('menuaction' => 'property.uitts.add')),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -863,6 +857,7 @@
'download' =>
self::link(array('menuaction' => 'property.uitts.download',
'export' => true, 'allrows' =>
true)),
'allrows' => true,
+ 'new_item' =>
self::link(array('menuaction' => 'property.uitts.add')),
'editor_action' =>
self::link(array('menuaction' => 'property.uitts.edit_survey_title')),
'field' => $this->_get_fields(),
'group_buttons' => true,
Modified: branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
2016-02-05 11:52:58 UTC (rev 14700)
@@ -391,14 +391,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiworkorder.add'
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
'value' =>
lang('columns'),
'href' => '#',
'class' => '',
@@ -438,6 +430,9 @@
'export' => true,
'allrows' => true
)),
+ 'new_item' => self::link(array(
+
'menuaction' => 'property.uiworkorder.add'
+ )),
'allrows' => true,
'editor_action' => '',
'field' => array()
Modified: branches/dev-syncromind/property/templates/base/lookup.entity.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/lookup.entity.xsl
2016-02-05 08:39:12 UTC (rev 14699)
+++ branches/dev-syncromind/property/templates/base/lookup.entity.xsl
2016-02-05 11:52:58 UTC (rev 14700)
@@ -369,6 +369,19 @@
//
return dt.i18n( 'buttons.show_hide', 'Show / hide columns' );
//
}
// },
+
<xsl:choose>
+
<xsl:when test="new_item">
+
{
+
text: "<xsl:value-of select="php:function('lang', 'new')"/>",
+
sUrl: '<xsl:value-of select="new_item"/>',
+
+
action: function (e, dt, node, config) {
+
var sUrl = config.sUrl;
+
window.open(sUrl, '_self');
+
}
+
},
+
</xsl:when>
+
</xsl:choose>
{
text: "<xsl:value-of select="php:function('lang', 'select all')"/>",
action: function () {
| [Prev in Thread] | Current Thread | [Next in Thread] |