Remove "administration" link from header. It is available in the "My Page" menu. This allows a cleaner and more consistent header layout for admins/non-admins alike.

6 files changed, 8 insertions, 34 deletions

diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index 74bd229b0c..c8c0cfae15 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -110,12 +110,8 @@ if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) { ?>
 if (empty($SEARCH_SPIDER)) {
 	echo '<td valign="middle" align="center"><div class="blanco" style="COLOR: #6699ff;" >';
 	if (WT_USER_ID) {
-		echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a><br />';
-		if (WT_USER_GEDCOM_ADMIN) {
-			echo '<a href="admin.php" class="link">', WT_I18N::translate('Administration'), '</a> | ';
-		}
-		echo logout_link();
-	} elseif (empty($SEARCH_SPIDER)) {
+		echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
+	} else {
 		echo login_link();
 	}
 	echo '</div></td>',
diff --git a/themes/colors/header.php b/themes/colors/header.php
index 4e13876af3..aede82cfde 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -114,19 +114,14 @@ if ($view!='simple') {
 	if (empty($SEARCH_SPIDER)) {
 		echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">';
 		if (WT_USER_ID) {
-			echo
-				'<li><a href="edituser.php" class="icon_color">', getUserFullName(WT_USER_ID), '</a></li>',
-				' | <li>', logout_link('class="icon_color"'), '</li>';
-			if (WT_USER_GEDCOM_ADMIN) {
-				echo ' | <li><a href="admin.php" class="icon_color">', WT_I18N::translate('Administration'), '</a></li>';
-			}
+			echo '<li><a href="edituser.php" class="icon_color">', getUserFullName(WT_USER_ID), '</a></li> | <li>', logout_link('class="icon_color"'), '</li>';
 			if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 				echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 			}
 		} else {
 			echo '<li>', login_link('class="icon_color"'), '</li>';
 		}
-		echo '<span class="link"> | ', WT_MenuBar::getFavoritesMenu()->getMenuAsList();
+		echo ' | <span class="link">', WT_MenuBar::getFavoritesMenu()->getMenuAsList();
 		$language_menu=WT_MenuBar::getLanguageMenu();
 		if ($language_menu) {
 			echo ' | ', $language_menu->getMenuAsList();
diff --git a/themes/fab/header.php b/themes/fab/header.php
index 8aa6dc72f6..292c706daf 100644
--- a/themes/fab/header.php
+++ b/themes/fab/header.php
@@ -94,12 +94,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows
 		// Options for real users
 		echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">';
 		if (WT_USER_ID) {
-			echo
-				'<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li>',
-				' | <li>', logout_link(), '</li>';
-			if (WT_USER_GEDCOM_ADMIN) {
-				echo ' | <li><a href="admin.php" class="link">', WT_I18N::translate('Administration'), '</a></li>';
-			}
+			echo '<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li> | <li>', logout_link(), '</li>';
 			if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 				echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 			}
diff --git a/themes/minimal/header.php b/themes/minimal/header.php
index 7a1e332503..01c7179455 100644
--- a/themes/minimal/header.php
+++ b/themes/minimal/header.php
@@ -94,11 +94,7 @@ if (!defined('WT_WEBTREES')) {
 			<td align="center" valign="middle">
 			<?php
 				if (WT_USER_ID) {
-					echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a><br />';
-					if (WT_USER_GEDCOM_ADMIN) {
-						echo '<a href="admin.php" class="link">', WT_I18N::translate('Administration'), '</a> | ';
-					}
-					echo logout_link();
+					echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
 				} elseif (empty($SEARCH_SPIDER)) {
 					echo login_link();
 				}
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index 8f7ae31dad..4d801c526c 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -94,11 +94,7 @@ if ($view!='simple') {
 					'<div align="center">',
 					'<b>';
 	if (WT_USER_ID) {
-		echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a><br />';
-		if (WT_USER_GEDCOM_ADMIN) {
-			echo '<a href="admin.php" class="link">', WT_I18N::translate('Administration'), '</a> | ';
-		}
-		echo logout_link();
+		echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
 	} elseif (empty($SEARCH_SPIDER)) {
 		echo login_link();
 	}
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
index 26268f4f79..52bff4e3aa 100644
--- a/themes/xenea/header.php
+++ b/themes/xenea/header.php
@@ -131,11 +131,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA
 				<td><div align="center" >
 				<?php
 					if (WT_USER_ID) {
-						echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a><br />';
-						if (WT_USER_GEDCOM_ADMIN) {
-							echo '<a href="admin.php" class="link">', WT_I18N::translate('Administration'), '</a> | ';
-						}
-						echo logout_link();
+						echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
 					} elseif (empty($SEARCH_SPIDER)) {
 						echo login_link();
 					}