Use <ul> list for logins (#314)

This commit is contained in:
Peter Knut 2018-12-18 15:45:04 +01:00 committed by Jakub Vrána
parent c275362c30
commit 7eaa57fc0b
18 changed files with 52 additions and 29 deletions

View file

@ -933,12 +933,12 @@ class Adminer {
foreach ($usernames as $username => $password) { foreach ($usernames as $username => $password) {
if ($password !== null) { if ($password !== null) {
if ($first) { 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; $first = false;
} }
$dbs = $_SESSION["db"][$vendor][$server][$username]; $dbs = $_SESSION["db"][$vendor][$server][$username];
foreach (($dbs ? array_keys($dbs) : array("")) as $db) { 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";
} }
} }
} }

View file

@ -67,8 +67,8 @@ input.wayoff { left: -1000px; position: absolute; }
.loadmore { margin-left: 1ex; } .loadmore { margin-left: 1ex; }
/* .edit used in designs */ /* .edit used in designs */
#menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; } #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; } #menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
#tables li{ list-style: none; } #logins li, #tables li { list-style: none; }
#dbs { overflow: hidden; } #dbs { overflow: hidden; }
#logins, #tables { white-space: nowrap; overflow: auto; } #logins, #tables { white-space: nowrap; overflow: auto; }
#logins a, #tables a, #tables span { background: #fff; } #logins a, #tables a, #tables span { background: #fff; }

View file

@ -46,7 +46,7 @@ border:5px solid #ccc;margin:0}
#menu a:hover{background:#333;color:#fff;border-color:#333} #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; #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} 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{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{color:#ff9}
#breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9} #breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9}

View file

@ -339,7 +339,7 @@ border: 1px solid #E3E3E3;
#menu form { #menu form {
margin: 0; margin: 0;
} }
#menu p, #tables { #menu p, #logins, #tables {
padding-left: 8px; padding-left: 8px;
border-bottom: none; border-bottom: none;
} }

View file

@ -173,7 +173,7 @@ h3{
margin:0;} margin:0;}
#menu form{ #menu form{
margin:0;} margin:0;}
#menu p,#tables{ #menu p,#logins,#tables{
padding-left:8px; padding-left:8px;
border-bottom:none;} border-bottom:none;}
#menu form p{ #menu form p{

View file

@ -733,7 +733,7 @@ legend{
} }
/* tables */ /* tables */
#tables{ #logins, #tables{
border-bottom: none; border-bottom: none;
line-height: 20px; line-height: 20px;
padding: 18px 0; padding: 18px 0;
@ -759,12 +759,20 @@ legend{
font-size: 14px; font-size: 14px;
} }
#logins a {
display: block;
padding: 5px 18px 9px;
color: inherit;
font-size: 14px;
}
#tables a.select.active, #tables a.select.active,
#tables a.select:hover #tables a.select:hover
{ {
color: #fba; color: #fba;
} }
#logins a:hover,
#tables a[title]:hover, #tables a[title]:hover,
#tables a.active, #tables a.active,
#tables a.select:hover + a, #tables a.select:hover + a,
@ -979,4 +987,4 @@ code.jush-sql ~ a:first-of-type::before{
body > form{ body > form{
position: absolute; position: absolute;
} }

View file

@ -429,7 +429,7 @@ td, th {
border-width: 0 1px 1px 0; border-width: 0 1px 1px 0;
font-size: 0.83em; /* x-small; font size */ font-size: 0.83em; /* x-small; font size */
} }
#tables a { #logins a, #tables a {
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
} }

View file

@ -18,10 +18,10 @@ img { vertical-align: middle; margin: 0; padding: 0; }
.message { color: black; background: #dedede; padding: .5em .8em; border: 1px solid black; } .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 { 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 form { margin: 0; }
#menu p, #tables li { text-align: center; font-size: 11px; } #menu p, #logins li, #tables li { text-align: center; font-size: 11px; }
#menu p a, #tables li a { color: black; } #menu p a, #logins li a, #tables li a { color: black; }
#menu p a:hover, #tables li a:hover { color: #626262; text-decoration: none; } #menu p a:hover, #logins li a:hover, #tables li a:hover { color: #626262; text-decoration: none; }
#tables a, #tables span { background: #FFE594; } #logins a, #tables a, #tables span { background: #FFE594; }
#content { margin: 1.5em 0 0 293px; padding: 10px 20px 20px 0; } #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 { 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; } #lang a { color: black; font-weight: bold; }

View file

@ -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 } #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 {position: absolute; padding: 10px; margin: 0; top: 28px; left: 0; width: 250px; background-color: #f1f1f1; border: 1px solid #E3E3E3;}
#menu form {margin: 0;} #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;} #menu form p {padding-left: 0; text-align: left;}
h1 .h1:hover {text-decoration: underline;} 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;} 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;}

View file

@ -794,7 +794,7 @@ legend{
} }
/* tables */ /* tables */
#tables{ #logins, #tables{
border-bottom: none; border-bottom: none;
line-height: 20px; line-height: 20px;
padding: 18px 0; padding: 18px 0;
@ -820,12 +820,21 @@ legend{
font-size: 14px; 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.active,
#tables a.select:hover #tables a.select:hover
{ {
color: red; color: red;
} }
#logins a:hover,
#tables a[title]:hover, #tables a[title]:hover,
#tables a.active, #tables a.active,
#tables a.select:hover + a, #tables a.select:hover + a,

View file

@ -557,7 +557,7 @@ table tbody input ~ a[href*="&edit="][href*="&where"] {
top: 0; top: 0;
} }
#tables { #logins, #tables {
padding: 0 0 0 5px; padding: 0 0 0 5px;
margin: 0; margin: 0;
list-style: none; list-style: none;
@ -588,7 +588,7 @@ table tbody input ~ a[href*="&edit="][href*="&where"] {
font-size: 11px; font-size: 11px;
} }
#menu a, #tables .select { #menu a, #logins a, #tables .select {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 5px margin-right: 5px

View file

@ -282,7 +282,7 @@ table code {
margin-right: 4px; margin-right: 4px;
} }
#tables a { #logins a, #tables a {
padding: 1px 2px; padding: 1px 2px;
} }
@ -290,7 +290,7 @@ table code {
color: #FFF; color: #FFF;
} }
#menu p, #tables { #menu p, #logins, #tables {
border: none; border: none;
margin: 0 0 4px; margin: 0 0 4px;
padding: 0 0 4px; padding: 0 0 4px;

View file

@ -268,7 +268,7 @@ td.nowrap {
padding: 0 0 30px 0; padding: 0 0 30px 0;
background: #f1f1f1; background: #f1f1f1;
} }
#menu p, #tables { #menu p, #logins, #tables {
margin: 0; margin: 0;
padding: .8em 1em; padding: .8em 1em;
border-bottom: 1px solid #c7c7c7; border-bottom: 1px solid #c7c7c7;

View file

@ -232,7 +232,7 @@ tr.odd td {
border-right:2px solid #34495e; border-right:2px solid #34495e;
} }
#menu p, #tables{ #menu p, #logins, #tables{
border-bottom:1px solid rgb(85, 112, 139); border-bottom:1px solid rgb(85, 112, 139);
} }

View file

@ -177,11 +177,11 @@ h3 {
top: 38px; top: 38px;
width: 180px; width: 180px;
background-color: #DEF; } background-color: #DEF; }
#menu p, #tables { #menu p, #logins, #tables {
padding-left: 8px; padding-left: 8px;
font-size: 10pt; font-size: 10pt;
border-bottom: none; } border-bottom: none; }
#tables a, #tables span { #logins a, #tables a, #tables span {
background: #DEF; background: #DEF;
} }

View file

@ -51,11 +51,17 @@
width: 270px; width: 270px;
} }
#tables li { #logins li, #tables li {
position: relative; position: relative;
height: 23px; height: 23px;
} }
#logins a {
display: block;
margin-top: 5px;
padding: 0 10px;
}
#tables a { #tables a {
display: block; display: block;
margin: 0; margin: 0;

View file

@ -244,7 +244,7 @@ td, th {
border-color: #bbb; border-color: #bbb;
border-width: 0 1px 1px 0; border-width: 0 1px 1px 0;
} }
#tables a { #logins a, #tables a {
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
} }
@ -270,7 +270,7 @@ a, a:visited {
padding-bottom: 0; padding-bottom: 0;
top: 0; top: 0;
} }
#tables a, #tables span { #logins a, #tables a, #tables span {
background: #fafafa; background: #fafafa;
} }
/*** Forms ***/ /*** Forms ***/

View file

@ -586,11 +586,11 @@ qsl('div').onclick = whisperClick;", "")
foreach ($servers[""] as $username => $password) { foreach ($servers[""] as $username => $password) {
if ($password !== null) { if ($password !== null) {
if ($first) { if ($first) {
echo "<p id='logins'>"; echo "<ul id='logins'>";
echo script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});"); echo script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
$first = false; $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";
} }
} }
} }