omit "Actions" if no actions ...

This commit is contained in:
Sebastian Mendel
2008-07-09 14:05:13 +00:00
parent c77ab35eb5
commit 3483d15075

View File

@@ -54,56 +54,49 @@ $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
echo '<div id="maincontainer">' . "\n"; echo '<div id="maincontainer">' . "\n";
echo '<div id="main_pane_left">'; echo '<div id="main_pane_left">';
echo '<div class="group">';
echo '<h2>' . $strActions . '</h2>';
echo '<ul>'; if ($server > 0
/** || (! $cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1)) {
* Displays the MySQL servers choice form echo '<div class="group">';
*/ echo '<h2>' . $strActions . '</h2>';
if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) { echo '<ul>';
echo '<li id="li_select_server">';
require_once './libraries/select_server.lib.php';
PMA_select_server(true, true);
echo '</li>';
}
/** /**
* Displays the mysql server related links * Displays the MySQL servers choice form
*/ */
if ($server > 0) { if (! $cfg['LeftDisplayServers']
require_once './libraries/check_user_privileges.lib.php'; && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
$is_superuser = PMA_isSuperuser(); echo '<li id="li_select_server">';
require_once './libraries/select_server.lib.php';
if ($cfg['Server']['auth_type'] == 'config') { PMA_select_server(true, true);
$cfg['ShowChgPassword'] = false; echo '</li>';
} }
/** /**
* Change password * Displays the mysql server related links
*
* @todo ? needs another message
*/ */
if ($cfg['ShowChgPassword']) { if ($server > 0) {
PMA_printListItem($strChangePassword, 'li_change_password', require_once './libraries/check_user_privileges.lib.php';
'./user_password.php?' . $common_url_query);
} // end if
// Logout for advanced authentication // Logout for advanced authentication
if ($cfg['Server']['auth_type'] != 'config') { if ($cfg['Server']['auth_type'] != 'config') {
$http_logout = ($cfg['Server']['auth_type'] == 'http') PMA_printListItem($strChangePassword, 'li_change_password',
? '<a href="./Documentation.html#login_bug" target="documentation">' './user_password.php?' . $common_url_query);
. ($cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)') . '</a>'
: '';
PMA_printListItem('<strong>' . $strLogout . '</strong> ' . $http_logout,
'li_log_out',
'./index.php?' . $common_url_query . '&amp;old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent');
} // end if
} // end of if ($server > 0) $http_logout = ($cfg['Server']['auth_type'] == 'http')
? '<a href="./Documentation.html#login_bug" target="documentation">'
. ($cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)') . '</a>'
: '';
PMA_printListItem('<strong>' . $strLogout . '</strong> ' . $http_logout,
'li_log_out',
'./index.php?' . $common_url_query . '&amp;old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent');
} // end if
} // end of if ($server > 0)
echo '</ul>';
echo '</div>';
}
echo '</ul>';
echo '</div>';
if ($server > 0) { if ($server > 0) {
echo '<div class="group">'; echo '<div class="group">';