[Fmsystem-commits] [12222] switch to jquery tabs

[Sigurd Nes]

Revision: 12222
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12222
Author:   sigurdne
Date:     2014-10-23 08:18:10 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
switch to jquery tabs

Modified Paths:
--------------
    branches/dev-syncromind/preferences/index.php
    branches/dev-syncromind/preferences/preferences.php

Modified: branches/dev-syncromind/preferences/index.php
===================================================================
--- branches/dev-syncromind/preferences/index.php       2014-10-23 08:17:50 UTC 
(rev 12221)
+++ branches/dev-syncromind/preferences/index.php       2014-10-23 08:18:10 UTC 
(rev 12222)
@@ -11,7 +11,8 @@
 
        $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags']['currentapp'] = 'preferences';
-       
+       $GLOBALS['phpgw_info']['flags']['noheader'] = true; //Wait for it
+
        /**
         * Include phpgroupware header
         */
@@ -59,33 +60,21 @@
        }
 
        $tabs = array();
-       $tabs[] = array(
+       $tabs['user'] = array(
                'label' => lang('Your preferences'),
                'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'user'))
        );
-       $tabs[] = array(
+       $tabs['default'] = array(
                'label' => lang('Default preferences'),
                'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'default'))
        );
-       $tabs[] = array(
+       $tabs['forced'] = array(
                'label' => lang('Forced preferences'),
                'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'forced'))
        );
+       $GLOBALS['phpgw']->template->set_var('tabs', 
$GLOBALS['phpgw']->common->create_tabs($tabs, $type));
+       $GLOBALS['phpgw']->common->phpgw_header(true);
 
-       switch($type)
-       {
-               case 'default':
-                       $selected = 1;
-                       break;
-               case 'forced':
-                       $selected = 2;
-                       break;
-               case 'user':
-               default:
-                       $selected = 0;
-       }
-       $GLOBALS['phpgw']->template->set_var('tabs', 
$GLOBALS['phpgw']->common->create_tabs($tabs, $selected));
-
        /**
         * Dump a row header
         * 

Modified: branches/dev-syncromind/preferences/preferences.php
===================================================================
--- branches/dev-syncromind/preferences/preferences.php 2014-10-23 08:17:50 UTC 
(rev 12221)
+++ branches/dev-syncromind/preferences/preferences.php 2014-10-23 08:18:10 UTC 
(rev 12222)
@@ -12,11 +12,11 @@
        (
                'noheader'                              => true,
                'noappheader'                   => true,
-               'nonavbar'                              => true,
+       //      'nonavbar'                              => true,
                'currentapp'                    => isset($_GET['appname']) ? 
htmlspecialchars($_GET['appname']) : 'preferences',
                'enable_nextmatchs'             => true
        );
-       
+
        /**
         * Include phpgroupware header
         */
@@ -620,7 +620,7 @@
 
        $GLOBALS['phpgw_info']['flags']['app_header'] = $appname == 
'preferences' ?
                lang('Preferences') : lang('%1 - Preferences', lang($appname) );
-       $GLOBALS['phpgw']->common->phpgw_header(true);
+//     $GLOBALS['phpgw']->common->phpgw_header(true);
 
        $t->set_var('messages',$error);
        
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php',
 array('appname'=> $appname, 'type' => $GLOBALS['type'])));
@@ -761,9 +761,11 @@
        {
                show_list();
        }
+
+       $GLOBALS['phpgw']->common->phpgw_header(true);
+
        $t->pfp('phpgw_body','preferences');
        
        //echo '<pre style="text-align: left;">'; 
print_r($GLOBALS['phpgw']->preferences->data); echo "</pre>\n";
        
-       $GLOBALS['phpgw']->common->phpgw_footer(true);
-?>
+       $GLOBALS['phpgw']->common->phpgw_footer(true);
\ No newline at end of file