From 493de37977797abf59deae8d2bfa39ee3a90b09c Mon Sep 17 00:00:00 2001 From: Lionel Laffineur Date: Fri, 14 Jul 2023 22:19:15 +0200 Subject: [PATCH] Adding | to separate action links for better readability --- adminer/db.inc.php | 3 ++- adminer/include/adminer.inc.php | 12 ++++++------ adminer/sql.inc.php | 2 +- adminer/static/default.css | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/adminer/db.inc.php b/adminer/db.inc.php index 6d7f8dd8..4ef8b781 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -157,7 +157,8 @@ if ($adminer->homepage()) { } echo '

' . lang('Create table') . "\n"; - echo (support("view") ? '' . lang('Create view') . "\n" : ""); + echo (support("view") ? ' | ' . lang('Create view') . "\n" : ""); + echo '

'; if (support("routine")) { echo "

" . lang('Routines') . "

\n"; diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index b8bbbc55..60e23e01 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -193,7 +193,7 @@ class Adminer { $name = $tableStatus["Name"]; foreach ($links as $key => $val) { if ($key !== array_key_first($links)) { - echo "|"; + echo " | "; } echo " $val"; } @@ -243,7 +243,7 @@ class Adminer { } return "

" . h(str_replace("\n", " ", $query)) . " (" . format_time($start) . ")" . (support("sql") ? " " . lang('Edit') . "" : "") - . " " . lang('Copy to clipboard') . "" + . " | " . lang('Copy to clipboard') . "" . $return ; } @@ -658,7 +658,7 @@ class Adminer { return " " . @date("H:i:s") . "" // @ - time zone may be not set . " $return

' ; } @@ -992,13 +992,13 @@ bodyLoad('databasesPrint($missing); if (DB == "" || !$missing) { - echo "

" . (support("sql") ? "" . lang('SQL command') . "\n" . lang('Import') . "\n" : "") . ""; + echo "

" . (support("sql") ? "" . lang('SQL command') . "\n | " . lang('Import') . "\n" : "") . ""; if (support("dump")) { - echo "" . lang('Export') . "\n"; + echo " | " . lang('Export') . "\n"; } } if ($_GET["ns"] !== "" && !$missing && DB != "") { - echo '" . lang('Create table') . "\n"; + echo '
" . lang('Create table') . "\n"; if (!$tables) { echo "

" . lang('No tables.') . "\n"; } else { diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php index 3685b320..ef7ef31a 100644 --- a/adminer/sql.inc.php +++ b/adminer/sql.inc.php @@ -98,7 +98,7 @@ if (!$error && $_POST) { $q = substr($query, 0, $pos); $commands++; $print = "

" . $adminer->sqlCommandQuery($q) . "
\n"; - $print .= "" . lang('Copy to clipboard') . ""; + $print .= " | " . lang('Copy to clipboard') . ""; if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) { // PHP doesn't support setting SQLITE_LIMIT_ATTACHED echo $print; diff --git a/adminer/static/default.css b/adminer/static/default.css index 9b84ac78..0a0ba88d 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -24,7 +24,7 @@ code { background: #eee; } tbody tr:hover td, tbody tr:hover th { background: #eee; } pre { margin: 1em 0 0; } pre, textarea { font: 100%/1.25 monospace; } -input { vertical-align: middle; border-radius: 5px; padding: 2px; } +input, button { vertical-align: middle; border-radius: 5px; padding: 2px; } input.default { box-shadow: 1px 1px 1px #777; } input.required { box-shadow: 1px 1px 1px red; } input.maxlength { box-shadow: 1px 1px 1px red; } @@ -64,7 +64,7 @@ select { border-radius: 5px; padding: 2px; vertical-align: middle;; } .footer { position: sticky; bottom: 0; margin-right: -20px; border-top: 20px solid rgba(255, 255, 255, .7); border-image: linear-gradient(rgba(255, 255, 255, .2), #fff) 100% 0; } .footer > div { background: #fff; padding: 0 0 .5em; } .footer fieldset { margin-top: 0; } -.links a { white-space: nowrap; margin-right: 5px; } +.links a { white-space: nowrap; } .logout { margin-top: .5em; position: absolute; top: 0; right: 0; } .loadmore { margin-left: 1ex; } /* .edit used in designs */