From bd232679f51e188b738d65d9b41a86078c7bcc49 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 5 Feb 2008 12:48:39 +0000 Subject: [PATCH] main page reorganization (work in progress) --- lang/afrikaans-utf-8.inc.php | 5 + lang/albanian-utf-8.inc.php | 5 + lang/arabic-utf-8.inc.php | 5 + lang/azerbaijani-utf-8.inc.php | 5 + lang/basque-utf-8.inc.php | 5 + lang/belarusian_cyrillic-utf-8.inc.php | 5 + lang/belarusian_latin-utf-8.inc.php | 5 + lang/bosnian-utf-8.inc.php | 5 + lang/brazilian_portuguese-utf-8.inc.php | 5 + lang/bulgarian-utf-8.inc.php | 5 + lang/catalan-utf-8.inc.php | 5 + lang/chinese_simplified-utf-8.inc.php | 5 + lang/chinese_traditional-utf-8.inc.php | 5 + lang/croatian-utf-8.inc.php | 5 + lang/czech-utf-8.inc.php | 5 + lang/danish-utf-8.inc.php | 5 + lang/dutch-utf-8.inc.php | 5 + lang/english-utf-8.inc.php | 5 + lang/estonian-utf-8.inc.php | 5 + lang/finnish-utf-8.inc.php | 5 + lang/french-utf-8.inc.php | 5 + lang/galician-utf-8.inc.php | 5 + lang/georgian-utf-8.inc.php | 5 + lang/german-utf-8.inc.php | 5 + lang/greek-utf-8.inc.php | 5 + lang/hebrew-utf-8.inc.php | 5 + lang/hindi-utf-8.inc.php | 5 + lang/hungarian-utf-8.inc.php | 5 + lang/indonesian-utf-8.inc.php | 5 + lang/italian-utf-8.inc.php | 5 + lang/japanese-utf-8.inc.php | 5 + lang/korean-utf-8.inc.php | 5 + lang/latvian-utf-8.inc.php | 5 + lang/lithuanian-utf-8.inc.php | 5 + lang/macedonian_cyrillic-utf-8.inc.php | 5 + lang/malay-utf-8.inc.php | 5 + lang/mongolian-utf-8.inc.php | 5 + lang/norwegian-utf-8.inc.php | 5 + lang/persian-utf-8.inc.php | 5 + lang/polish-utf-8.inc.php | 5 + lang/portuguese-utf-8.inc.php | 5 + lang/romanian-utf-8.inc.php | 5 + lang/russian-utf-8.inc.php | 5 + lang/serbian_cyrillic-utf-8.inc.php | 5 + lang/serbian_latin-utf-8.inc.php | 5 + lang/sinhala-utf-8.inc.php | 5 + lang/slovak-utf-8.inc.php | 5 + lang/slovenian-utf-8.inc.php | 5 + lang/spanish-utf-8.inc.php | 5 + lang/swedish-utf-8.inc.php | 5 + lang/tatarish-utf-8.inc.php | 5 + lang/thai-utf-8.inc.php | 5 + lang/turkish-utf-8.inc.php | 5 + lang/ukrainian-utf-8.inc.php | 5 + libraries/header.inc.php | 2 +- main.php | 239 ++++++++---------- .../darkblue_orange/css/theme_right.css.php | 12 + themes/original/css/theme_right.css.php | 11 + 58 files changed, 405 insertions(+), 129 deletions(-) diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 96eae0234..6890da8bb 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1067,4 +1067,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 8ffe86ba1..f5687e90f 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1066,4 +1066,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 033757e87..4466a62cb 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1068,4 +1068,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 9f4800c62..6281276ff 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1063,4 +1063,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 244f759a5..39b68673b 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1060,4 +1060,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index e5330b8db..25291d181 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1043,4 +1043,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index b39653d5e..1de5b22c1 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 2c7afdcfd..8ecfab610 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1066,4 +1066,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 6c0af11ff..c5dfbc9df 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1040,4 +1040,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 4272f9b97..a5a533458 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1063,4 +1063,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 813edc62c..30780e02b 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1036,4 +1036,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 1237c39f2..7a4a9a0b7 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1068,4 +1068,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 48ec3fbe0..f9148d724 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1047,4 +1047,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 6d9dea467..b1177a273 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1041,4 +1041,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index d52a3e7d5..a1ce6f0dc 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strZip = '„zazipováno“'; $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 18b420382..a30595dbd 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index fc8be364a..80662965b 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1064,4 +1064,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 2afc9d99f..f8c08c08d 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -23,10 +23,12 @@ $datefmt = '%B %d, %Y at %I:%M %p'; $timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; $strAbortedClients = 'Aborted'; +$strAboutphpMyAdmin = 'About phpMyAdmin'; $strAccessDenied = 'Access denied'; $strAccessDeniedCreateConfig = 'Probably reason of this is that you did not create configuration file. You might want to use %1$ssetup script%2$s to create one.'; $strAccessDeniedExplanation = 'phpMyAdmin tried to connect to the MySQL server, and the server rejected the connection. You should check the host, username and password in your configuration and make sure that they correspond to the information given by the administrator of the MySQL server.'; $strAction = 'Action'; +$strActions = 'Actions'; $strAddAutoIncrement = 'Add AUTO_INCREMENT value'; $strAddClause = 'Add %s'; $strAddConstraints = 'Add constraints'; @@ -381,6 +383,7 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas $strInsertAsNewRow = 'Insert as new row'; $strInsertedRowId = 'Inserted row id: %1$d'; $strInsert = 'Insert'; +$strInterface = 'Interface'; $strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; $strInternalRelationAdded = 'Internal relation added'; $strInternalRelations = 'Internal relations'; @@ -485,6 +488,7 @@ $strMysqlClientVersion = 'MySQL client version'; $strMySQLConnectionCollation = 'MySQL connection collation'; $strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; $strMySQLSaid = 'MySQL said: '; +$strMySQLServerInformation = 'MySQL server information'; $strMySQLShowProcess = 'Show processes'; $strMySQLShowStatus = 'Show MySQL runtime information'; $strMySQLShowVars = 'Show MySQL system variables'; @@ -1025,6 +1029,7 @@ $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocu $strViewName = 'VIEW name'; $strView = 'View'; +$strWebServerInformation = 'Web server information'; $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached'; $strWebServerUploadDirectory = 'web server upload directory'; $strWelcome = 'Welcome to %s'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 8deb4ff81..f35d95c27 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1048,4 +1048,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 3fb0c6cc9..ebbf0a704 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 44fd6da3a..89bed8b61 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1039,4 +1039,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 962c45242..b4ea8d327 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1041,4 +1041,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 6388f5df4..58d13b07c 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1068,4 +1068,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index c25810315..b983ee592 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1048,4 +1048,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 141214402..5793562dc 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1065,4 +1065,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 1c8a73a32..26525ebfc 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1060,4 +1060,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 5e211f49d..c5544db40 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1068,4 +1068,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 20e8ce197..91064ad5d 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1059,4 +1059,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 161ada952..bb5394aa3 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1058,4 +1058,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 7ccb6fd35..d85f0eadb 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 81d8120a8..614d67a17 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1046,4 +1046,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 94ce19177..3ce65c004 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1063,4 +1063,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 0581ea6e9..fa6bc659e 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1065,4 +1065,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index d4ef8bbd3..d6d22e603 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1058,4 +1058,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 0d23945ae..350d15c13 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1043,4 +1043,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 192d7a084..2ed2f9f1e 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1080,4 +1080,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 98f3ec9e2..16609a791 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1063,4 +1063,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 626317f8b..0868706d4 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1040,4 +1040,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 4e13d1d6a..e1ee42bc2 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1065,4 +1065,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 34672cfcc..b9628f028 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1036,4 +1036,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 0e434f00a..15497f770 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1069,4 +1069,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index abc021005..37583f9fc 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1061,4 +1061,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index eca21419d..477ad45bf 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1043,4 +1043,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 930ccbffc..c84dc0448 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 2b9bf4d12..5b8ef9fdd 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1042,4 +1042,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 96cc64ecd..5429dac80 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1045,4 +1045,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index ad0ec8280..ea22e1295 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1043,4 +1043,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 5b9c6c7d1..1321b90ee 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1062,4 +1062,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index ecd7976d8..5c15470c6 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1038,4 +1038,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 396f22cb3..b8308d249 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1041,4 +1041,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index ae87abc49..a42917910 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1054,4 +1054,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index a6d8d2000..9c34b4768 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1064,4 +1064,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index bcf4554d4..dffd47c2d 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1048,4 +1048,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index f2cd7fe49..65b6d333e 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1062,4 +1062,9 @@ $strTexyText = 'Texy! text'; //to translate $strDetails = 'Details...'; //to translate $strComment = 'Comment'; //to translate $strPacked = 'Packed'; //to translate +$strActions = 'Actions'; //to translate +$strInterface = 'Interface'; //to translate +$strMySQLServerInformation = 'MySQL server information'; //to translate +$strWebServerInformation = 'Web server information'; //to translate +$strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate ?> diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 363d7cc18..f6c3e6f0b 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -64,7 +64,7 @@ if (empty($GLOBALS['is_header_sent'])) { * Display heading if needed. Design can be set in css file. */ - if (PMA_DISPLAY_HEADING) { + if (PMA_DISPLAY_HEADING && $server > 0) { $server_info = (!empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'] . (empty($GLOBALS['cfg']['Server']['port']) diff --git a/main.php b/main.php index 3a28da85b..ed3e08a81 100644 --- a/main.php +++ b/main.php @@ -5,13 +5,6 @@ * @version $Id$ */ -/** - * Don't display the page heading - */ -if (!defined('PMA_DISPLAY_HEADING')) { - define('PMA_DISPLAY_HEADING', 0); -} - /** * Gets some core libraries and displays a top message if required */ @@ -31,33 +24,116 @@ if (! empty($message)) { $common_url_query = PMA_generate_common_url('', ''); -// this div is required for containing divs can be 50% +if ($server > 0) { + require './libraries/server_common.inc.php'; + require './libraries/StorageEngine.class.php'; + require './libraries/server_links.inc.php'; +} + echo '
' . "\n"; +echo '
'; +echo $strActions; /** * Displays the mysql server related links */ if ($server > 0) { - require_once './libraries/check_user_privileges.lib.php'; - // why this? a non-priv user should be able to change his - // password if the configuration permits - //$cfg['ShowChgPassword'] = $is_superuser = PMA_isSuperuser(); $is_superuser = PMA_isSuperuser(); if ($cfg['Server']['auth_type'] == 'config') { $cfg['ShowChgPassword'] = false; } } -?> -
- 0) { + echo '
    '; + if ($cfg['ShowCreateDb']) { + echo '
  • '; + require './libraries/display_create_database.lib.php'; + echo '
    • ' . "\n"; + } + + if ($is_reload_priv) { + PMA_printListItem($strReloadPrivileges, 'li_flush_privileges', + './server_privileges.php?flush_privileges=1&' . $common_url_query, 'flush'); + } + + /** + * Change password + * + * @todo ? needs another message + */ + if ($cfg['ShowChgPassword']) { + PMA_printListItem($strChangePassword, 'li_change_password', + './user_password.php?' . $common_url_query); + } // end if + + // Logout for advanced authentication + if ($cfg['Server']['auth_type'] != 'config') { + $http_logout = ($cfg['Server']['auth_type'] == 'http') + ? '' + . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' + : ''; + PMA_printListItem('' . $strLogout . ' ' . $http_logout, + 'li_log_out', + './index.php?' . $common_url_query . '&old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent'); + } // end if + +} // end of if ($server > 0) +?> + 1 || $server == 0 && count($cfg['Servers']) == 1)) { + if ($server == 0) { + echo '
      '; + } + echo '
    • '; + require_once './libraries/select_server.lib.php'; + PMA_select_server(true, true); + echo '
      • '; +} +echo '
    '; +echo '
'; + +echo '
'; +echo $strInterface; +echo '
    '; + +// Displays language selection combo +if (empty($cfg['Lang'])) { + echo '
  • '; + require_once './libraries/display_select_lang.lib.php'; + PMA_select_language(); + echo '
    • '; +} + +// added by Michael Keck +// ThemeManager if available + +if ($GLOBALS['cfg']['ThemeManager']) { + echo '
  • '; + echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(); + echo '
    • '; +} +echo '
  • '; +echo PMA_Config::getFontsizeForm(); +echo '
    • '; + +echo '
'; +echo '
'; + +echo '
'; +echo '
'; +if ($server > 0) { + echo $strMySQLServerInformation; // robbat2: Use the verbose name of the server instead of the hostname // if a value is set $server_info = ''; - if (!empty($cfg['Server']['verbose'])) { + if (! empty($cfg['Server']['verbose'])) { $server_info .= htmlspecialchars($cfg['Server']['verbose']); if ($GLOBALS['cfg']['ShowServerInfo']) { $server_info .= ' ('; @@ -67,7 +143,7 @@ if ($server > 0) { $server_info .= PMA_DBI_get_host_info(); } - if (!empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) { + if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) { $server_info .= ')'; } $mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();'); @@ -76,7 +152,7 @@ if ($server > 0) { $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host']); - echo '

' . $short_server_info . '

' . "\n"; + //echo '

' . $short_server_info . '

' . "\n"; unset($short_server_info); } @@ -84,10 +160,10 @@ if ($server > 0) { echo '
    ' . "\n"; if ($GLOBALS['cfg']['ShowServerInfo']) { + PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version'); PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), 'li_mysql_proto'); - PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host), 'li_user_info'); } else { @@ -114,126 +190,33 @@ if ($server > 0) { . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" . ' ' . "\n" . ' ' . "\n"; - - if ($cfg['ShowCreateDb']) { - echo '
  • '; - require './libraries/display_create_database.lib.php'; - echo '
    • ' . "\n"; - } - - PMA_printListItem($strMySQLShowStatus, 'li_mysql_status', - './server_status.php?' . $common_url_query); - PMA_printListItem($strMySQLShowVars, 'li_mysql_variables', - './server_variables.php?' . $common_url_query, 'show-variables'); - PMA_printListItem($strProcesses, 'li_mysql_processes', - './server_processlist.php?' . $common_url_query, 'show-processlist'); - PMA_printListItem($strCharsetsAndCollations, 'li_mysql_collations', - './server_collations.php?' . $common_url_query); - PMA_printListItem($strStorageEngines, 'li_mysql_engines', - './server_engines.php?' . $common_url_query); - - if ($is_reload_priv) { - PMA_printListItem($strReloadPrivileges, 'li_flush_privileges', - './server_privileges.php?flush_privileges=1&' . $common_url_query, 'flush'); - } - - if ($is_superuser) { - PMA_printListItem($strPrivileges, 'li_mysql_privilegs', - './server_privileges.php?' . $common_url_query); - } - - $binlogs = PMA_DBI_try_query('SHOW MASTER LOGS', null, PMA_DBI_QUERY_STORE); - if ($binlogs) { - if (PMA_DBI_num_rows($binlogs) > 0) { - PMA_printListItem($strBinaryLog, 'li_mysql_binlogs', - './server_binlog.php?' . $common_url_query); - } - PMA_DBI_free_result($binlogs); - } - unset($binlogs); - - PMA_printListItem($strDatabases, 'li_mysql_databases', - './server_databases.php?' . $common_url_query); - PMA_printListItem($strExport, 'li_export', - './server_export.php?' . $common_url_query); - PMA_printListItem($strImport, 'li_import', - './server_import.php?' . $common_url_query); - - /** - * Change password - * - * @todo ? needs another message - */ - if ($cfg['ShowChgPassword']) { - PMA_printListItem($strChangePassword, 'li_change_password', - './user_password.php?' . $common_url_query); - } // end if - - // Logout for advanced authentication - if ($cfg['Server']['auth_type'] != 'config') { - $http_logout = ($cfg['Server']['auth_type'] == 'http') - ? '' - . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' - : ''; - PMA_printListItem('' . $strLogout . ' ' . $http_logout, - 'li_log_out', - './index.php?' . $common_url_query . '&old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent'); - } // end if - - echo '
'; -} // end of if ($server > 0) -?> -
-
-phpMyAdmin - ' . PMA_VERSION . '' - . "\n"; - -echo '
    ' . "\n"; - -/** - * Displays the MySQL servers choice form - */ -if (!$cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) { - echo '
  • '; - require_once './libraries/select_server.lib.php'; - PMA_select_server(true, true); - echo '
    • '; + echo '
'; + echo '
'; } if ($server > 0) { + echo '
'; + echo $strWebServerInformation; + echo '
    '; + PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software'); PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(), 'li_mysql_client_version'); PMA_printListItem($strUsedPhpExtensions . ': ' . $GLOBALS['cfg']['Server']['extension'], 'li_used_php_extension'); } -// Displays language selection combo -if (empty($cfg['Lang'])) { - echo '
  • '; - require_once './libraries/display_select_lang.lib.php'; - PMA_select_language(); - echo '
    • '; -} - -// added by Michael Keck -// ThemeManager if available - -if ($GLOBALS['cfg']['ThemeManager']) { - echo '
  • '; - echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(); - echo '
    • '; -} -echo '
  • '; -echo PMA_Config::getFontsizeForm(); -echo '
    • '; -PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank'); -PMA_printListItem($strPmaWiki, 'li_pma_wiki', 'http://wiki.cihar.com', null, '_blank'); - if ($cfg['ShowPhpInfo']) { PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query); } +echo '
'; +echo '
'; + +echo '
'; +echo $strAboutphpMyAdmin; +echo '
    '; +PMA_printListItem($strVersionInformation . ': ' . PMA_VERSION, 'li_pma_version'); +PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank'); +PMA_printListItem($strPmaWiki, 'li_pma_wiki', 'http://wiki.cihar.com', null, '_blank'); // does not work if no target specified, don't know why PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmin.net/', null, '_blank'); @@ -247,7 +230,7 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi
-
+
here, otherwise it will not extend the outer div to the diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index a7882e0a7..2f4153e9c 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1197,3 +1197,15 @@ code.sql { overflow: auto; background: ; } + +.box { + float: ; + width: 49%; + border: solid 1px; + margin: 2px; +} + +.box_smaller { + width: 24%; +} + diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 5b0c135ee..cb3553bde 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1148,3 +1148,14 @@ code.sql { overflow: auto; background: ; } + +.box { + float: ; + width: 49%; + border: solid 1px; + margin: 2px; +} + +.box_smaller { + width: 24%; +}