From 340a1c2c2ff8077f565b915a7b4c055f7c7cac16 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 8 Jul 2013 23:51:50 -0700 Subject: [PATCH] Disable underlining links --- adminer/db.inc.php | 11 ++++++----- adminer/include/adminer.inc.php | 8 ++++---- adminer/include/connect.inc.php | 2 +- adminer/static/default.css | 5 +++-- changes.txt | 1 + 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/adminer/db.inc.php b/adminer/db.inc.php index 9ec3f95f..627ca077 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -123,10 +123,8 @@ if ($adminer->homepage()) { echo "\n"; } - echo '

' . lang('Create table') . "\n"; - if (support("view")) { - echo '' . lang('Create view') . "\n"; - } + echo '

' . lang('Create table') . "\n"; + echo (support("view") ? '' . lang('Create view') . "\n" : ""); if (support("routine")) { echo "

" . lang('Routines') . "

\n"; @@ -144,7 +142,10 @@ if ($adminer->homepage()) { } echo "\n"; } - echo '

' . (support("procedure") ? '' . lang('Create procedure') . ' ' : '') . '' . lang('Create function') . "\n"; + echo '

' + . (support("procedure") ? '' . lang('Create procedure') . '' : '') + . '' . lang('Create function') . "\n" + ; } if (support("sequence")) { diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 1bf15416..0e7f27fb 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -119,7 +119,7 @@ username.form['auth[driver]'].onchange(); * @return null */ function selectLinks($tableStatus, $set = "") { - echo '

'; + echo '

'; $links = array("select" => lang('Select data'), "table" => lang('Show structure')); if (is_view($tableStatus)) { $links["view"] = lang('Alter view'); @@ -724,7 +724,7 @@ username.form['auth[driver]'].onchange(); * @return bool whether to print default homepage */ function homepage() { - echo '

' . ($_GET["ns"] == "" ? '' . lang('Alter database') . "\n" : ""); + echo '

' . ($_GET["ns"] == "" ? '' . lang('Alter database') . "\n" : ""); echo (support("scheme") ? "" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "\n" : ""); echo ($_GET["ns"] !== "" ? '' . lang('Database schema') . "\n" : ""); echo (support("privileges") ? "" . lang('Privileges') . "\n" : ""); @@ -763,14 +763,14 @@ username.form['auth[driver]'].onchange(); } } else { if (DB == "" || !$missing) { - echo "

" . lang('SQL command') . "\n"; + echo "

" . lang('SQL command') . "\n"; if (support("dump")) { echo "" . lang('Dump') . "\n"; } } $this->databasesPrint($missing); if ($_GET["ns"] !== "" && !$missing && DB != "") { - echo '

" . lang('Create new table') . "\n"; + echo '

" . lang('Create new table') . "\n"; $tables = table_status('', true); if (!$tables) { echo "

" . lang('No tables.') . "\n"; diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php index 3ee717f5..6f0fd4f8 100644 --- a/adminer/include/connect.inc.php +++ b/adminer/include/connect.inc.php @@ -11,7 +11,7 @@ function connect_error() { } page_header(lang('Select database'), $error, false); - echo "

" . lang('Create new database') . "\n"; + echo "

" . lang('Create new database') . "\n"; foreach (array( 'privileges' => lang('Privileges'), 'processlist' => lang('Process list'), diff --git a/adminer/static/default.css b/adminer/static/default.css index 86b1bc08..f2a67664 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -1,8 +1,8 @@ /** @author Ondrej Valka, http://valka.info */ body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; } -a { color: blue; } +a { color: blue; text-decoration: none; } a:visited { color: navy; } -a:hover { color: red; } +a:link:hover, a:visited:hover { color: red; text-decoration: underline; } a.text { text-decoration: none; } h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; } h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; } @@ -50,6 +50,7 @@ input.default { box-shadow: 1px 1px 1px #777; } .size { width: 6ex; } .help { cursor: help; } .pages { position: fixed; bottom: 0; left: 21em; padding: 5px; background: #ddf; border: 1px solid #999; } +.links a { white-space: nowrap; margin-right: 20px; } .logout { margin-top: .5em; position: absolute; top: 0; right: 0; } #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; } #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; } diff --git a/changes.txt b/changes.txt index 1f2433bd..a4da78b7 100644 --- a/changes.txt +++ b/changes.txt @@ -5,6 +5,7 @@ Mark length as required for strings Add label to database selection Add button for dropping an index Display number of selected rows +Disable underlining links PostgreSQL: Fix handling of nextval() default values Adminer 3.7.1 (released 2013-06-29):