[evolvis-commits] r18403: theme-evolvis pending merges:↵ Thorsten Glaser 2012-05-11 move Site Admin back to a predictable place in the globalTabs

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 11 20:47:51 CEST 2012


Author: mirabilos
Date: 2012-05-11 20:47:49 +0200 (Fri, 11 May 2012)
New Revision: 18403

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
Log:
theme-evolvis pending merges:
  Thorsten Glaser 2012-05-11 move Site Admin back to a predictable place in the globalTabs

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2012-05-11 15:22:22 UTC (rev 18402)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2012-05-11 18:47:49 UTC (rev 18403)
@@ -239,7 +239,7 @@
                 }
 		}
                 
-		if (forge_get_config('use_trove') || forge_get_config('use_project_tags') || forge_get_config('use_project_full_list')) {
+		if (forge_get_config('use_trove') || forge_get_config('use_project_tags') || forge_get_config('use_project_full_list') || forge_check_global_perm('forge_admin'))) {
 			$menu['titles'][] = _('Projects');
 			$menu['urls'][] = util_make_uri('/softwaremap/') ;
 			$menu['tooltips'][] = _('List of all publicly accessible projects');
@@ -247,7 +247,18 @@
 				$selected=count($menu['urls'])-1;
 			}
 		}
-                 
+
+		// Admin
+		if (forge_check_global_perm('forge_admin')) {
+			$user_is_super = true;
+			$menu['titles'][] = _('Site Admin');
+			$menu['urls'][] = util_make_uri('/admin/');
+			$menu['tooltips'][] = _('Global Forge Administration');
+			if (strstr($request_uri, util_make_uri('/admin/'))) {
+				$selected=count($menu['urls'])-1;
+			}
+		}
+
 		if (forge_get_config('use_snippet')) {
 			$menu['titles'][] = _('Code Snippets');
 			$menu['urls'][] = util_make_uri('/snippet/') ;
@@ -266,16 +277,7 @@
 			}
 		}
 
-		// Admin and Reporting 
-		if (forge_check_global_perm ('forge_admin')) {
-			$user_is_super = true;
-			$menu['titles'][] = _('Site Admin');
-			$menu['urls'][] = util_make_uri('/admin/') ;
-			$menu['tooltips'][] = _('Global Forge Administration');
-			if (strstr($request_uri, util_make_uri('/admin/'))) {
-				$selected=count($menu['urls'])-1;
-			}
-		}
+		// Reporting
 		if (forge_check_global_perm ('forge_stats', 'read')) {
 			$menu['titles'][] = _('Reporting');
 			$menu['urls'][] = util_make_uri('/reporting/') ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-11 15:22:22 UTC (rev 18402)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-11 18:47:49 UTC (rev 18403)
@@ -1,3 +1,9 @@
+fusionforge (1:5.1.1+evolvis59) xunstable; urgency=low
+
+  * Move Site Admin globalTab to a predictable place
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 11 May 2012 20:31:56 +0200
+
 fusionforge (1:5.1.1+evolvis58) unstable; urgency=low
 
   [ Roland Mas ]



More information about the evolvis-commits mailing list