[Phpgroupware-cvs] admin inc/class.uimainscreen.inc.php inc/hook_a...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Branch:         
Changes by:     Dave Hall <address@hidden>      06/03/12 11:19:49

Modified files:
        inc            : class.uimainscreen.inc.php hook_admin.inc.php 
        templates/desktop/images: navbar.png 
Added files:
        inc            : class.bo_custom_fields.inc.php 
                         class.ui_custom_fields.inc.php 
        js/base        : custom_fields.js 
        templates/base : custom_fields.xsl 
        templates/desktop/css: desktop.css 

Log message:
        new functionality - global custom fields management - WIP

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.bo_custom_fields.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.ui_custom_fields.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uimainscreen.inc.php.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/hook_admin.inc.php.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/js/base/custom_fields.js?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/templates/base/custom_fields.xsl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/templates/desktop/css/desktop.css?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/templates/desktop/images/navbar.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: admin/inc/class.uimainscreen.inc.php
diff -u admin/inc/class.uimainscreen.inc.php:1.16 
admin/inc/class.uimainscreen.inc.php:1.17
--- admin/inc/class.uimainscreen.inc.php:1.16   Tue Mar  7 01:00:35 2006
+++ admin/inc/class.uimainscreen.inc.php        Sun Mar 12 11:19:48 2006
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.uimainscreen.inc.php,v 1.16 2006/03/07 01:00:35 skwashd 
Exp $ */
+       /* $Id: class.uimainscreen.inc.php,v 1.17 2006/03/12 11:19:48 skwashd 
Exp $ */
 
        class uimainscreen
        {
@@ -33,7 +33,7 @@
                        }
 
                        $GLOBALS['phpgw']->hooks->process('admin');
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => 
$GLOBALS['phpgw']->common->output));
+                       $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('list' => $GLOBALS['phpgw']->common->output));
                }
 
                function index()
Index: admin/inc/hook_admin.inc.php
diff -u admin/inc/hook_admin.inc.php:1.38 admin/inc/hook_admin.inc.php:1.39
--- admin/inc/hook_admin.inc.php:1.38   Mon Feb 20 13:31:00 2006
+++ admin/inc/hook_admin.inc.php        Sun Mar 12 11:19:48 2006
@@ -8,7 +8,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.38 2006/02/20 13:31:00 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.39 2006/03/12 11:19:48 skwashd Exp $ */
 
        if (! $GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
        {
@@ -48,6 +48,11 @@
                $file['Global Categories'] = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index') );
        }
 
+       if (! $GLOBALS['phpgw']->acl->check('custom_fields_access',1,'admin'))
+       {
+               $file['custom fields'] = $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.ui_custom_fields.index', 'appname' => 'admin') );
+       }
+
        if 
(!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',1,'admin') || 
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',2,'admin'))
        {
                $file['Change Main Screen Message'] = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uimainscreen.index') );
Index: admin/templates/desktop/images/navbar.png