From d9a21610d18629038c186a34eb55693bbeb42494 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 13 Jun 2004 21:39:08 +0000 Subject: [PATCH] redesign part 3 --- ChangeLog | 6 + config.inc.php | 19 +- css/phpmyadmin.css.php | 415 ++++++------ db_details.php | 27 +- db_details_export.php | 13 +- db_details_links.php | 30 +- db_details_qbe.php | 181 +++--- db_details_structure.php | 116 ++-- db_search.php | 60 +- export.php | 31 +- header.inc.php | 54 +- index.php | 36 +- lang/afrikaans-iso-8859-1.inc.php | 3 + lang/afrikaans-utf-8.inc.php | 3 + lang/albanian-iso-8859-1.inc.php | 3 + lang/albanian-utf-8.inc.php | 3 + lang/arabic-utf-8.inc.php | 3 + lang/arabic-windows-1256.inc.php | 3 + lang/azerbaijani-iso-8859-9.inc.php | 3 + lang/azerbaijani-utf-8.inc.php | 3 + lang/basque-iso-8859-1.inc.php | 3 + lang/basque-utf-8.inc.php | 3 + lang/bosnian-utf-8.inc.php | 3 + lang/bosnian-windows-1250.inc.php | 3 + lang/brazilian_portuguese-iso-8859-1.inc.php | 3 + lang/brazilian_portuguese-utf-8.inc.php | 3 + lang/bulgarian-koi8-r.inc.php | 3 + lang/bulgarian-utf-8.inc.php | 3 + lang/bulgarian-windows-1251.inc.php | 3 + lang/catalan-iso-8859-1.inc.php | 3 + lang/catalan-utf-8.inc.php | 3 + lang/chinese_big5-utf-8.inc.php | 3 + lang/chinese_big5.inc.php | 3 + lang/chinese_gb-utf-8.inc.php | 3 + lang/chinese_gb.inc.php | 3 + lang/croatian-iso-8859-2.inc.php | 3 + lang/croatian-utf-8.inc.php | 3 + lang/croatian-windows-1250.inc.php | 3 + lang/czech-iso-8859-2.inc.php | 3 + lang/czech-utf-8.inc.php | 3 + lang/czech-windows-1250.inc.php | 3 + lang/danish-iso-8859-1.inc.php | 3 + lang/danish-utf-8.inc.php | 3 + lang/dutch-iso-8859-1.inc.php | 3 + lang/dutch-utf-8.inc.php | 3 + lang/english-iso-8859-1.inc.php | 3 + lang/english-utf-8.inc.php | 3 + lang/estonian-iso-8859-1.inc.php | 3 + lang/estonian-utf-8.inc.php | 3 + lang/finnish-iso-8859-1.inc.php | 3 + lang/finnish-utf-8.inc.php | 3 + lang/french-iso-8859-1.inc.php | 3 + lang/french-utf-8.inc.php | 3 + lang/galician-iso-8859-1.inc.php | 3 + lang/galician-utf-8.inc.php | 3 + lang/georgian-utf-8.inc.php | 3 + lang/german-iso-8859-1.inc.php | 3 + lang/german-utf-8.inc.php | 3 + lang/greek-iso-8859-7.inc.php | 3 + lang/greek-utf-8.inc.php | 3 + lang/hebrew-iso-8859-8-i.inc.php | 3 + lang/hindi-utf-8.inc.php | 3 + lang/hungarian-iso-8859-2.inc.php | 3 + lang/hungarian-utf-8.inc.php | 3 + lang/indonesian-iso-8859-1.inc.php | 3 + lang/indonesian-utf-8.inc.php | 3 + lang/italian-iso-8859-1.inc.php | 3 + lang/italian-utf-8.inc.php | 3 + lang/japanese-euc.inc.php | 3 + lang/japanese-sjis.inc.php | 3 + lang/japanese-utf-8.inc.php | 3 + lang/korean-euc-kr.inc.php | 3 + lang/korean-utf-8.inc.php | 3 + lang/latvian-utf-8.inc.php | 3 + lang/latvian-windows-1257.inc.php | 3 + lang/lithuanian-utf-8.inc.php | 3 + lang/lithuanian-windows-1257.inc.php | 3 + lang/malay-iso-8859-1.inc.php | 3 + lang/malay-utf-8.inc.php | 3 + lang/norwegian-iso-8859-1.inc.php | 3 + lang/norwegian-utf-8.inc.php | 3 + lang/persian-utf-8.inc.php | 3 + lang/persian-windows-1256.inc.php | 3 + lang/polish-iso-8859-2.inc.php | 3 + lang/polish-utf-8.inc.php | 3 + lang/portuguese-iso-8859-1.inc.php | 3 + lang/portuguese-utf-8.inc.php | 3 + lang/romanian-iso-8859-1.inc.php | 3 + lang/romanian-utf-8.inc.php | 3 + lang/russian-cp-866.inc.php | 3 + lang/russian-koi8-r.inc.php | 3 + lang/russian-utf-8.inc.php | 3 + lang/russian-windows-1251.inc.php | 3 + lang/serbian_cyrillic-utf-8.inc.php | 3 + lang/serbian_cyrillic-windows-1251.inc.php | 3 + lang/serbian_latin-utf-8.inc.php | 3 + lang/serbian_latin-windows-1250.inc.php | 3 + lang/slovak-iso-8859-2.inc.php | 3 + lang/slovak-utf-8.inc.php | 3 + lang/slovak-windows-1250.inc.php | 3 + lang/slovenian-iso-8859-2.inc.php | 3 + lang/slovenian-utf-8.inc.php | 3 + lang/slovenian-windows-1250.inc.php | 3 + lang/spanish-iso-8859-1.inc.php | 3 + lang/spanish-utf-8.inc.php | 3 + lang/swedish-iso-8859-1.inc.php | 3 + lang/swedish-utf-8.inc.php | 3 + lang/thai-tis-620.inc.php | 3 + lang/thai-utf-8.inc.php | 3 + lang/turkish-iso-8859-9.inc.php | 3 + lang/turkish-utf-8.inc.php | 3 + lang/ukrainian-utf-8.inc.php | 3 + lang/ukrainian-windows-1251.inc.php | 3 + left.php | 248 +++++--- libraries/common.lib.php | 222 +++++-- libraries/config_import.lib.php | 13 + libraries/display_export.lib.php | 571 +++++++++-------- libraries/display_tbl.lib.php | 76 ++- libraries/header_meta_style.inc.php | 40 +- libraries/select_lang.lib.php | 1 - libraries/select_theme.lib.php | 103 +++ main.php | 389 ++++++++---- mult_submits.inc.php | 28 +- queryframe.php | 320 +++++++++- querywindow.php | 23 +- server_collations.php | 7 +- server_databases.php | 49 +- server_export.php | 7 +- server_links.inc.php | 31 +- server_privileges.php | 95 +-- server_processlist.php | 5 +- server_status.php | 23 +- server_variables.php | 20 +- sql.php | 61 +- tbl_change.php | 28 +- tbl_indexes.php | 26 +- tbl_properties.inc.php | 146 ++--- tbl_properties.php | 7 - tbl_properties_export.php | 6 +- tbl_properties_links.php | 37 +- tbl_properties_operations.php | 627 ++++++++++--------- tbl_properties_structure.php | 79 ++- tbl_query_box.php | 399 +++++++----- tbl_relation.php | 57 +- tbl_select.php | 22 +- 145 files changed, 3267 insertions(+), 1790 deletions(-) create mode 100644 libraries/select_theme.lib.php diff --git a/ChangeLog b/ChangeLog index c810ddece..93852a849 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-06-13 Marc Delisle + * many files: redesign part 3, thanks to Michael Keck (mkkeck). + New /themes structure for Theme management + TODO: code improvement, access to /lang from themes/index.php, + possible logo change + 2004-06-11 Marc Delisle * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza). diff --git a/config.inc.php b/config.inc.php index 097d6886d..1992a8124 100644 --- a/config.inc.php +++ b/config.inc.php @@ -526,15 +526,24 @@ $cfg['NaturalOrder'] = TRUE; // Sort table and database in natura // 2004-05-08 rabus: We need to rearrange these variables. // 2004-06-03 nijel: We also need to add these to Documentation.html -$cfg['ShowHttpHostTitle'] = FALSE; // show HTTP host in browsers window title (true|false)? -$cfg['SetHttpHostTitle'] = ''; // if ShowHttpHostTitle=true, please set your host (server) - // or an other string, wich should be shown in browsers window title. - // If not set (or empty), the PMA will get your real host address. +$cfg['ShowHttpHostTitle'] = TRUE; // show HttpHost in browsers window title (true|false)? +$cfg['SetHttpHostTitle'] = ''; // if ShowHttpHostTitle=true, please set your host (server) + // or an other string, wich should be shown in browsers window title. + // If not set (or empty), the PMA will get your real Host-Adress. $cfg['ErrorIconic'] = TRUE; // show some icons for warnings, errors and informations (true|false)? -$cfg['MainPageIconic'] = TRUE; // show icons in list on main page (true|false)? +$cfg['MainPageIconic'] = TRUE; // show icons in list on main page and on navigation bar (true|false)? $cfg['ReplaceHelpImg'] = TRUE; // show help button instead of strDocumentation (true|false)? +// theme manager +$cfg['ThemePath'] = 'themes'; // using themes manager please set up here the path to 'themes' + // else leave empty +$cfg['ThemeManager'] = TRUE; // if you want to use selectable themes and if ThemesPath not empty + // set it to true, else set it to false (default is false); +$cfg['ThemeDefault'] = 'original'; // set up default theme, if ThemePath not empty + // you can set up here an valid path to themes or 'original' for + // the original pma-theme + //----------------------------------------------------------------------------- diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 64a4e18c3..27b729490 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -20,14 +20,29 @@ if (!isset($js_frame)) { $js_frame = 'left'; } +// 2004-05-30: Michael Keck (mail@mnichaelkeck.de) +// check, if select_theme.lib.php exists +// and include it +$tmp_file_lib = './libraries/select_theme.lib.php'; +if (@file_exists($tmp_file_lib) && isset($GLOBALS['cfg']['ThemePath']) && !empty($GLOBALS['cfg']['ThemePath'])){ + require_once($tmp_file_lib); +}else{ + $pmaTheme = 'original'; +} + if ($js_frame == 'left') { /************************************************************************************ * LEFT FRAME ************************************************************************************/ - + // 2004-05-30: Michael Keck (mail@michaelkeck.de) + // Check, if theme_left.css.php exists and include + $tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php'; + if (@file_exists($tmp_file) && $pmaTheme != 'original') { + include($tmp_file); + }else{ // else use default styles /** - * Add styles for positioned layers - */ + * Add styles for positioned layers + */ if (isset($num_dbs) && $num_dbs == '0') { ?> /* No layer effects neccessary */ @@ -63,21 +78,20 @@ div {font-family: ; font-size: ; font-size: ; color: #000000} + ?> /* Additional effects for IE4 */ .parent {font-family: ; color: #000000; text-decoration: none; display: block} .child {font-family: ; font-size: ; color: #333399; text-decoration: none; display: none} .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: ; color: #333399; text-decoration: none} .tblItem:hover {color: #FF0000; text-decoration: underline} - + /* Additional effects for NON-IE4 */ .parent {font-family: ; color: #000000; text-decoration: none; position: absolute; visibility: hidden} .child {font-family: ; font-size: ; color: #333399; position: absolute; visibility: hidden} .item, .tblItem {font-family: ; font-size: ; color: #333399; text-decoration: none} - ; font-size: ; font-size: } input {font-family: ; font-size: } select {font-family: ; font-size: ; background-color: #ffffff; color: #000000} -hr{ color: #ffffff; background-color: #ffffff; border: 0; height: 1px; } /* For printview */ body {font-family: ; font-size: ; color: #000000; background-color: #ffffff} h1 {font-family: ; font-size: ; font-weight: bold} table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0} th {font-family: ; font-size: ; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} +th.td { color: transparent; background-color: transparent;} td {font-family: ; font-size: ; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} -th.td {font-weight: normal;} /* Always enabled stylesheets (right frame) */ body { @@ -129,7 +154,7 @@ body { if ($GLOBALS['cfg']['RightBgImage'] == '') { // calls from a css file are relative to itself, so use ../images echo ' background-image: url(../images/vertical_line.png);' . "\n" - . ' background-repeat: repeat-y;' . "\n"; + . ' background-repeat: repeat-y;' . "\n"; } else { echo ' background-image: url(' . $GLOBALS['cfg']['RightBgImage'] . ');' . "\n"; } // end if... else... @@ -139,9 +164,8 @@ body { pre, tt {font-size: } th {font-family: ; font-size: ; font-weight: bold; color: #000000; background-color: } -th.td {font-weight: normal; color: inherit; background-color: inherit; ?>} td {font-family: ; font-size: } -form {font-family: ; font-size: } +form {font-family: ; font-size: ; padding: 0px; margin: 0px;} input {font-family: ; font-size: } input.textfield {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} select {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} @@ -170,6 +194,7 @@ dfn {font-style: normal} dfn:hover {font-style: normal; cursor: help} .nav {font-family: ; color: #000000} .warning {font-family: ; font-size: ; font-weight: bold; color: #FF0000} +.tblcomment {font-family: ; font-size: ; font-weight: normal; color: #000099; } td.topline {font-size: 1px} td.tab { border-top: 1px solid #999; @@ -180,7 +205,7 @@ td.tab { -moz-border-radius: 2px; } -div.tabs { +div.tabs { clear: both; } @@ -191,7 +216,7 @@ table.tabs { border-bottom: 1px solid #666; } -fieldset { +fieldset { border: #686868 solid 1px; padding: 0.5em; } @@ -227,153 +252,6 @@ button.mult_submit { border: 1px dashed #000000; } -/* Warning showing div with right border and optional icon */ - -div.warning { - border: 1px solid red; - - background-image: url(../images/s_warn.png); - background-repeat: no-repeat; - background-position: 10px 50%; - padding: 10px 10px 10px 36px; - margin: 0px; - - width: 90%; -} - -div.error { - width: 100%; - border: 1px solid #cc0000; - background-color: #ffffcc; - padding: 0px; -} - -div.error div.text { - padding: 5px; -} - -div.error div.head { - background-color: #cc0000; - font-weight: bold; - color: #ffffff; - - background-image: url(../images/s_error.png); - background-repeat: no-repeat; - background-position: 10px 50%; - padding: 2px 2px 2px 30px; - - margin: 0px; -} - -/* some new styles added 20047-05-05 by Michael Keck (mkkeck) */ - -/* tables */ -.tblHeaders { - background-color: #9999CC; - font-weight: bold; - color: #000000; -} -.tblFooters { - background-color: #9999CC; - font-weight: normal; - color: #000000; -} -/* forbidden, no privilegs */ -.noPrivileges{ - color: #cc0000; - font-weight: bold; -} - -/* list elements */ -ul.mainRight { - margin: 0px; - padding-left:2em; - padding-right:2em; -} - -ul.mainRight li { - white-space: nowrap; - padding-left: 0.5em; - padding-top: 0.1em; - padding-bottom: 0.1em; -} -ul.mainLeft { - margin: 0px; - padding-left:2em; - padding-right:2em; -} - -ul.mainLeft li { - white-space: nowrap; - padding-left: 0.5em; - padding-top: 0.1em; - padding-bottom: 0.1em; -} - - - -li.lstPhpInfo { - list-style: url(../images/php_sym.png); -} -li.lstPmaDocs { - list-style: url(../images/b_docs.png); -} -li.lstPmaPage { - list-style: url(../images/b_home.png); -} -li.lstPmaLang { - list-style: url(../images/s_lang.png); -} -li.lstPmaChar { - list-style: url(../images/s_rights.png); -} -li.lstNewdb { - list-style: url(../images/b_newdb.png); -} -li.lstStatus { - list-style: url(../images/s_status.png); -} -li.lstVars { - list-style: url(../images/s_vars.png); -} -li.lstProcess { - list-style: url(../images/s_process.png); -} -li.lstPrivileges { - list-style: url(../images/s_rights.png); -} -li.lstCollations { - list-style: url(../images/s_asci.png); -} -li.lstReload { - list-style: url(../images/s_reload.png); -} -li.lstDatabases { - list-style: url(../images/s_db.png); -} -li.lstExport { - list-style: url(../images/b_export.png); -} -li.lstLogoff { - list-style: url(../images/s_loggoff.png); -} -li.lstPasswd { - list-style: url(../images/s_passwd.png); -} - - -li.lstUsradd { - list-style: url(../images/b_usradd.png); -} -li.lstUsrdrop { - list-style: url(../images/b_usrdrop.png); -} - - -hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; } - -/* end of some new styles added 20047-05-05 by Michael Keck (mkkeck) */ - .print{font-family:arial;font-size:8pt;} /* MySQL Parser */ @@ -394,7 +272,160 @@ hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; } .syntax_alpha_variable {} .syntax_quote {white-space: pre;} .syntax_quote_backtick {} + +hr{ color: #666666; background-color: #666666; border: 0; height: 1px; } + +/* new styles for navigation */ + +.nav { + font-family: ; + color: #000000; + border-top: none; + border-right: none; + border-left: none; + border-bottom: 1px solid #666; +} +.navSpacer { + width: 5px; + height: 16px; +} +.navNormal, .navDrop, .navActive { + font-family: ; + font-size: ; + font-weight: bold; + border-top: 1px solid #999; + border-right: 1px solid #666; + border-left: 1px solid #999; + border-bottom: none; + border-radius: 2px; + -moz-border-radius: 2px; + padding: 2px 5px 2px 5px; +} +.navNormal { + color: #000000; + background-color: #E5E5E5; +} +.navActive{ + font-family: ; + font-size: ; + font-weight: bold; + color: #000000; + background-color: #CCCCCC; +} +.navDrop{ + color: #000000; + background-color: #E5E5E5; +} +.navNormal a:link, .navNormal a:active, .navNormal a:visited, .navActive a:link, .navActive a:active, .navActive a:visited{ + color: #0000FF; +} + +.navDrop a:link, .navDrop a:active, .navDrop a:visited{ + color: #FF0000; +} +.navDrop a:hover{ + color: #FFFFFF; + background-color: #FF0000; +} +.navNormal a:hover, .navActive a:hover{ + color: #FF0000; +} + +/* Warning showing div with right border and optional icon */ + +div.errorhead { + font-weight: bold; + color: #ffffff; + text-align: left; + + background-image: url(../images/s_error.png); + background-repeat: no-repeat; + background-position: 5px 50%; + padding: 0px 0px 0px 25px; + + margin: 0px; +} + +/* tables */ +.tblError { + border: 1px solid #FF0000; + background-color: #FFFFCC; +} +.tblWarn, div.tblWarn { + border: 1px solid #FF0000; + background-color: #FFFFFF; +} +div.tblWarn { + padding: 5px 5px 5px 5px; + margin: 0px 0px 5px 0px; + width: 100%; +} +.tblHeaders { + background-color: ; + font-weight: bold; + color: #000000; +} +.tblFooters { + background-color: ; + font-weight: normal; + color: #000000; +} +.tblHeaders a:link, .tblHeaders a:active, .tblHeaders a:visited, .tblFooters a:link, .tblFooters a:active, .tblFooters a:visited { + color: #0000FF; +} +.tblHeaders a:hover, .tblFooters a:hover { color: #FF0000; } +.tblHeadError { + background-color: #FF0000; + font-weight: bold; + color: #FFFFFF; +} +.tblHeadWarn { + background-color: #FFCC00; + font-weight: bold; + color: #000000; +} +/* forbidden, no privilegs */ +.noPrivileges{ + color: #FF0000; + font-weight: bold; +} + +/* Heading */ + +.serverinfo { + font-family: ; + font-size: ; + font-weight: normal; + white-space: nowrap; + vertical-align: middle; + padding: 0px 0px 10px 0px; +} + +.serverinfo a:link, .serverinfo a:activ, .serverinfo a:visited { + font-family: ; + font-size: ; + font-weight: bolder; +} +.serverinfo a img{ + vertical-align: middle; + margin: 0px 1px 0px 2px; +} +.serverinfo div{ + background-image: url(../images/item_ltr.png); + background-repeat: no-repeat; + background-position: 50% 50%; + width: 20px; + height: 16px; +} +#textSQLDUMP { + width: 95%; + height: 95%; + font-family: "Courier New", Courier, mono; + font-size: 12px; +} + ; - font-size: ; - font-weight: normal; - white-space: nowrap; -} - -h1 span a { - - background-repeat: no-repeat; - background-position: 2px 50%; - padding-left: 20px; - -} - -h1 span a { - font-weight: bolder; -} - - -h1 span.server a { - background-image: url(../images/s_host.png); -} - -h1 span.database a { - background-image: url(../images/s_db.png); -} - -h1 span.table a { - background-image: url(../images/s_tbl.png); -} - - -h1 span.database:before , h1 span.table:before { - content: '>'; - padding-left: 5px; - padding-right: 5px; -} diff --git a/db_details.php b/db_details.php index 4a083ecac..e54b655ac 100644 --- a/db_details.php +++ b/db_details.php @@ -59,12 +59,14 @@ $strHiddenFields = ' ' . "\n"; ?> +
onsubmit="return checkSqlQuery(this)" name="sqlform"> + - onsubmit="return checkSqlQuery(this)" name="sqlform"> +'; + $upload_dir_error = '' . "\n" + . '' . "\n" + . '' . "\n"; } } // end if (web-server upload directory) // Charset conversion options @@ -208,7 +211,7 @@ if ($is_upload || $is_upload_dir) { // Bookmark Support if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) { - echo ' ' . "\n"; + echo ' ' . "\n"; echo ' ' . "\n"; echo '
' . htmlspecialchars($db) . ''; @@ -95,7 +97,7 @@ if (!empty($query_to_display)) { // loic1: displays import dump feature only if file upload available if ($is_upload) { ?> -
' . $strError . '
' - . '
' . $strWebServerUploadDirectoryError - . '
' . $strError . '
' . $strWebServerUploadDirectoryError + . '
 ' . $strOr . '
' . "\n"; echo ' ' . $strBookmarkQuery . ': ' . "\n"; @@ -221,10 +224,10 @@ if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { echo '
'; echo ' ' . $strVar . ' '; if ($cfg['ReplaceHelpImg']){ - echo '' - . '' . $strDocu . ''; - }else{ - echo '(' . $strDocu . '): '; + echo '' + . '' . $strDocu . ''; + }else{ + echo '(' . $strDocu . '): '; } echo ' ' . "\n"; echo '
'; @@ -247,8 +250,8 @@ if (isset($upload_dir_error)) { echo $upload_dir_error; } ?> -
+ + + -

- -

+$export_page_title = $strViewDumpDB; - 1) { @@ -48,8 +46,7 @@ if ($num_tables > 1) { $multi_values .= '
' . $strSelectAll . '  /  - ' . $strUnselectAll . ' -

'; + ' . $strUnselectAll . ''; } elseif ($num_tables == 0) { echo $strDatabaseNoTable; require_once('./footer.inc.php'); diff --git a/db_details_links.php b/db_details_links.php index 74b71b4e9..f3d163255 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -48,10 +48,11 @@ if ($cfg['AllowUserDropDatabase']) { . urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db)))) . '&goto=main.php&back=db_details' . $sub_part . '.php&reload=1&purge=1'; $att5 = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; - $class5 = 'drop'; + $class5 = 'Drop'; } else { $lnk5 = ''; + $class5 = 'Drop'; } @@ -62,25 +63,32 @@ else { if ($cfg['LightTabs']) { echo ' '; } else { - echo ' - - '; + echo '
 
' . "\n" + . ' ' . "\n" + . ' ' + . '
' + . ' ' + . ' ' + . ' '; } -echo PMA_printTab($strStructure, 'db_details_structure.php', $url_query); -echo PMA_printTab($strSQL, 'db_details.php', $url_query . '&db_query_force=1'); -echo PMA_printTab($strExport, $lnk3, $arg3); -echo PMA_printTab($strSearch, $lnk4, $arg4); -echo PMA_printTab($strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStructure.'' : '') . $strStructure, 'db_details_structure.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSQL.'' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, $lnk3, $arg3); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSearch.'' : '') . $strSearch, $lnk4, $arg4); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strQBE.'' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); // Displays drop link if ($lnk5) { - echo PMA_printTab($strDrop, $lnk5, $arg5, $att5, $class5); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDrop.'' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); } // end if echo "\n"; if (!$cfg['LightTabs']) { - echo '
'; + echo '
' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ''; } else { echo '
'; } diff --git a/db_details_qbe.php b/db_details_qbe.php index 02a0e7eca..51d18706c 100644 --- a/db_details_qbe.php +++ b/db_details_qbe.php @@ -172,12 +172,12 @@ $realwidth = $wid . 'ex';
- +
+ + + + + + +
-  :  + : 
-  :  + : 
-  :  + : 
-  :  + :  - +
-
-  : + : @@ -410,11 +410,11 @@ for ($y = 0; $y <= $row; $y++) {
-  : + : -  : + : /> @@ -473,16 +473,16 @@ for ($y = 0; $y <= $row; $y++) { echo "\n"; ?>
+ - +
-
-  : + : -  : + : /> @@ -490,11 +490,11 @@ for ($y = 0; $y <= $row; $y++) {
-  : + : -  : + : /> @@ -551,7 +551,7 @@ for ($y = 0; $y <= $row; $y++) {
-  :  + :  -  : + : /> -    : +   : />
@@ -598,9 +598,9 @@ for ($x = 0; $x < $col; $x++) { } ?> 		-  : + : /> -    : +   : />
@@ -614,79 +614,72 @@ for ($x = 0; $x < $col; $x++) { } // end for ?>
+
- - - + + +
- - -
- - - + + + + + + +
-  : -
- 		+ + + + : + +  : + +  

+ + + + + + + + + - - - - - - - - - - - - - -
 :    
$val) { - echo ' '; - echo '' . "\n"; +$strTableListOptions = ''; +$numTableListOptions = 0; +foreach($tbl_names AS $key => $val) { + $strTableListOptions .= ' '; + $strTableListOptions .= '' . "\n"; + $numTableListOptions++; } ?> - - - - - - -  : - -
-  : - -
- - -
- -
+ 		- -
- +
- +
 
- - '; - $titles['Search'] = $iconic_spacer . '' . $strSearch . ''; - $titles['NoBrowse'] = $iconic_spacer . '' . $strBrowse . ''; - $titles['NoSearch'] = $iconic_spacer . '' . $strSearch . ''; - $titles['Insert'] = $iconic_spacer . '' . $strInsert . ''; - $titles['Properties'] = $iconic_spacer . '' . $strProperties . ''; - $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; - $titles['Empty'] = $iconic_spacer . '' . $strEmpty . ''; - $titles['NoEmpty'] = $iconic_spacer . '' . $strEmpty . ''; + $titles['Browse'] = $iconic_spacer . '' . $strBrowse . ''; + $titles['Search'] = $iconic_spacer . '' . $strSearch . ''; + $titles['NoBrowse'] = $iconic_spacer . '' . $strBrowse . ''; + $titles['NoSearch'] = $iconic_spacer . '' . $strSearch . ''; + $titles['Insert'] = $iconic_spacer . '' . $strInsert . ''; + $titles['Properties'] = $iconic_spacer . '' . $strProperties . ''; + $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; + $titles['Empty'] = $iconic_spacer . '' . $strEmpty . ''; + $titles['NoEmpty'] = $iconic_spacer . '' . $strEmpty . ''; if ($propicon == 'both') { $titles['Browse'] .= ' ' . $strBrowse . ''; @@ -229,7 +229,7 @@ else { if (is_array($comment)) { ?> -

+

-
+
- + - <?php echo $strWithChecked; ?> + <?php echo $strWithChecked; ?>  /  @@ -575,7 +575,7 @@ else {     - + ' . if ($cfgRelation['commwork']) { ?> - + '; - } - echo $strDBComment; + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo $strDBComment; ?>
@@ -716,11 +716,11 @@ if ($cfgRelation['commwork']) { } ?> - + '; - } + if ($cfg['PropertiesIconic']) { + echo ''; + } echo $strDBRename.': '; ?> = 40101) { // MySQL supports setting default charsets / collations for databases since // version 4.1.1. echo ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' '; - if ($cfg['PropertiesIconic']){ - echo ''; - } + if ($cfg['PropertiesIconic']) { + echo ''; + } echo ' : ' . "\n" . ' ' . "\n" . ' ' . "\n" @@ -781,16 +781,16 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { '; - } + if ($cfg['PropertiesIconic']) { + echo ''; + } ?>PDF '; - if ($cfg['PropertiesIconic']){ - echo ''; - } - echo ''. $strEditPDFPages . ''; + echo ''; + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo ''. $strEditPDFPages . ''; ?> @@ -805,13 +805,13 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> - '; - } - ?> - :  +'; + } + echo $strDisplayPDF; +?>:     
- + @@ -885,11 +885,11 @@ if ($num_tables > 0 ?> '; - if ($cfg['PropertiesIconic']){ - echo ''; - } - echo $strImportDocSQL . ''; + echo ''; + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo $strImportDocSQL . ''; ?> -

- -

-
- +
- + + + + - - - - - - + - + - - - - - - - - - - - - + + + +
-   +
+  
 - + +
 
+
  + />  *
/> @@ -294,20 +291,19 @@ if (empty($search_option)) { />
/> -
 
+   + 1) { $i = 0; @@ -329,12 +325,11 @@ if ($num_tables > 1) { $i++; } // end while echo ' ' . "\n"; - ?> -
- -  /  - - ' . $strSelectAll . '' + . ' / ' + . '' . $strUnselectAll . ''; } else { echo "\n"; @@ -345,13 +340,10 @@ else { echo"\n"; ?>
 
diff --git a/export.php b/export.php index 5742e7aee..e7e826138 100644 --- a/export.php +++ b/export.php @@ -306,8 +306,10 @@ if (!$save_on_server) { require_once('./header.inc.php'); $cfg['Server'] = $backup_cfgServer; unset($backup_cfgServer); - echo '
' . "\n"; - echo ' 
' . "\n";
+        echo "\n" . '
' . "\n";
+        //echo '    
' . "\n";
+        echo '    
' . "\n"
+           . '        ' . "\n"
+       . '    
' . "\n";
     echo '
' . "\n";
     echo "\n";
+?>
+
diff --git a/header.inc.php b/header.inc.php
index ec98c7ece..9dab90eef 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -41,7 +41,7 @@ if (empty($GLOBALS['is_header_sent'])) {
      */
     $title     = '';
     if ($cfg['ShowHttpHostTitle']) {
-        $title .= (empty($cfg['SetHttpHostTitle']) ? $GLOBALS['HTTP_HOST'] : $cfg['SetHttpHostTitle']) . ' >> ';
+        $title .= (empty($GLOBALS['cfg']['SetHttpHostTitle']) ? $GLOBALS['HTTP_HOST'] : $GLOBALS['cfg']['SetHttpHostTitle']) . ' >> ';
     }
     if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) {
         $title.=str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']);
@@ -140,7 +140,6 @@ if (empty($GLOBALS['is_header_sent'])) {
     }
     ?>
     >
-
     \n\n";
         $header_url_qry = '?' . PMA_generate_common_url();
@@ -181,8 +185,52 @@ if (empty($GLOBALS['is_header_sent'])) {
         }
         echo '';
     }
-    echo "\n" . '
';
+*/
+    if (PMA_DISPLAY_HEADING) {
+        echo '' . "\n"
+           . '    ' . "\n";
+        $header_url_qry = '?' . PMA_generate_common_url();
+        $server_info = (!empty($cfg['Server']['verbose'])
+                        ? $cfg['Server']['verbose']
+                        : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port'])
+                                                                   ? ''
+                                                                   : ':' . $cfg['Server']['port']
+                                                                  )
+                       );
+        echo '        '
+           . '' . "\n\n";
 
+        if (!empty($GLOBALS['db'])) {
+            echo '        '
+               . '' . "\n" . '            '
+               . '' . "\n\n";
+
+            if (!empty($GLOBALS['table'])) {
+                echo '        '
+                   . '' . "\n" . '            '
+                   . '' . "\n\n";
+            }
+        }
+        echo '    ' . "\n" . '
' . $GLOBALS['strServer'] . ':'
+           . '';
+        if ($GLOBALS['cfg']['MainPageIconic']) {
+            echo '' . htmlspecialchars($server_info) . '';
+        }
+        echo htmlspecialchars($server_info) . '' . "\n"
+           . '
' . $GLOBALS['strDatabase'] . ':'
+               . '';
+            if ($GLOBALS['cfg']['MainPageIconic']) {
+                echo '' . htmlspecialchars($GLOBALS['db']) . '';
+            }
+            echo htmlspecialchars($GLOBALS['db']) . '' . "\n"
+               . '
' . $GLOBALS['strTable'] . ':'
+                   . '';
+                if ($GLOBALS['cfg']['MainPageIconic']) {
+                    echo '' . htmlspecialchars($GLOBALS['table']) . '';
+                }
+                echo htmlspecialchars($GLOBALS['table']) . '' . "\n"
+                   . '
';
+    }
     /**
      * Sets a variable to remember headers have been sent
      */
diff --git a/index.php b/index.php
index 88f9636bf..46d15de45 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,10 @@
  */
 require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
-
+/**
+ * Includes the ThemeManager if it hasn't been included yet
+ */
+require_once('./libraries/select_theme.lib.php');
 // Gets the default font sizes
 PMA_setFontSizes();
 
@@ -25,8 +28,6 @@ if (empty($HTTP_HOST)) {
         $HTTP_HOST = '';
     }
 }
-
-
 /**
  * Defines the frameset
  */
@@ -38,7 +39,6 @@ if (isset($lightm_db)) {
     unset($lightm_db);
 }
 $url_query = PMA_generate_common_url(isset($db) ? $db : '');
-
 header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 
 require_once('./libraries/relation.lib.php');
@@ -61,17 +61,33 @@ $phpmain_hash_js = time();
 
 
  0) {
+    PMA_availableDatabases(); // this function is defined in "common.lib.php"
+} else {
+    $num_dbs = 0;
+}
+if ($num_dbs > 1) {
+    if ($cfg['LeftFrameLight']) {
+        $query_frame_height = $query_frame_height + 40;
+    }
+}
+if ($cfg['LeftDisplayLogo']) {
+    $query_frame_height = $query_frame_height + 50;
+}
 if ($cfg['QueryFrame']) {
-
     if ($cfg['QueryFrameJS']) {
         echo '
-    
 
     
     ">
 
 
-    
+if ($cfg['LeftDisplayLogo'] && !$cfg['QueryFrame']) {
+?>  
 
-    phpMyAdmin
-    
 
+    

+        phpMyAdmin
+    

+';
+        echo 'phpMyAdmin';
+        echo '
' . "\n"; + } + echo '
'; +} // end of display logo echo "\n"; + +if (!$cfg['QueryFrame']) { + echo "\n"; +?> + +
+ ' + . ($cfg['MainPageIconic'] + ? '' . $strHome . '' + : '' . $strHome . '') + . ''; + // Logout for advanced authentication + if ($cfg['Server']['auth_type'] != 'config') { + echo $str_spacer_links; + echo '' + . ($cfg['MainPageIconic'] + ? '' . $strLogout . '' + : '' . $strLogout . '') + . ''; + } // end if + if ($cfg['MainPageIconic']) { + echo '' + . '' + . '' . $strPmaDocumentation . '' + . ''; + echo '' + . '' + . 'MySQL - ' . $strDocu . '' + . ''; + } +?> +
+
+ -
- - - -
- + $val) { if (!empty($val['host'])) { - - $selected = 0; - + $selected = 0; if (!empty($server) && ($server == $key)) { $selected = 1; } @@ -383,7 +439,9 @@ if ($cfg['LeftDisplayServers']) { echo '» ' . $label . '
'; } } else { - echo ' ' . "\n"; + if (!$cfg['QueryFrame']) { + echo ' ' . "\n"; + } } } // end if (!empty($val['host'])) @@ -392,32 +450,19 @@ if ($cfg['LeftDisplayServers']) { if ($cfg['LeftDisplayServersList']){ echo '
'; } else { + if (!$cfg['QueryFrame']) { ?> - - - - -
+ + + + + - -
- - - - - -
- - - + 1) { // within left.php. With no JS (