[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16222] Stable: Merge 16220:16221 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16222] Stable: Merge 16220:16221 from trunk |
|
Date: |
Wed, 1 Feb 2017 08:01:30 -0500 (EST) |
Revision: 16222
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16222
Author: sigurdne
Date: 2017-02-01 08:01:29 -0500 (Wed, 01 Feb 2017)
Log Message:
-----------
Stable: Merge 16220:16221 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-01 12:59:12 UTC (rev 16221)
+++ branches/Version-2_0-branch 2017-02-01 13:01:29 UTC (rev 16222)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16188
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221
\ No newline at end of property
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-02-01 12:59:12 UTC (rev 16221)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-02-01 13:01:29 UTC (rev 16222)
@@ -607,33 +607,33 @@
var disablePagination = '<xsl:value-of
select="disablePagination"/>';
var select_all = '<xsl:value-of select="select_all"/>';
var initial_search = {"search": "<xsl:value-of
select="query"/>" };
- var action_def = null;
+ var action_def = [];
var contextMenuItems={};
var InitContextMenu=false
+ var button_def = [];
<xsl:choose>
<xsl:when test="//datatable/actions">
- var button_def = [
- // {
+ //button_def.push({
// extend: 'colvis',
// exclude: exclude_colvis,
// text: function ( dt, button,
config ) {
// return dt.i18n(
'buttons.show_hide', 'Show / hide columns' );
// }
- //},
+ //});
<xsl:choose>
<xsl:when test="new_item">
<xsl:choose>
<xsl:when
test="new_item/onclick">
- {
+ button_def.push({
text:
"<xsl:value-of select="php:function('lang', 'new')"/>",
action:
function (e, dt, node, config) {
<xsl:value-of
select="new_item/onclick"/>;
}
- },
+ });
</xsl:when>
<xsl:otherwise>
- {
+ button_def.push({
text:
"<xsl:value-of select="php:function('lang', 'new')"/>",
sUrl:
'<xsl:value-of select="new_item"/>',
@@ -641,7 +641,7 @@
var sUrl =
config.sUrl;
window.open(sUrl, '_self');
}
- },
+ });
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -648,7 +648,7 @@
</xsl:choose>
<xsl:choose>
<xsl:when test="select_all = '1'">
- {
+ button_def.push({
text: "<xsl:value-of
select="php:function('lang', 'select all')"/>",
action: function () {
var api = oTable.api();
@@ -661,8 +661,9 @@
api.buttons( '.record'
).enable( selectedRows > 0 );
}
- },
- {
+ });
+
+ button_def.push({
text: "<xsl:value-of
select="php:function('lang', 'select none')"/>",
action: function () {
var api = oTable.api();
@@ -673,18 +674,18 @@
});
api.buttons( '.record'
).enable( false );
}
- },
+ });
</xsl:when>
</xsl:choose>
- {
- extend: 'csvHtml5',
- titleAttr: "<xsl:value-of
select="php:function('lang', 'download visible data')"/>",
- fieldSeparator: ';',
- bom:true
- }
+// button_def.push({
+// extend: 'csvHtml5',
+// titleAttr: "<xsl:value-of
select="php:function('lang', 'download visible data')"/>",
+// fieldSeparator: ';',
+// bom:true
+// });
<xsl:choose>
<xsl:when test="download">
- ,{
+ button_def.push({
text: "<xsl:value-of
select="php:function('lang', 'download')"/>",
titleAttr: "<xsl:value-of
select="php:function('lang', 'download data')"/>",
className: 'download',
@@ -734,17 +735,16 @@
]]>
}
- }
+ });
</xsl:when>
</xsl:choose>
- ];
- var action_def = [
+
<xsl:choose>
<xsl:when test="//datatable/actions !=
''">
<xsl:for-each
select="//datatable/actions">
<xsl:choose>
<xsl:when
test="type = 'custom'">
- {
+
action_def.push({
text:
"<xsl:value-of select="text"/>",
<xsl:choose>
<xsl:when test="className">
@@ -767,10 +767,10 @@
fnSetSelected(this, dt);
<xsl:value-of select="custom_code"/>
}
-
}<xsl:value-of select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ });
</xsl:when>
<xsl:otherwise>
- {
+
action_def.push({
text:
"<xsl:value-of select="text"/>",
<xsl:choose>
<xsl:when test="className">
@@ -856,13 +856,12 @@
n++;
}
}
-
}<xsl:value-of select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ });
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:when>
</xsl:choose>
- ];
<xsl:choose>
<xsl:when test="group_buttons = '1'">
var group_buttons = true;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16222] Stable: Merge 16220:16221 from trunk,
sigurdne <=