[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17475] API: adjust to updated datatables
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17475] API: adjust to updated datatables |
|
Date: |
Tue, 26 Dec 2017 17:10:27 -0500 (EST) |
Revision: 17475
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17475
Author: sigurdne
Date: 2017-12-26 17:10:27 -0500 (Tue, 26 Dec 2017)
Log Message:
-----------
API: adjust to updated datatables
Modified Paths:
--------------
trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
trunk/phpgwapi/templates/aalesund/head.inc.php
trunk/phpgwapi/templates/bkbooking/head.inc.php
trunk/phpgwapi/templates/bookingfrontend/head.inc.php
trunk/phpgwapi/templates/frontend/head.inc.php
trunk/phpgwapi/templates/idsociety/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/portico/head.inc.php
trunk/phpgwapi/templates/probusiness/head.inc.php
trunk/phpgwapi/templates/pure/head.inc.php
trunk/phpgwapi/templates/simple/head.inc.php
trunk/phpgwapi/templates/verdilak/head.inc.php
Modified: trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon_jquery.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/inc/class.uicommon_jquery.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -77,16 +77,16 @@
phpgwapi_jquery::load_widget('contextMenu');
self::add_javascript('phpgwapi', "jquery", 'common.js');
- self::add_javascript('phpgwapi', 'DataTables',
'media/js/jquery.dataTables.min.js');
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Responsive/js/dataTables.responsive.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'DataTables/js/jquery.dataTables.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Responsive/js/dataTables.responsive.js');
//Buttons
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Buttons/js/dataTables.buttons.min.js');
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Buttons/js/buttons.colVis.min.js');
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Buttons/js/buttons.flash.js');
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Buttons/js/buttons.html5.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Buttons/js/dataTables.buttons.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Buttons/js/buttons.colVis.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Buttons/js/buttons.flash.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Buttons/js/buttons.html5.js');
self::add_javascript('phpgwapi', 'jszip',
'jszip.min.js');
- self::add_javascript('phpgwapi', 'DataTables',
'extensions/Select/js/dataTables.select.min.js');
-// self::add_javascript('phpgwapi', 'DataTables',
'extensions/ColReorder/js/dataTables.ColReorder.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'Select/js/dataTables.select.min.js');
+// self::add_javascript('phpgwapi', 'DataTables',
'ColReorder/js/dataTables.ColReorder.min.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
@@ -93,8 +93,8 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/media/css/jquery.dataTables.css');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/Responsive/css/dataTables.responsive.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/Buttons/css/buttons.dataTables.css');
//pop up script
self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
Modified: trunk/phpgwapi/templates/aalesund/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/aalesund/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/aalesund/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -51,7 +51,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
$stylesheets[] = "/{$app}/css/bookingfrontend.css";
$stylesheets[] = "/phpgwapi/templates/bookingfrontend/css/frontend.css";
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -54,7 +54,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
$stylesheets[] =
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-12-26
22:07:22 UTC (rev 17474)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-12-26
22:10:27 UTC (rev 17475)
@@ -51,7 +51,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
$stylesheets[] = "/{$app}/css/bookingfrontend.css";
$stylesheets[] = "/phpgwapi/templates/bookingfrontend/css/frontend.css";
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -67,7 +67,8 @@
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
}
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
// $stylesheets[] = "/{$app}/css/frontend.css";
$stylesheets[] = "/phpgwapi/templates/frontend/css/frontend.css";
Modified: trunk/phpgwapi/templates/idsociety/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/idsociety/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/idsociety/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -26,7 +26,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = '/phpgwapi/templates/idsociety/css/base.css';
$stylesheets[] =
"/phpgwapi/templates/idsociety/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-12-26
22:07:22 UTC (rev 17474)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-12-26
22:10:27 UTC (rev 17475)
@@ -23,7 +23,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
// $stylesheets[] = "/{$app}/templates/base/css/base.css";
$stylesheets[] = "/{$app}/templates/mobilefrontend/css/base.css";
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -51,7 +51,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/base/css/base.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
Modified: trunk/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/probusiness/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/probusiness/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -16,7 +16,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$css_file = PHPGW_SERVER_ROOT .
'/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
if (file_exists($css_file))
Modified: trunk/phpgwapi/templates/pure/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/pure/head.inc.php 2017-12-26 22:07:22 UTC (rev
17474)
+++ trunk/phpgwapi/templates/pure/head.inc.php 2017-12-26 22:10:27 UTC (rev
17475)
@@ -47,7 +47,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
// $stylesheets[] = "/phpgwapi/templates/base/css/base.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/side-menu.css";
Modified: trunk/phpgwapi/templates/simple/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/simple/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/simple/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -27,7 +27,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
{
Modified: trunk/phpgwapi/templates/verdilak/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/verdilak/head.inc.php 2017-12-26 22:07:22 UTC
(rev 17474)
+++ trunk/phpgwapi/templates/verdilak/head.inc.php 2017-12-26 22:10:27 UTC
(rev 17475)
@@ -30,7 +30,8 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = '/phpgwapi/templates/base/css/base.css';
$stylesheets[] = '/phpgwapi/templates/verdilak/css/base.css';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17475] API: adjust to updated datatables,
sigurdne <=