X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FNavigation.php;h=61ace959997cb6d1a3b6d10b033245186f9c9e68;hb=8960d9b994132446a85ecd6bf71ee5a6bc0083da;hp=3ad5ca88c8bb0fe73a57a94ccd15ec96045e6085;hpb=09dd8985554fc8f32aceec8df84949030bd1f84c;p=civicrm-core.git
diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 3ad5ca88c8..61ace95999 100644
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -577,12 +577,11 @@ ORDER BY parent_id, weight";
//add additional navigation items
$logoutURL = CRM_Utils_System::url('civicrm/logout', 'reset=1');
- $appendString = "
" . ts('Logout') . "";
// get home menu from db
$homeParams = array('name' => 'Home');
$homeNav = array();
- $homeIcon = '
';
+ $homeIcon = '
';
self::retrieve($homeParams, $homeNav);
if ($homeNav) {
list($path, $q) = explode('&', $homeNav['url']);
@@ -597,25 +596,32 @@ ORDER BY parent_id, weight";
$homeURL = CRM_Utils_System::url('civicrm/dashboard', 'reset=1');
$homeLabel = ts('CiviCRM Home');
}
-
+ // Link to hide the menubar
if (
($config->userSystem->is_drupal) &&
((module_exists('toolbar') && user_access('access toolbar')) ||
module_exists('admin_menu') && user_access('access administration menu')
)
) {
- $prepandString = '' . $homeIcon . "";
+ $hideLabel = ts('Drupal Menu');
}
elseif ($config->userSystem->is_wordpress) {
- $prepandString = '' . $homeIcon . "";
+ $hideLabel = ts('WordPress Menu');
}
else {
- $prepandString = "' . $homeIcon . "";
+ $hideLabel = ts('Hide Menu');
}
- $navigation = $prepandString . $navigation . $appendString;
+ $prepandString = "
+ $homeIcon
+ ";
+ // tag doesn't need to be closed
}
- return $navigation;
+ return $prepandString . $navigation;
}
/**