[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14718] buttons
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14718] buttons |
|
Date: |
Wed, 10 Feb 2016 10:52:37 +0000 |
Revision: 14718
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14718
Author: sigurdne
Date: 2016-02-10 10:51:51 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
buttons
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
branches/dev-syncromind/booking/inc/class.uidocument.inc.php
branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
branches/dev-syncromind/booking/inc/class.uipermission.inc.php
branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
branches/dev-syncromind/booking/inc/class.uiresource.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contacts_sql.inc.php
Modified: branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -66,11 +66,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('New Age Group'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiagegroup.add'))
- ),
- array(
- 'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => 'booking.uiagegroup.active'))
),
@@ -105,12 +100,13 @@
)
);
- if(!$this->bo->allow_create())
+ if($this->bo->allow_create())
{
- //Remove new button
- unset($data['form']['toolbar']['item'][0]);
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiagegroup.add'));
}
+ $data['datatable']['actions'][] = array();
+
if(!$this->bo->allow_write())
{
//Remove link to edit
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -119,12 +119,10 @@
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New allocation'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiallocation.add'))
- ));
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiallocation.add'));
}
+ $data['datatable']['actions'][] = array();
+
$data['filters'] = $this->export_filters;
self::render_template_xsl('datatable_jquery', $data);
// self::render_template('datatable', $data);
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -250,11 +250,6 @@
'toolbar' => array(
'item' => array(
array(
- 'type' =>
'link',
- 'value' =>
lang('New application'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiapplication.add'))
- ),
- array(
'type' =>
'filter',
'name' =>
'status',
'text' =>
lang('Status') . ':',
@@ -351,6 +346,9 @@
),
);
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiapplication.add'));
+ $data['datatable']['actions'][] = array();
+
self::render_template_xsl('datatable_jquery', $data);
// self::render_template('datatable', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -80,11 +80,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('New Audience group'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiaudience.add'))
- ),
- array(
- 'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => 'booking.uiaudience.active'))
),
@@ -119,10 +114,10 @@
)
);
- if(!$this->bo->allow_create())
+ $data['datatable']['actions'][] = array();
+ if($this->bo->allow_create())
{
- //Remove new button
- unset($data['form']['toolbar']['item'][0]);
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiaudience.add'));
}
if(!$this->bo->allow_write())
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2016-02-10
08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2016-02-10
10:51:51 UTC (rev 14718)
@@ -127,16 +127,13 @@
)
);
+ $data['datatable']['actions'][] = array();
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New booking'),
- 'href' =>
self::link(array('menuaction' => 'booking.uibooking.add'))
- ));
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uibooking.add'));
}
$data['filters'] = $this->export_filters;
-// self::render_template('datatable', $data);
+
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -110,6 +110,7 @@
'toolbar' => array(
'item' => array(
array(
+ 'label' =>
lang('toggle show inactive'),
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix . '.toggle_show_inactive'))
@@ -158,16 +159,12 @@
)
);
+ $data['datatable']['actions'][] = array();
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New building'),
- 'href' =>
self::link(array('menuaction' => $this->module . '.uibuilding.add'))
- ));
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => $this->module . '.uibuilding.add'));
}
- //self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -40,11 +40,6 @@
'toolbar' => array(
'item' => array(
array(
- 'type' =>
'link',
- 'value' =>
lang('New contact'),
- 'href' =>
self::link(array('menuaction' => 'booking.uicontactperson.edit'))
- ),
- array(
'type' =>
'text',
'name' =>
'query'
),
@@ -84,6 +79,10 @@
)
)
);
+
+ $data['datatable']['actions'][] = array();
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uicontactperson.edit'));
+
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -174,7 +174,6 @@
)
);
self::render_template_xsl('datatable_jquery', $data);
-// self::render_template('datatable', $data);
}
public function query()
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -148,8 +148,6 @@
$data = array(
'form' => array(
'toolbar' => array(
- 'item' => array(
- )
),
),
'datatable' => array(
@@ -192,17 +190,12 @@
)
);
-
+ $data['datatable']['actions'][] = array();
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New document'),
- 'href' =>
$this->get_owner_typed_link('add')
- ));
+ $data['datatable']['new_item'] =
$this->get_owner_typed_link('add');
}
-// self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -42,8 +42,6 @@
$data = array(
'form' => array(
'toolbar' => array(
- 'item' => array(
- )
),
),
'datatable' => array(
@@ -83,14 +81,9 @@
)
);
+ $data['datatable']['actions'][] = array();
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => $this->module . '.uidocumentation.add'));
- array_unshift($data['form']['toolbar']['item'], array(
- 'type' => 'link',
- 'value' => lang('New document'),
- 'href' => self::link(array('menuaction' =>
$this->module . '.uidocumentation.add')),
- ));
-
-// self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2016-02-10
08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2016-02-10
10:51:51 UTC (rev 14718)
@@ -52,11 +52,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New event'),
- 'href' =>
self::link(array('menuaction' => 'booking.uievent.add'))
- ),
array('type' =>
'filter',
'name' =>
'buildings',
'text' =>
lang('Building') . ':',
@@ -122,7 +117,8 @@
)
)
);
-// self::render_template('datatable', $data);
+ $data['datatable']['actions'][] = array();
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uievent.add'));
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2016-02-10
08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2016-02-10
10:51:51 UTC (rev 14718)
@@ -125,11 +125,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('New group'),
- 'href' =>
self::link(array('menuaction' => $this->module . '.uigroup.edit'))
- ),
- array(
- 'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix . '.toggle_show_inactive'))
),
@@ -176,7 +171,9 @@
)
)
);
-// self::render_template('datatable', $data);
+ $data['datatable']['actions'][] = array();
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => $this->module . '.uigroup.edit'));
+
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -83,7 +83,7 @@
)
);
-// self::render_template('datatable', $data);
+ $data['datatable']['actions'][] = array();
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -79,11 +79,6 @@
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('New organization'),
- 'href' =>
self::link(array('menuaction' => $this->module . '.uiorganization.add'))
- ),
- array(
- 'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix . '.toggle_show_inactive'))
),
@@ -135,6 +130,8 @@
)
)
);
+ $data['datatable']['actions'][] = array();
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => $this->module . '.uiorganization.add'));
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -174,6 +174,8 @@
)
);
+ $data['datatable']['actions'][] = array();
+
if($this->bo->allow_create())
{
array_unshift($data['form']['toolbar']['item'],
array(
@@ -181,6 +183,7 @@
'value' => lang(sprintf('New %s
Permission', self::humanize($this->get_object_type()))),
'href' =>
$this->get_object_typed_link('add')
));
+ $data['datatable']['new_item'] =
$this->get_object_typed_link('add');
}
// self::render_template('datatable', $data);
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -63,13 +63,6 @@
$data = array(
'form' => array(
'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New Root Permission'),
- 'href' =>
$this->generate_link('add')
- )
- )
),
),
'datatable' => array(
@@ -100,12 +93,12 @@
unset($data['datatable']['field'][2]); //Delete
action
}
- if(!$this->bo->allow_create())
+ if($this->bo->allow_create())
{
- unset($data['form']['toolbar']['item'][0]);
//New button
+ $data['datatable']['new_item'] =
$this->generate_link('add');
}
-// self::render_template('datatable', $data);
+ $data['datatable']['actions'][] = array();
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -114,16 +114,13 @@
)
);
+ $data['datatable']['actions'][] = array();
+
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New resource'),
- 'href' => self::link(array('menuaction'
=> 'booking.uiresource.add'))
- ));
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiresource.add'));
}
-// self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2016-02-10
08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2016-02-10
10:51:51 UTC (rev 14718)
@@ -105,16 +105,12 @@
)
);
+ $data['datatable']['actions'][] = array();
+
if($this->bo->allow_create())
{
- array_unshift($data['form']['toolbar']['item'],
array(
- 'type' => 'link',
- 'value' => lang('New season'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiseason.add'))
- ));
+ $data['datatable']['new_item'] =
self::link(array('menuaction' => 'booking.uiseason.add'));
}
-
-// self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -139,6 +139,7 @@
)
)
);
+ $data['datatable']['actions'][] = array();
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/phpgwapi/inc/class.contacts_sql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.contacts_sql.inc.php
2016-02-10 08:21:15 UTC (rev 14717)
+++ branches/dev-syncromind/phpgwapi/inc/class.contacts_sql.inc.php
2016-02-10 10:51:51 UTC (rev 14718)
@@ -615,7 +615,7 @@
function __construct($session=True)
{
- $this->db = &$GLOBALS['phpgw']->db;
+ $this->db = clone($GLOBALS['phpgw']->db);
if(!is_object($GLOBALS['phpgw']->session))
{
$GLOBALS['phpgw']->session =
createObject('phpgwapi.sessions');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14718] buttons,
Sigurd Nes <=