From 28acee861f796a3ffad13b640339fb02bcf48ad4 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 9 Feb 2018 23:28:19 +0100 Subject: [PATCH] Move pagination outside footer --- adminer/select.inc.php | 12 ++++++++---- adminer/static/default.css | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 426eda3c..51da5970 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -462,7 +462,6 @@ if (!$columns && support("table")) { } if (!is_ajax()) { - echo "
\n"; if ($rows || $page) { $exact_count = true; if ($_GET["page"] != "last") { @@ -513,10 +512,15 @@ if (!$columns && support("table")) { } echo "\n"; } - - echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : ""); + } + + echo "
\n"; + if ($rows || $page) { + echo "
"; + echo "" . lang('whole result') . ""; $display_rows = ($exact_count ? "" : "~ ") . $found_rows; - echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n"; + echo checkbox("all", 1, 0, ($found_rows !== false ? ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) : ""), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n"; + echo "
\n"; if ($adminer->selectCommandPrint()) { ?> diff --git a/adminer/static/default.css b/adminer/static/default.css index 0c6bb372..d6a4340b 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -59,7 +59,7 @@ input.wayoff { left: -1000px; position: absolute; } .size { width: 6ex; } .help { cursor: help; } .footer { position: sticky; bottom: 0; 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: 1px 0 .5em; } +.footer > div { background: #fff; padding: 0 0 .5em; } .links a { white-space: nowrap; margin-right: 20px; } .logout { margin-top: .5em; position: absolute; top: 0; right: 0; } .loadmore { margin-left: 1ex; } -- 2.39.5