nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaked main page layout

Browse Source
This commit is contained in:
Sebastian Mendel
2008-07-09 12:40:17 +00:00
parent a147613e3a
commit c28818ecee
3 changed files with 93 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
main.php
View File

@@ -30,11 +30,44 @@ if ($server > 0) {
require './libraries/server_links.inc.php'; require './libraries/server_links.inc.php';
} }
// robbat2: Use the verbose name of the server instead of the hostname
// if a value is set
$server_info = '';
if (! empty($cfg['Server']['verbose'])) {
$server_info .= htmlspecialchars($cfg['Server']['verbose']);
if ($GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ' (';
}
}
if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) {
$server_info .= PMA_DBI_get_host_info();
}
if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ')';
}
$mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();');
// should we add the port info here?
$short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
? $GLOBALS['cfg']['Server']['verbose']
: $GLOBALS['cfg']['Server']['host']);
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="box">'; echo '<div class="group">';
echo '<h2>' . $strActions . '</h2>'; echo '<h2>' . $strActions . '</h2>';
echo '<ul>';
/**
* Displays the MySQL servers choice form
*/
if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
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 server related links
*/ */
@@ -45,15 +78,6 @@ if ($server > 0) {
if ($cfg['Server']['auth_type'] == 'config') { if ($cfg['Server']['auth_type'] == 'config') {
$cfg['ShowChgPassword'] = false; $cfg['ShowChgPassword'] = false;
} }
}
if ($server > 0) {
echo '<ul>';
if ($cfg['ShowCreateDb']) {
echo '<li id="li_create_database">';
require './libraries/display_create_database.lib.php';
echo '</li>' . "\n";
}
/** /**
* Change password * Change password
@@ -77,76 +101,22 @@ if ($server > 0) {
} // end if } // end if
} // end of if ($server > 0) } // end of if ($server > 0)
?>
<?php
/**
* Displays the MySQL servers choice form
*/
if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
if ($server == 0) {
echo '<ul>';
}
echo '<li id="li_select_server">';
require_once './libraries/select_server.lib.php';
PMA_select_server(true, true);
echo '</li>';
}
echo '</ul>'; echo '</ul>';
echo '</div>'; echo '</div>';
echo '<div class="box">';
if ($server > 0) {
echo '<h2>' . $strMySQLServerInformation . '</h2>';
// robbat2: Use the verbose name of the server instead of the hostname
// if a value is set
$server_info = '';
if (! empty($cfg['Server']['verbose'])) {
$server_info .= htmlspecialchars($cfg['Server']['verbose']);
if ($GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ' (';
}
}
if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) {
$server_info .= PMA_DBI_get_host_info();
}
if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ')';
}
$mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();');
// should we add the port info here?
$short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
? $GLOBALS['cfg']['Server']['verbose']
: $GLOBALS['cfg']['Server']['host']);
//echo '<h3><span xml:lang="en" dir="ltr">' . $short_server_info . '</span></h3>' . "\n";
unset($short_server_info);
}
if ($server > 0) { if ($server > 0) {
echo '<div class="group">';
echo '<h2>MySQL ' . $short_server_info . '</h2>';
echo '<ul>' . "\n"; echo '<ul>' . "\n";
if ($GLOBALS['cfg']['ShowServerInfo']) { if ($cfg['ShowCreateDb']) {
PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); echo '<li id="li_create_database">';
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version'); require './libraries/display_create_database.lib.php';
PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), echo '</li>' . "\n";
'li_mysql_proto');
PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
'li_user_info');
} else {
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version');
PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info');
} }
echo ' <li id="li_select_mysql_charset">'; echo ' <li id="li_select_mysql_collation">';
echo ' ' . $strMySQLCharset . ': '
. ' <strong xml:lang="en" dir="ltr">'
. ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n"
. ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n"
. ' </strong>' . "\n"
. ' </li>' . "\n"
. ' <li id="li_select_mysql_collation">';
echo ' <form method="post" action="index.php" target="_parent">' . "\n" echo ' <form method="post" action="index.php" target="_parent">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n" . ' <label for="select_collation_connection">' . "\n"
@@ -158,14 +128,12 @@ if ($server > 0) {
. PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n"
. ' </form>' . "\n" . ' </form>' . "\n"
. ' </li>' . "\n"; . ' </li>' . "\n";
echo ' </ul>'; echo ' </ul>';
echo ' </div>'; echo ' </div>';
} }
echo '</div>'; echo '<div class="group">';
echo '<div id="main_pane_right">';
echo '<div class="box">';
echo '<h2>' . $strInterface . '</h2>'; echo '<h2>' . $strInterface . '</h2>';
echo ' <ul>'; echo ' <ul>';
@@ -192,8 +160,38 @@ echo '</li>';
echo '</ul>'; echo '</ul>';
echo '</div>'; echo '</div>';
echo '</div>';
echo '<div id="main_pane_right">';
if ($server > 0) { if ($server > 0) {
echo '<div class="box">'; echo '<div class="group">';
echo '<h2>' . $strMySQLServerInformation . '</h2>';
echo '<ul>' . "\n";
PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info');
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version');
if ($GLOBALS['cfg']['ShowServerInfo']) {
PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
'li_mysql_proto');
PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
'li_user_info');
}
echo ' <li id="li_select_mysql_charset">';
echo ' ' . $strMySQLCharset . ': '
. ' <strong xml:lang="en" dir="ltr">'
. ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n"
. ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n"
. ' </strong>' . "\n"
. ' </li>' . "\n";
echo ' </ul>';
echo ' </div>';
}
if ($server > 0) {
echo '<div class="group">';
echo '<h2>' . $strWebServerInformation . '</h2>'; echo '<h2>' . $strWebServerInformation . '</h2>';
echo '<ul>'; echo '<ul>';
PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software'); PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
@@ -209,7 +207,7 @@ if ($cfg['ShowPhpInfo']) {
echo ' </ul>'; echo ' </ul>';
echo ' </div>'; echo ' </div>';
echo '<div class="box">'; echo '<div class="group">';
echo '<h2>' . $strAboutphpMyAdmin . '</h2>'; echo '<h2>' . $strAboutphpMyAdmin . '</h2>';
echo '<ul>'; echo '<ul>';
PMA_printListItem($strVersionInformation . ': ' . PMA_VERSION, 'li_pma_version'); PMA_printListItem($strVersionInformation . ': ' . PMA_VERSION, 'li_pma_version');

12
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -1210,13 +1210,19 @@ code.sql {
padding-<?php echo $left; ?>: 1em; padding-<?php echo $left; ?>: 1em;
} }
.box { .group {
border-<?php echo $left; ?>: 1pt solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>; border-<?php echo $left; ?>: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
margin-bottom: 1em; margin-bottom: 1em;
} }
.box h2 { .group h2 {
background-color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; background-color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
padding: 0.1em 0.3em; padding: 0.1em 0.3em;
margin-top: 0; margin-top: 0;
} }
#li_select_server {
padding-bottom: 0.3em;
border-bottom: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
margin-bottom: 0.3em;
}

12
themes/original/css/theme_right.css.php
View File

@@ -1161,13 +1161,19 @@ code.sql {
padding-<?php echo $left; ?>: 1em; padding-<?php echo $left; ?>: 1em;
} }
.box { .group {
border-<?php echo $left; ?>: 1pt solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>; border-<?php echo $left; ?>: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
margin-bottom: 1em; margin-bottom: 1em;
} }
.box h2 { .group h2 {
background-color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; background-color: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
padding: 0.1em 0.3em; padding: 0.1em 0.3em;
margin-top: 0; margin-top: 0;
} }
#li_select_server {
padding-bottom: 0.3em;
border-bottom: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
margin-bottom: 0.3em;
}