From 7eaa57fc0b64d6df863b025fa2d66e82a393f1c3 Mon Sep 17 00:00:00 2001
From: Peter Knut <peter@ajtak.sk>
Date: Tue, 18 Dec 2018 15:45:04 +0100
Subject: [PATCH] Use <ul> list for logins (#314)

---
 adminer/include/adminer.inc.php   |  4 ++--
 adminer/static/default.css        |  4 ++--
 designs/brade/adminer.css         |  2 +-
 designs/bueltge/adminer.css       |  2 +-
 designs/cvicebni-ubor/adminer.css |  2 +-
 designs/galkaev/adminer.css       | 12 ++++++++++--
 designs/haeckel/adminer.css       |  2 +-
 designs/jukin/adminer.css         |  8 ++++----
 designs/konya/adminer.css         |  2 +-
 designs/mancave/adminer.css       | 11 ++++++++++-
 designs/mvt/adminer.css           |  4 ++--
 designs/nette/adminer.css         |  4 ++--
 designs/nicu/adminer.css          |  2 +-
 designs/pappu687/adminer.css      |  2 +-
 designs/paranoiq/adminer.css      |  4 ++--
 designs/pilot/adminer.css         |  8 +++++++-
 designs/pokorny/adminer.css       |  4 ++--
 editor/include/adminer.inc.php    |  4 ++--
 18 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index c10c62fc..5733b947 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -933,12 +933,12 @@ class Adminer {
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
 							if ($first) {
-								echo "<p id='logins'>" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
+								echo "<ul id='logins'>" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
 								$first = false;
 							}
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								echo "<a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
+								echo "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
 							}
 						}
 					}
diff --git a/adminer/static/default.css b/adminer/static/default.css
index 9511976a..4f9e3a1a 100644
--- a/adminer/static/default.css
+++ b/adminer/static/default.css
@@ -67,8 +67,8 @@ input.wayoff { left: -1000px; position: absolute; }
 .loadmore { margin-left: 1ex; }
 /* .edit used in designs */
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
-#menu p, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
-#tables li{ list-style: none; }
+#menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
 #logins, #tables { white-space: nowrap; overflow: auto; }
 #logins a, #tables a, #tables span { background: #fff; }
diff --git a/designs/brade/adminer.css b/designs/brade/adminer.css
index 31c088b3..45d27c09 100644
--- a/designs/brade/adminer.css
+++ b/designs/brade/adminer.css
@@ -46,7 +46,7 @@ border:5px solid #ccc;margin:0}
 #menu a:hover{background:#333;color:#fff;border-color:#333}
 #menu a.h1,#menu a.h1:hover{display:block;height:0;width:175px;padding:40px 0 0 0;overflow:hidden;float:left;border:0;margin:0;
 outline:0;background:url(//www.bradezone.com/random/adminer_logo.gif) no-repeat;line-height:32px}
-#menu p,#tables{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 0}
+#menu p,#logins,#tables{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 0}
 #breadcrumb{background:#333;color:#fff;position:fixed;top:0;left:320px;line-height:40px;padding:0;z-index:1;margin:0}
 #breadcrumb a{color:#ff9}
 #breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9}
diff --git a/designs/bueltge/adminer.css b/designs/bueltge/adminer.css
index a025fb84..876b48c8 100644
--- a/designs/bueltge/adminer.css
+++ b/designs/bueltge/adminer.css
@@ -339,7 +339,7 @@ border: 1px solid #E3E3E3;
 #menu form { 
 margin: 0;
 }
-#menu p, #tables {
+#menu p, #logins, #tables {
 padding-left: 8px;
 border-bottom: none;
 }
diff --git a/designs/cvicebni-ubor/adminer.css b/designs/cvicebni-ubor/adminer.css
index 30518150..19b69d87 100644
--- a/designs/cvicebni-ubor/adminer.css
+++ b/designs/cvicebni-ubor/adminer.css
@@ -173,7 +173,7 @@ h3{
  margin:0;}
 #menu form{
  margin:0;}
-#menu p,#tables{
+#menu p,#logins,#tables{
  padding-left:8px;
  border-bottom:none;}
 #menu form p{
diff --git a/designs/galkaev/adminer.css b/designs/galkaev/adminer.css
index 1eaeb2f0..dccf17eb 100644
--- a/designs/galkaev/adminer.css
+++ b/designs/galkaev/adminer.css
@@ -733,7 +733,7 @@ legend{
 }
 
 /* tables */
-#tables{
+#logins, #tables{
 	border-bottom: none;
 	line-height: 20px;
 	padding: 18px 0;
@@ -759,12 +759,20 @@ legend{
 	font-size: 14px;
 }
 
+#logins a {
+	display: block;
+	padding: 5px 18px 9px;
+	color: inherit;
+	font-size: 14px;
+}
+
 #tables a.select.active,
 #tables a.select:hover
 {
 	color: #fba;
 }
 
+#logins a:hover,
 #tables a[title]:hover,
 #tables a.active,
 #tables a.select:hover + a,
@@ -979,4 +987,4 @@ code.jush-sql ~ a:first-of-type::before{
 
 body > form{
 	position: absolute;
-}
\ No newline at end of file
+}
diff --git a/designs/haeckel/adminer.css b/designs/haeckel/adminer.css
index 69bdeaf6..4b865147 100644
--- a/designs/haeckel/adminer.css
+++ b/designs/haeckel/adminer.css
@@ -429,7 +429,7 @@ td, th {
 	border-width: 0 1px 1px 0;
 	font-size: 0.83em;   /* x-small;  font size */
 }
-#tables a {
+#logins a, #tables a {
 	height: 18px;
 	line-height: 18px;
 }
diff --git a/designs/jukin/adminer.css b/designs/jukin/adminer.css
index 7f269735..82d37ec2 100644
--- a/designs/jukin/adminer.css
+++ b/designs/jukin/adminer.css
@@ -18,10 +18,10 @@ img { vertical-align: middle; margin: 0; padding: 0; }
 .message { color: black; background: #dedede; padding: .5em .8em; border: 1px solid black; }
 #menu { overflow: scroll; position: absolute; top: 0; left: 0; width: 270px; white-space: nowrap; background: #FFE594 url('data:image/gif;base64,R0lGODlhXgEBAIIAAPzabPzijvzihPzefvzmnPzedPzmlPzadCwAAAAAXgEBAAIDYEi63P5wGTXJvNZew7sJBNiBwWeWaPoFbNq+cCzPs8DaeJDvuGAPOh9wIBgWAwMjMblsOpnQqHRKrRaY1+sguz1sB4esN0wulM+HtNqMZqsBafgBTp/PAfQ8fs/v+/8ACQA7') top left repeat-y; height: 100%; _height: 650px; border: 1px solid #a3a3a3; }
 #menu form { margin: 0; }
-#menu p, #tables li { text-align: center; font-size: 11px; }
-#menu p a, #tables li a { color: black; }
-#menu p a:hover, #tables li a:hover { color: #626262; text-decoration: none; }
-#tables a, #tables span { background: #FFE594; }
+#menu p, #logins li, #tables li { text-align: center; font-size: 11px; }
+#menu p a, #logins li a, #tables li a { color: black; }
+#menu p a:hover, #logins li a:hover, #tables li a:hover { color: #626262; text-decoration: none; }
+#logins a, #tables a, #tables span { background: #FFE594; }
 #content { margin: 1.5em 0 0 293px; padding: 10px 20px 20px 0; }
 #lang { margin: 0; padding: 0; text-align: center; font-size: 10px; width: 270px; background-color: #d9dadb; border-bottom: 1px solid black; }
 #lang a { color: black; font-weight: bold; }
diff --git a/designs/konya/adminer.css b/designs/konya/adminer.css
index 6d65c365..78295af6 100644
--- a/designs/konya/adminer.css
+++ b/designs/konya/adminer.css
@@ -106,7 +106,7 @@ img {vertical-align: middle; margin: 0; padding: 0;}
 #breadcrumb {margin: 0; height: 21px; display: block; position: absolute; top: 0; left: 300px; background-color: #f1f1f1; border: 1px solid #E3E3E3; padding: 2px 12px; line-height: 1.25em }
 #menu {position: absolute; padding: 10px; margin: 0; top: 28px; left: 0; width: 250px; background-color: #f1f1f1; border: 1px solid #E3E3E3;}
 #menu form {margin: 0;}
-#menu p, #tables {padding-left: 8px; font-size: 10pt; border-bottom: none;}
+#menu p, #logins, #tables {padding-left: 8px; font-size: 10pt; border-bottom: none;}
 #menu form p {padding-left: 0; text-align: left;}
 h1 .h1:hover {text-decoration: underline;} 
 h1, h2 {font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; margin: 0; padding: 14px 15px 3px 10px; line-height: 35px; text-shadow: rgba(255,255,255,1) 0 1px 0px; background: none;}
diff --git a/designs/mancave/adminer.css b/designs/mancave/adminer.css
index 73ab6d29..44654d4d 100644
--- a/designs/mancave/adminer.css
+++ b/designs/mancave/adminer.css
@@ -794,7 +794,7 @@ legend{
 }
 
 /* tables */
-#tables{
+#logins, #tables{
 	border-bottom: none;
 	line-height: 20px;
 	padding: 18px 0;
@@ -820,12 +820,21 @@ legend{
 	font-size: 14px;
 }
 
+#logins a {
+	display: block;
+	padding: 5px 18px;
+	line-height: 14px;
+	color: #F1E5B3;
+	font-size: 14px;
+}
+
 #tables a.select.active,
 #tables a.select:hover
 {
 	color: red;
 }
 
+#logins a:hover,
 #tables a[title]:hover,
 #tables a.active,
 #tables a.select:hover + a,
diff --git a/designs/mvt/adminer.css b/designs/mvt/adminer.css
index 9b64b248..21b4ace5 100644
--- a/designs/mvt/adminer.css
+++ b/designs/mvt/adminer.css
@@ -557,7 +557,7 @@ table tbody input ~ a[href*="&edit="][href*="&where"] {
 	top: 0;
 }
 
-#tables {
+#logins, #tables {
 	padding: 0 0 0 5px;
 	margin: 0;
 	list-style: none;
@@ -588,7 +588,7 @@ table tbody input ~ a[href*="&edit="][href*="&where"] {
 	font-size: 11px;
 }
 
-#menu a, #tables .select {
+#menu a, #logins a, #tables .select {
 	display: inline-block;
 	vertical-align: middle;
 	margin-right: 5px
diff --git a/designs/nette/adminer.css b/designs/nette/adminer.css
index 1c024212..e0c0a9e3 100644
--- a/designs/nette/adminer.css
+++ b/designs/nette/adminer.css
@@ -282,7 +282,7 @@ table code {
 	margin-right: 4px;
 }
 
-#tables a {
+#logins a, #tables a {
 	padding: 1px 2px;
 }
 
@@ -290,7 +290,7 @@ table code {
 	color: #FFF;
 }
 
-#menu p, #tables {
+#menu p, #logins, #tables {
 	border: none;
 	margin: 0 0 4px;
 	padding: 0 0 4px;
diff --git a/designs/nicu/adminer.css b/designs/nicu/adminer.css
index de0459a0..bdddded0 100644
--- a/designs/nicu/adminer.css
+++ b/designs/nicu/adminer.css
@@ -268,7 +268,7 @@ td.nowrap {
     padding: 0 0 30px 0;
     background: #f1f1f1;
 }
-#menu p, #tables {
+#menu p, #logins, #tables {
     margin: 0;
     padding: .8em 1em;
     border-bottom: 1px solid #c7c7c7;
diff --git a/designs/pappu687/adminer.css b/designs/pappu687/adminer.css
index e139fe52..cda25994 100644
--- a/designs/pappu687/adminer.css
+++ b/designs/pappu687/adminer.css
@@ -232,7 +232,7 @@ tr.odd td {
 	border-right:2px solid #34495e;
 }
 
-#menu p, #tables{
+#menu p, #logins, #tables{
 	border-bottom:1px solid rgb(85, 112, 139);
 }
 
diff --git a/designs/paranoiq/adminer.css b/designs/paranoiq/adminer.css
index a3cd5bf5..cc20d0b8 100644
--- a/designs/paranoiq/adminer.css
+++ b/designs/paranoiq/adminer.css
@@ -177,11 +177,11 @@ h3 {
     top: 38px;
     width: 180px;
     background-color: #DEF; }
-#menu p, #tables {
+#menu p, #logins, #tables {
     padding-left: 8px;
     font-size: 10pt;
     border-bottom: none; }
-#tables a, #tables span {
+#logins a, #tables a, #tables span {
     background: #DEF;
 }
 
diff --git a/designs/pilot/adminer.css b/designs/pilot/adminer.css
index 31e89f72..abc01af6 100644
--- a/designs/pilot/adminer.css
+++ b/designs/pilot/adminer.css
@@ -51,11 +51,17 @@
 	width: 270px;
 }
 
-#tables li {
+#logins li, #tables li {
     position: relative;
     height: 23px;
 }
 
+#logins a {
+	display: block;
+	margin-top: 5px;
+	padding: 0 10px;
+}
+
 #tables a {
 	display: block;
 	margin: 0;
diff --git a/designs/pokorny/adminer.css b/designs/pokorny/adminer.css
index 6e4ba1f8..6d4c87e9 100644
--- a/designs/pokorny/adminer.css
+++ b/designs/pokorny/adminer.css
@@ -244,7 +244,7 @@ td, th {
     border-color: #bbb;
     border-width: 0 1px 1px 0;
 }
-#tables a {
+#logins a, #tables a {
     height: 18px;
     line-height: 18px;
 }
@@ -270,7 +270,7 @@ a, a:visited {
     padding-bottom: 0;
     top: 0;
 }
-#tables a, #tables span {
+#logins a, #tables a, #tables span {
     background: #fafafa;
 }
 /*** Forms ***/
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 29125345..d014f921 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -586,11 +586,11 @@ qsl('div').onclick = whisperClick;", "")
 				foreach ($servers[""] as $username => $password) {
 					if ($password !== null) {
 						if ($first) {
-							echo "<p id='logins'>";
+							echo "<ul id='logins'>";
 							echo script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
 							$first = false;
 						}
-						echo "<a href='" . h(auth_url($vendor, "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n";
+						echo "<li><a href='" . h(auth_url($vendor, "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a>\n";
 					}
 				}
 			}