[Fmsystem-commits] [7644] controller: example on seprate tabs and inline tables

[Sigurd Nes]

Revision: 7644
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7644
Author:   sigurdne
Date:     2011-09-18 12:05:13 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
controller: example on seprate tabs and inline tables

Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.uicontrol_item2.inc.php
    trunk/controller/js/yahoo/common.js

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2011-09-17 21:18:15 UTC (rev 
7643)
+++ trunk/controller/inc/class.menu.inc.php     2011-09-18 12:05:13 UTC (rev 
7644)
@@ -53,7 +53,15 @@
                                                                        'text'  
=> lang('control_item_list') . 2,
                                                                        'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.display_control_items', 'appname' => 'controller') 
),
                                                                        'image' 
=> array('rental', 'x-office-spreadsheet')
-                                                               )
+                                                               ),
+                                                               'separate_tabs' 
=> array
+
+                                                               (
+                                                                       'text'  
=> 'example::separate_tabs',
+                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs', 'type' => 'default') ),
+                                                                       'image' 
=> array('rental', 'x-office-spreadsheet')
+                                                               ),
+                                                               
                                                        )
                        ),
                                'procedure' => array

Modified: trunk/controller/inc/class.uicontrol_item2.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item2.inc.php  2011-09-17 21:18:15 UTC 
(rev 7643)
+++ trunk/controller/inc/class.uicontrol_item2.inc.php  2011-09-18 12:05:13 UTC 
(rev 7644)
@@ -17,6 +17,7 @@
                (
                        'index'                                 => true,
                        'display_control_items' => true,
+                       'separate_tabs'                 => true,
                        'delete'                                => true,
                        'js_poll'                               => true
                );
@@ -123,6 +124,54 @@
                }
 
 
+               public function separate_tabs()
+               {
+                       
self::set_active_menu('controller::control_item2::separate_tabs');
+
+            $type =  phpgw::get_var('type', 'string', 'REQUEST', null);
+
+                       $tabs = array();
+                       $tabs[] = array(
+                               'label' => lang('Your preferences'),
+                               'link'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs', 'type' => 'user'))
+                       );
+                       $tabs[] = array(
+                               'label' => lang('Default preferences'),
+                               'link'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs', 'type' => 'default'))
+                       );
+                       $tabs[] = array(
+                               'label' => lang('Forced preferences'),
+                               'link'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs', 'type' => 'forced'))
+                       );
+
+                       switch($type)
+                       {
+                               case 'default':
+                                       $selected = 1;
+                                       $resource_id = 81;
+                                       break;
+                               case 'forced':
+                                       $selected = 2;
+                                       $resource_id = 46;
+                                       break;
+                               case 'user':
+                               default:
+                                       $selected = 0;
+                                       $resource_id = 80;
+                       }
+
+                       $add_document_link = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol_item2.index') );
+                       $resource = array('id' => $resource_id, 
'add_document_link' => $add_document_link, 'permission' => array('write' => 
true ) );
+
+                       $data = array
+                       (
+                               'tabs'  => 
$GLOBALS['phpgw']->common->create_tabs($tabs, $selected),
+                               'resource'      => $resource
+                       );
+                       self::render_template_xsl('example_separate_tabs', 
$data);
+               }
+
+
                public function display_control_items()
                {
                        
self::set_active_menu('controller::control_item2::control_item_list2');

Modified: trunk/controller/js/yahoo/common.js
===================================================================
--- trunk/controller/js/yahoo/common.js 2011-09-17 21:18:15 UTC (rev 7643)
+++ trunk/controller/js/yahoo/common.js 2011-09-18 12:05:13 UTC (rev 7644)
@@ -202,7 +202,7 @@
        
        if(!disablePagination) {
                options.paginator = 
YAHOO.portico.setupInlineTablePaginator(paginatorContainer);
-               url += 'results=' + options.paginator.getRowsPerPage() + '&';
+               url += '&results=' + options.paginator.getRowsPerPage() + '&';
        }
        var myDataSource = new YAHOO.util.DataSource(url);
        myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;