|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16246] rearrange columns button |
| Date: | Sat, 4 Feb 2017 12:49:22 -0500 (EST) |
Revision: 16246
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16246
Author: sigurdne
Date: 2017-02-04 12:49:22 -0500 (Sat, 04 Feb 2017)
Log Message:
-----------
rearrange columns button
Modified Paths:
--------------
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/property/inc/class.uiagreement.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/inc/class.uigeneric.inc.php
trunk/property/inc/class.uilocation.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-02-03 14:30:32 UTC
(rev 16245)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-02-04 17:49:22 UTC
(rev 16246)
@@ -97,7 +97,7 @@
</label>
<div id="toolbar" class='dtable_custom_controls'>
<table id="toolbar_table" class="pure-table
pure-table-horizontal">
- <thead>
+ <!--thead>
<tr>
<th>
<xsl:value-of
select="php:function('lang', 'name')"/>
@@ -106,7 +106,7 @@
<xsl:value-of
select="php:function('lang', 'item')"/>
</th>
</tr>
- </thead>
+ </thead-->
<tbody>
<xsl:for-each select="item">
<script type="text/javascript">
@@ -131,7 +131,11 @@
<xsl:when
test="type = 'date-picker'">
<td
valign="top">
<div>
-
<input id="filter_{name}" name="filter_{name}" value="{value}"
type="text"></input>
+
<input id="filter_{name}" name="filter_{name}" value="{value}"
type="text">
+
<xsl:attribute name="title">
+
<xsl:value-of select="phpgw:conditional(not(text), '',
text)"/>
+
</xsl:attribute>
+
</input>
</div>
</td>
</xsl:when>
@@ -142,6 +146,9 @@
<xsl:attribute name="value">
<xsl:value-of select="../../../filters/*[local-name() =
$filter_key_name]"/>
</xsl:attribute>
+
<xsl:attribute name="title">
+
<xsl:value-of select="phpgw:conditional(not(text), '',
text)"/>
+
</xsl:attribute>
</input>
<input id="filter_{name}_id" name="filter_{name}_id" type="hidden">
<xsl:attribute name="value">
@@ -231,6 +238,9 @@
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of
select="$name"/>';
</script>
<select id="{$name}" name="{$name}" width="250" style="width: 250px">
+
<xsl:attribute name="title">
+
<xsl:value-of select="phpgw:conditional(not(text), '',
text)"/>
+
</xsl:attribute>
<xsl:for-each select="list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
@@ -738,6 +748,18 @@
});
</xsl:when>
</xsl:choose>
+ <xsl:choose>
+ <xsl:when test="columns">
+ button_def.push({
+ text: "<xsl:value-of
select="php:function('lang', 'columns')"/>",
+ titleAttr: "<xsl:value-of
select="php:function('lang', 'columns')"/>",
+ className: 'download',
+ action: function (e, dt, node,
config) {
+ <xsl:value-of
select="columns/onclick"/>;
+ }
+ });
+ </xsl:when>
+ </xsl:choose>
<xsl:choose>
<xsl:when test="//datatable/actions !=
''">
Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php 2017-02-03 14:30:32 UTC
(rev 16245)
+++ trunk/property/inc/class.uiagreement.inc.php 2017-02-04 17:49:22 UTC
(rev 16246)
@@ -278,13 +278,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiagreement.columns',
role:'{$this->role}'},{closeAction:'reload'})"
- )
)
)
),
@@ -301,6 +294,7 @@
'status_id' => $this->status_id,
'phpgw_return_as' => 'json'
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiagreement.columns',
role:'{$this->role}'},{closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uiagreement.edit',
'role' => $this->role
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uientity.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -1304,13 +1304,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uientity.columns',
entity_id:'{$this->entity_id}', cat_id:'{$this->cat_id}',
type:'{$this->type}'}, {closeAction:'reload'})"
- ),
array
(
'type' =>
'link',
@@ -1370,6 +1363,7 @@
'export' => true,
'allrows' => true
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uientity.columns',
entity_id:'{$this->entity_id}', cat_id:'{$this->cat_id}',
type:'{$this->type}'}, {closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uientity.edit',
'entity_id' => $this->entity_id,
Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uigeneric.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -323,13 +323,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'{$this->call_appname}.uigeneric.columns',
appname:'{$this->bo->appname}',type:'{$this->type}',
type_id:'{$this->type_id}'}, {closeAction:'reload'})"
- )
)
)
),
@@ -347,6 +340,7 @@
'type_id' => $this->type_id,
'export' => true,
'allrows' => true)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'{$this->call_appname}.uigeneric.columns',
appname:'{$this->bo->appname}',type:'{$this->type}',
type_id:'{$this->type_id}'}, {closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
"{$this->call_appname}.uigeneric.add",
'appname' => $this->bo->appname,
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uilocation.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -1030,13 +1030,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uilocation.columns',
type_id:'{$type_id}',parent:'{$this->location_code}'}, {closeAction:'reload'})"
- )
)
)
),
@@ -1051,6 +1044,7 @@
'block_query' => $block_query,
'phpgw_return_as' => 'json'
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uilocation.columns',
type_id:'{$type_id}',parent:'{$this->location_code}'},
{closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uilocation.add',
'type_id' => $type_id,
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uiproject.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -367,13 +367,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiproject.columns'},{closeAction:'reload'})"
- ),
array
(
'type' =>
'date-picker',
@@ -406,6 +399,7 @@
'skip_origin' => true,
'allrows' => true
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiproject.columns'},{closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uiproject.add'
)),
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uirequest.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -657,13 +657,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uirequest.columns'},
{closeAction:'reload'})"
- ),
array
(
'type' =>
'link',
@@ -705,6 +698,7 @@
'export' => true,
'allrows' => true,
'list_descr' => true)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uirequest.columns'},
{closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uirequest.add'
)),
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2017-02-03 14:30:32 UTC
(rev 16245)
+++ trunk/property/inc/class.uis_agreement.inc.php 2017-02-04 17:49:22 UTC
(rev 16246)
@@ -261,13 +261,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uis_agreement.columns',
role:'{$this->role}'},{closeAction:'reload'})"
- )
)
)
),
@@ -287,6 +280,7 @@
'menuaction' =>
'property.uis_agreement.download',
'id' => $id
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uis_agreement.columns',
role:'{$this->role}'},{closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uis_agreement.edit',
'role' => $this->role
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-02-03 14:30:32 UTC (rev
16245)
+++ trunk/property/inc/class.uitts.inc.php 2017-02-04 17:49:22 UTC (rev
16246)
@@ -969,14 +969,7 @@
'name' =>
'end_date',
'value' =>
$end_date,
'text' =>
lang('to')
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uitts.columns'},
{closeAction:'reload', height: 500})"
- ),
+ )
)
)
),
@@ -987,6 +980,7 @@
'phpgw_return_as' => 'json')),
'download' =>
self::link(array('menuaction' => 'property.uitts.download',
'export' => true, 'allrows' =>
true)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uitts.columns'},
{closeAction:'reload', height: 500})"),
'allrows' => true,
'new_item' =>
self::link(array('menuaction' => 'property.uitts.add')),
'editor_action' =>
self::link(array('menuaction' => 'property.uitts.edit_survey_title')),
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2017-02-03 14:30:32 UTC
(rev 16245)
+++ trunk/property/inc/class.uiworkorder.inc.php 2017-02-04 17:49:22 UTC
(rev 16246)
@@ -399,13 +399,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('columns'),
- 'href' => '#',
- 'class' => '',
- 'onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiworkorder.columns',
appname:'{$this->bo->appname}',type:'{$this->type}',
type_id:'{$this->type_id}'}, {closeAction:'reload'})"
- ),
array
(
'type' =>
'date-picker',
@@ -440,6 +433,7 @@
'export' => true,
'allrows' => true
)),
+ "columns" => array('onclick' =>
"JqueryPortico.openPopup({menuaction:'property.uiworkorder.columns',
appname:'{$this->bo->appname}',type:'{$this->type}',
type_id:'{$this->type_id}'}, {closeAction:'reload'})"),
'new_item' => self::link(array(
'menuaction' =>
'property.uiworkorder.add'
)),
| [Prev in Thread] | Current Thread | [Next in Thread] |