thomas: server/kolab-webadmin/kolab-webadmin/php/admin/include menu.php, 1.21, 1.22

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv4806/kolab-webadmin/kolab-webadmin/php/admin/include

Modified Files:
	menu.php 
Log Message:
kolab-webadmin: Reverted extra spaces after the main menu entries.
This does not look good.

cvs diff -u -d -r1.17 -r1.20 kolab-webadmin/kolab-webadmin/php/admin/include/menu.php|patch -s -p0 -R
(and fix reject because of services now named settings)


Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- menu.php	28 Feb 2008 21:18:49 -0000	1.21
+++ menu.php	4 Mar 2008 14:51:03 -0000	1.22
@@ -23,7 +23,7 @@
 $menuitems = array();
 
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) {
-  $menuitems['user'] = array( 'name' => _('Users').' ',
+  $menuitems['user'] = array( 'name' => _('Users'),
 							  'url'  => $topdir.'/user/',
 							  'title' => _('Manage Email Users'),
 							  'submenu' => array( 
@@ -42,7 +42,7 @@
 														'url'  => 'vacation.php' )));
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer") {
-  $menuitems['addressbook'] = array( 'name' => _('Addressbook').' ',
+  $menuitems['addressbook'] = array( 'name' => _('Addressbook'),
 									 'url'  => $topdir.'/addressbook/',
 									 'title' => _('Manage Address Book'),
 									 'submenu' => array( 
@@ -51,7 +51,7 @@
 
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
-  $menuitems['sf'] = array( 'name' => _('Shared Folder').' ',
+  $menuitems['sf'] = array( 'name' => _('Shared Folder'),
 							'url'  => $topdir.'/sharedfolder/',
 							'title' => _('Manage Shared Folders'),
 							'submenu' => array( 
@@ -59,7 +59,7 @@
 													  'url' => 'sf.php?action=create' )));  
 }
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['distlist'] = array( 'name' => _('Distribution Lists').' ',
+  $menuitems['distlist'] = array( 'name' => _('Distribution Lists'),
 									   'url'  => $topdir.'/distributionlist/',
 									   'title' => _('Manage Distribution Lists'),
 									   'submenu' => array(
@@ -67,19 +67,19 @@
    															 'url'   => 'list.php?action=create' ) ) );
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['administrator'] = array( 'name' => _('Administrators').' ',
+  $menuitems['administrator'] = array( 'name' => _('Administrators'),
 									   'url'  => $topdir.'/administrator/',
 									   'title' => _('Manage Administrators'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Administrator'),
 																 'url'   => 'admin.php?action=create' ) ) );
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Domain Maintainer'),
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/',
 									'title' => _('Manage Maintainers'),
 									'submenu' => array(
@@ -87,10 +87,10 @@
 															  'url'   => 'maintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Maintainer') );  
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
@@ -98,12 +98,12 @@
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'domain-maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									'url'  => $topdir.'/domainmaintainer/domainmaintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Domain Maintainer') );  
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['service'] = array( 'name' => _('Settings').' ',
+  $menuitems['service'] = array( 'name' => _('Settings'),
 								 'url'  => $topdir.'/settings/',
 								 'title' => _('System Settings') );
 }
@@ -112,19 +112,19 @@
 							 'url'  => $topdir.'/kolab/',
 							 'title' => _('About Kolab'),
 							 'submenu' => array( 
-												array( 'name' => _('Erfrakon').' ',
+												array( 'name' => _('Erfrakon'),
 													   'url'  => 'erfrakon.php' ),
-												array( 'name' => _('Intevation').' ',
+												array( 'name' => _('Intevation'),
 													   'url'  => 'intevation.php' ),
-												array( 'name' => _('Klarälvdalens Datakonsult').' ',
+												array( 'name' => _('Klarälvdalens Datakonsult'),
 													   'url'  => 'kdab.php' ),
 												array( 'name' => _('Code Fusion'),
 													   'url'  => 'codefusion.php' ),
-												array( 'name' => _('KDE').' ',
+												array( 'name' => _('KDE'),
 													   'url'  => 'kde.php' )
 												));
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['about']['submenu'][] = array( 'name' => _('Versions').' ',
+  $menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
 											'url'  => 'versions.php' );
 }