[Fmsystem-commits] [9673] api : uicommon

[Sigurd Nes]

Revision: 9673
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9673
Author:   sigurdne
Date:     2012-06-26 14:15:52 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
api : uicommon

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.uicommon.inc.php
    trunk/phpgwapi/js/yahoo/datatable.js
    trunk/phpgwapi/templates/base/datatable_common.xsl

Modified: trunk/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon.inc.php   2012-06-26 14:15:04 UTC (rev 
9672)
+++ trunk/phpgwapi/inc/class.uicommon.inc.php   2012-06-26 14:15:52 UTC (rev 
9673)
@@ -67,6 +67,9 @@
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/base');
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']);
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/' . $GLOBALS['phpgw_info']['flags']['currentapp'] . '/templates/base');
+
+
+                       phpgwapi_yui::load_widget('dragdrop');
                        phpgwapi_yui::load_widget('datatable');
                        phpgwapi_yui::load_widget('history');
                        phpgwapi_yui::load_widget('paginator');
@@ -374,7 +377,7 @@
 
                        return array(   
                                'ResultSet' => array(
-                                       'totalRecords'          => 
$results['total_records'],
+                                       'totalResultsAvailable' => 
$results['total_records'],
                                        'recordsReturned'       => 
count($results['results']),
                                        'startIndex'            => 
$results['start'], 
                                        'sortKey'                       => 
$results['sort'], 
@@ -384,6 +387,7 @@
                        );  
                }
 
+
                public function use_yui_editor($targets)
                {
                        /*

Modified: trunk/phpgwapi/js/yahoo/datatable.js
===================================================================
--- trunk/phpgwapi/js/yahoo/datatable.js        2012-06-26 14:15:04 UTC (rev 
9672)
+++ trunk/phpgwapi/js/yahoo/datatable.js        2012-06-26 14:15:52 UTC (rev 
9673)
@@ -63,11 +63,11 @@
     if(baseUrl[baseUrl.length - 1] != '&') {
         baseUrl += '&';
     }
-    
+
     if (YAHOO.portico.initialSortedBy) {
-      baseUrl += 'sort=' + YAHOO.portico.initialSortedBy.key + '&dir=' + 
YAHOO.portico.initialSortedBy.dir;
+//      baseUrl += 'sort=' + YAHOO.portico.initialSortedBy.key + '&dir=' + 
YAHOO.portico.initialSortedBy.dir;
     } else {
-      baseUrl += 'sort=' + fields[0];
+//      baseUrl += 'sort=' + fields[0];
     }
        
          baseUrl += '&results=' + pag.getRowsPerPage() + '&';
@@ -98,6 +98,23 @@
     };
     myDataTable.sortColumn = handleSorting;
 
+       /* from Property*/
+       myDataTable.subscribe("rowMouseoverEvent", 
myDataTable.onEventHighlightRow);
+       /* from Property*/
+       myDataTable.subscribe("rowMouseoutEvent", 
myDataTable.onEventUnhighlightRow);
+
+
+       for(var i=0; i < YAHOO.portico.columnDefs.length;i++)
+       {
+               if( YAHOO.portico.columnDefs[i].sortable )
+               {
+                       YAHOO.util.Dom.getElementsByClassName( 
'yui-dt-resizerliner' , 'div' )[i].style.background  = '#D8D8DA 
url(phpgwapi/js/yahoo/assets/skins/sam/sprite.png) repeat-x scroll 0 -100px';
+               }
+               //title columns alwyas center
+//             YAHOO.util.Dom.getElementsByClassName( 'yui-dt-resizerliner', 
'div' )[0].style.textAlign = 'center';
+       }
+
+
     var handlePagination = function(state) {
         var sortedBy  = this.get("sortedBy");
         var newState = getState(sortedBy.key, sortedBy.dir, 
state.recordOffset);

Modified: trunk/phpgwapi/templates/base/datatable_common.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_common.xsl  2012-06-26 14:15:04 UTC 
(rev 9672)
+++ trunk/phpgwapi/templates/base/datatable_common.xsl  2012-06-26 14:15:52 UTC 
(rev 9673)
@@ -232,12 +232,13 @@
                        YAHOO.portico.columnDefs = [
                                <xsl:for-each select="//datatable/field">
                                        {
+                                               resizeable: true,
                                                key: "<xsl:value-of 
select="key"/>",
                                                <xsl:if test="label">
                                                label: "<xsl:value-of 
select="label"/>",
                                            </xsl:if>
                                                sortable: <xsl:value-of 
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
-                                               <xsl:if test="hidden">
+                                               <xsl:if test="hidden=1">
                                                hidden: true,
                                            </xsl:if>
                                                <xsl:if test="formatter">