phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] api/class.phpgw.php, 1.1.1.1.2.44


From: nomail
Subject: [Phpgroupware-cvs] api/class.phpgw.php, 1.1.1.1.2.44
Date: Sun, 23 May 2004 05:18:28 -0000

Update of /api
Modified Files:
        Branch: proposal-branch
          class.phpgw.php

date: 2004/05/01 00:09:55;  author: jengo;  state: Exp;  lines: +17 -7

Log Message:
Split the js menus and non js menus into different files, normal menus are 
default ... there is currently a problem with preferences not loading correctly 
bewteeen the API and apps
=====================================================================
Index: api/class.phpgw.php
diff -u api/class.phpgw.php:1.1.1.1.2.43 api/class.phpgw.php:1.1.1.1.2.44
--- api/class.phpgw.php:1.1.1.1.2.43    Fri Apr 16 20:59:48 2004
+++ api/class.phpgw.php Sat May  1 00:09:55 2004
@@ -24,8 +24,9 @@
        /* $Id$ */
        /* $Source$ */
 
-       $GLOBALS['docs']['api']['classes']['api_phpgw'] = array(
-               'abstract'=>'Central handler class in the api.'
+       $GLOBALS['docs']['api']['classes']['api_phpgw'] = array
+       (
+               'abstract' => 'Central handler class in the api.'
        );
 
        class api_phpgw
@@ -354,13 +355,22 @@
                        }
 
                        /* Check to see if we should load the main xsl */
-                       if($args['loadmainxsl'])
+                       if ($args['loadmainxsl'])
                        {
-                               $this->add_xsl('api.phpgw');
+                               //html_print_r($GLOBALS['phpgw_data']);
+                               //echo '<!-- IN IF: ' . 
$GLOBALS['phpgw_data']['prefs']['api.js_menus'] . '-->';
+                               if 
($GLOBALS['phpgw_data']['prefs']['api.js_menus'] == 'yes')
+                               {
+                                       $this->add_xsl('api.phpgw_js_menu');
+                               }
+                               else
+                               {
+                                       $this->add_xsl('api.phpgw');
+                               }
                        }
 
                        /* Add the css files to the API XML node */
-                       if($args['loadmaincss'])
+                       if ($args['loadmaincss'])
                        {
                                $this->add_css('api.default');
                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]