Use <ul> list for logins (#314)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index c10c62fc897c073382c2e3064a3e0e3b31e5afa0..5733b947358146bd2726ab797e897b6409b4bda9 100644 (file)
--- 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 9511976ab7b09662caa586c50ddcc91e3f5af391..4f9e3a1a23f6414f2523483bf884f5a832748fbe 100644 (file)
--- 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 31c088b3c88de400af163167caa3bcc79927852a..45d27c09ad31528996a9c80b4dcbea22742ed3aa 100644 (file)
--- 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 a025fb84524d30cfca6d7e37ca597f38fe9794cc..876b48c84cc7fb9802bcc7b5fec7e226b2b7fcd6 100644 (file)
--- a/designs/bueltge/adminer.css
+++ b/designs/bueltge/adminer.css
@@ -339,7 +339,7 @@ border: 1px solid #E3E3E3;
 #menu form { \r
 margin: 0;\r
 }\r
-#menu p, #tables {\r
+#menu p, #logins, #tables {\r
 padding-left: 8px;\r
 border-bottom: none;\r
 }\r

diff --git a/designs/cvicebni-ubor/adminer.css b/designs/cvicebni-ubor/adminer.css
index 30518150ebf79fb54fb0edc496d13b7415edbf58..19b69d872cfe0f6d0655afd63f584d3ec401879f 100644 (file)
--- a/designs/cvicebni-ubor/adminer.css
+++ b/designs/cvicebni-ubor/adminer.css
@@ -173,7 +173,7 @@ h3{
  margin:0;}\r
 #menu form{\r
  margin:0;}\r
-#menu p,#tables{\r
+#menu p,#logins,#tables{\r
  padding-left:8px;\r
  border-bottom:none;}\r
 #menu form p{\r

diff --git a/designs/galkaev/adminer.css b/designs/galkaev/adminer.css
index 1eaeb2f05e0417d83aca1c2cbfe4af579ee57641..dccf17eb0af549fe473fc3a2bc0e474c0c3cdd2f 100644 (file)
--- a/designs/galkaev/adminer.css
+++ b/designs/galkaev/adminer.css
@@ -733,7 +733,7 @@ legend{
 }\r
 \r
 /* tables */\r
-#tables{\r
+#logins, #tables{\r
        border-bottom: none;\r
        line-height: 20px;\r
        padding: 18px 0;\r
@@ -759,12 +759,20 @@ legend{
        font-size: 14px;\r
 }\r
 \r
+#logins a {\r
+       display: block;\r
+       padding: 5px 18px 9px;\r
+       color: inherit;\r
+       font-size: 14px;\r
+}\r
+\r
 #tables a.select.active,\r
 #tables a.select:hover\r
 {\r
        color: #fba;\r
 }\r
 \r
+#logins a:hover,\r
 #tables a[title]:hover,\r
 #tables a.active,\r
 #tables a.select:hover + a,\r
@@ -979,4 +987,4 @@ code.jush-sql ~ a:first-of-type::before{
 \r
 body > form{\r
        position: absolute;\r
-}
\ No newline at end of file
+}\r

diff --git a/designs/haeckel/adminer.css b/designs/haeckel/adminer.css
index 69bdeaf63a8b174720744fc77574603ebe035dd2..4b865147f74c11d65e11a8a41e8e4c82c5adad9c 100644 (file)
--- 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 7f2697356fd76d38c1a4f523777e24677723b2b6..82d37ec2bc9ab2669a449ec27c0b9d4dd90b8974 100644 (file)
--- 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; }\r
 #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; }\r
 #menu form { margin: 0; }\r
-#menu p, #tables li { text-align: center; font-size: 11px; }\r
-#menu p a, #tables li a { color: black; }\r
-#menu p a:hover, #tables li a:hover { color: #626262; text-decoration: none; }\r
-#tables a, #tables span { background: #FFE594; }\r
+#menu p, #logins li, #tables li { text-align: center; font-size: 11px; }\r
+#menu p a, #logins li a, #tables li a { color: black; }\r
+#menu p a:hover, #logins li a:hover, #tables li a:hover { color: #626262; text-decoration: none; }\r
+#logins a, #tables a, #tables span { background: #FFE594; }\r
 #content { margin: 1.5em 0 0 293px; padding: 10px 20px 20px 0; }\r
 #lang { margin: 0; padding: 0; text-align: center; font-size: 10px; width: 270px; background-color: #d9dadb; border-bottom: 1px solid black; }\r
 #lang a { color: black; font-weight: bold; }\r

diff --git a/designs/konya/adminer.css b/designs/konya/adminer.css
index 6d65c3652ef548306ab4a3665e316778a528cd75..78295af6f274b222cea2746b1f315f52efb64d94 100644 (file)
--- 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 }\r
 #menu {position: absolute; padding: 10px; margin: 0; top: 28px; left: 0; width: 250px; background-color: #f1f1f1; border: 1px solid #E3E3E3;}\r
 #menu form {margin: 0;}\r
-#menu p, #tables {padding-left: 8px; font-size: 10pt; border-bottom: none;}\r
+#menu p, #logins, #tables {padding-left: 8px; font-size: 10pt; border-bottom: none;}\r
 #menu form p {padding-left: 0; text-align: left;}\r
 h1 .h1:hover {text-decoration: underline;} \r
 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;}\r

diff --git a/designs/mancave/adminer.css b/designs/mancave/adminer.css
index 73ab6d298cba7b1906b7331ab0efeb037bfdf66b..44654d4ddf0ead253e9b9641e538818b35a1a96e 100644 (file)
--- 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 9b64b248791248ff392ea2dd4cdc7e5d23fc824b..21b4ace598965b615f571be0d648a509eb2a9a3d 100644 (file)
--- 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 1c024212b1724758666dbeddf1049f920796fdc7..e0c0a9e3f1a9e6fc0505b209a065ed489c621ab1 100644 (file)
--- a/designs/nette/adminer.css
+++ b/designs/nette/adminer.css
@@ -282,7 +282,7 @@ table code {
        margin-right: 4px;\r
 }\r
 \r
-#tables a {\r
+#logins a, #tables a {\r
        padding: 1px 2px;\r
 }\r
 \r
@@ -290,7 +290,7 @@ table code {
        color: #FFF;\r
 }\r
 \r
-#menu p, #tables {\r
+#menu p, #logins, #tables {\r
        border: none;\r
        margin: 0 0 4px;\r
        padding: 0 0 4px;\r

diff --git a/designs/nicu/adminer.css b/designs/nicu/adminer.css
index de0459a01385d86b75489df7bbd8cdfe3539f6c6..bdddded02bf89c7ea9f8cc8e5fc432f6d691ef53 100644 (file)
--- 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 e139fe52960595b54b46c28b9856f9aeeaf72539..cda2599481337aa4412e8f611adcc85d2e4720d1 100644 (file)
--- a/designs/pappu687/adminer.css
+++ b/designs/pappu687/adminer.css
@@ -232,7 +232,7 @@ tr.odd td {
        border-right:2px solid #34495e;\r
 }\r
 \r
-#menu p, #tables{\r
+#menu p, #logins, #tables{\r
        border-bottom:1px solid rgb(85, 112, 139);\r
 }\r
 \r

diff --git a/designs/paranoiq/adminer.css b/designs/paranoiq/adminer.css
index a3cd5bf5a9d87d1b9cb53053ba9ec87c1672cda4..cc20d0b80dde2b2b569b0f2b4edd646d582f430c 100644 (file)
--- a/designs/paranoiq/adminer.css
+++ b/designs/paranoiq/adminer.css
@@ -177,11 +177,11 @@ h3 {
     top: 38px;\r
     width: 180px;\r
     background-color: #DEF; }\r
-#menu p, #tables {\r
+#menu p, #logins, #tables {\r
     padding-left: 8px;\r
     font-size: 10pt;\r
     border-bottom: none; }\r
-#tables a, #tables span {\r
+#logins a, #tables a, #tables span {\r
     background: #DEF;\r
 }\r
 \r

diff --git a/designs/pilot/adminer.css b/designs/pilot/adminer.css
index 31e89f72480d57a955ce45d3f66bfb71760d61f0..abc01af6a7b6cd1c514d2ccc01a0da79b25d8a66 100644 (file)
--- a/designs/pilot/adminer.css
+++ b/designs/pilot/adminer.css
@@ -51,11 +51,17 @@
        width: 270px;\r
 }\r
 \r
-#tables li {\r
+#logins li, #tables li {\r
     position: relative;\r
     height: 23px;\r
 }\r
 \r
+#logins a {\r
+       display: block;\r
+       margin-top: 5px;\r
+       padding: 0 10px;\r
+}\r
+\r
 #tables a {\r
        display: block;\r
        margin: 0;\r

diff --git a/designs/pokorny/adminer.css b/designs/pokorny/adminer.css
index 6e4ba1f872ea48f3f6b8787090cf5072fd52c31c..6d4c87e978cc313b2f7d906e99e126b8dded7469 100644 (file)
--- a/designs/pokorny/adminer.css
+++ b/designs/pokorny/adminer.css
@@ -244,7 +244,7 @@ td, th {
     border-color: #bbb;\r
     border-width: 0 1px 1px 0;\r
 }\r
-#tables a {\r
+#logins a, #tables a {\r
     height: 18px;\r
     line-height: 18px;\r
 }\r
@@ -270,7 +270,7 @@ a, a:visited {
     padding-bottom: 0;\r
     top: 0;\r
 }\r
-#tables a, #tables span {\r
+#logins a, #tables a, #tables span {\r
     background: #fafafa;\r
 }\r
 /*** Forms ***/\r

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 2912534573540685e9b0421ec27a8ef94fb0edf4..d014f92158030e022a212aac1935806079dd270b 100644 (file)
--- 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";
                                        }
                                }
                        }