[Fmsystem-commits] [14737] minor tweaks

[Sigurd Nes]

Revision: 14737
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14737
Author:   sigurdne
Date:     2016-02-15 12:38:38 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
minor tweaks

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
    trunk/phpgwapi/templates/base/datatable_jquery.xsl
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon_jquery.inc.php    2016-02-14 11:28:13 UTC 
(rev 14736)
+++ trunk/phpgwapi/inc/class.uicommon_jquery.inc.php    2016-02-15 12:38:38 UTC 
(rev 14737)
@@ -78,12 +78,11 @@
                        phpgwapi_jquery::load_widget('core');
                        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', 
'extensions/ColVis/js/dataTables.colVis.min.js');
-//                     self::add_javascript('phpgwapi', 'DataTables', 
'extensions/TableTools/js/dataTables.tableTools.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', 
'extensions/Select/js/dataTables.select.min.js');
 
                        self::add_javascript('phpgwapi', 'jquery', 
'editable/jquery.jeditable.js');
@@ -92,9 +91,6 @@
 
                        
$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/ColVis/css/dataTables.colVis.min.css');
-//                     
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colvis.jqueryui.css');
-//                     
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css');
 
                        //pop up script

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-02-14 11:28:13 UTC 
(rev 14736)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-02-15 12:38:38 UTC 
(rev 14737)
@@ -633,13 +633,14 @@
                                                },
                                        </xsl:when>
                                </xsl:choose>
-                               {
-                               extend: 'copy',
-                               text: "<xsl:value-of 
select="php:function('lang', 'copy')"/>"
-                               },
-                               'csvFlash',
+//                             {
+//                             extend: 'copyHtml5',
+//                             text: "<xsl:value-of 
select="php:function('lang', 'copy')"/>"
+//                             },
+//                             'csvHtml5',
+//                             'excelHtml5',
+//                             'pdfHtml5'
                                'excelFlash',
-                               'pdfFlash'
                                <xsl:choose>
                                        <xsl:when test="download">
                                                ,{

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-02-14 11:28:13 UTC (rev 
14736)
+++ trunk/property/inc/class.uitts.inc.php      2016-02-15 12:38:38 UTC (rev 
14737)
@@ -608,7 +608,7 @@
                                'list' => $values_combo_box[3]
                        );
 
-                       //              if(!$this->simple)
+                       if(!$this->simple)
                        {
                                $values_combo_box[0] = 
$this->cats->formatted_xslt_list(array('format' => 'filter',
                                        'selected' => $this->cat_id, 'globals' 
=> true, 'use_acl' => $this->_category_acl));