[checkmk-commits] Refactored CSS of login dialog

Module: check_mk Branch: master Commit: 8e13f327ea9f3d32c5893d0504840865b30c361c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e13f327ea9f3d… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Apr 11 09:04:15 2017 +0200 Refactored CSS of login dialog Change-Id: Ide0659d59e56464cab2aabe3d5dfde732dcdef06 --- web/htdocs/login.css | 69 ++++++++++++++++----------------------- web/htdocs/login.py | 3 +- web/plugins/dashboard/dashlets.py | 2 +- 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 282b334..6497ff9 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -49,23 +49,25 @@ div#login { width: 770px; height: 605px; position: absolute; - top: 50%; - left: 50%; - margin: -276px 0px 0px -386px; - /* border: 1px solid yellow; */ + top:0; + bottom: 0; + left: 0; + right: 0; + margin: auto; } body.main.screenshotmode div#login { background-image: url(""); } -img#login_window { +#login_window { + background-image: url("images/login_window.png"); width: 370px; height: 230px; - position: relative; left: 10px; - top: 160px; - float: none; + top: 187px; + position: relative; + margin: -30px auto 10px auto; } label { @@ -76,36 +78,36 @@ label { position: absolute; text-align: right; width: 150px; - top: 173px; - left: 415px; + top: 15px; + right: 20px; color: white; font-size: 8pt; } #label_user, #label_pass { - left: 264px; + left: 55px; } #input_user, #input_pass { - left: 330px; + left: 121px; } #label_user { position: absolute; - top: 275px; + top: 115px; } #input_user { position: absolute; - top: 270px; + top: 110px; } #label_pass { position: absolute; - top: 315px; + top: 155px; } #input_pass { position: absolute; - top: 310px; + top: 150px; } #input_user, #input_pass { @@ -125,33 +127,16 @@ label { background-repeat: no-repeat; } -#button_login { - position: absolute; - top: 345px; - left: 505px; -} - -#button_login img { - width: 63px; - height: 32px; -} - -#button_text { +#_login { position: absolute; - top: 356px; - left: 508px; - text-align: center; - width: 61px; - color: white; - z-index: 100; - font-size: 10px; - text-transform: uppercase; + bottom: 15px; + right: 15px; } #login_error { position: absolute; - top: 347px; - left: 320px; + bottom: 15px; + left: 105px; width: 180px; height: 30px; z-index: 100; @@ -173,13 +158,15 @@ label { } #foot { - position: absolute; text-align: center; - top: 400px; - left: 220px; width: 350px; color: white; font-size: 8pt; + + position: relative; + left: 10px; + top: 187px; + margin: 0 auto 10px auto; } diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0dc45a6..7dc5ff7 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -431,7 +431,7 @@ def normal_login_page(called_directly = True): html.http_redirect(origtarget and origtarget or 'index.py') html.open_div(id_="login") - html.img(id_="login_window", src="images/login_window.png") + html.open_div(id_="login_window") html.div(cmk.__version__, id_="version") html.begin_form("login", method = 'POST', add_transid = False, action = 'login.py') @@ -452,6 +452,7 @@ def normal_login_page(called_directly = True): html.open_div(id_="button_text") html.button("_login", _('Login')) html.close_div() + html.close_div() html.open_div(id_="foot") html.write("Version: %s - &copy; " % cmk.__version__) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index d5f82f8..2de259f 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -257,7 +257,7 @@ def render_statistics(pie_id, what, table, filter, dashlet): table_entries = pies while len(table_entries) < 6: - table_entries = table_entries + [ (("", "#95BBCD", "", ""), HTML("&nbsp;")) ] + table_entries = table_entries + [ (("", None, "", ""), HTML("&nbsp;")) ] table_entries.append(((_("Total"), "", "all%s" % what, ""), total)) for (name, color, viewurl, query), count in table_entries: