Module: check_mk
Branch: master
Commit: 744585ffdcfc10d8782a8af9afb1c4551a320aa4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=744585ffdcfc10…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 24 10:34:44 2012 +0200
Fixed further problems in mobile GUI
---
ChangeLog | 1 +
web/htdocs/check_mk.css | 7 -------
web/htdocs/htmllib.py | 2 +-
web/htdocs/mobile.css | 2 ++
web/htdocs/mobile.py | 6 +++---
web/htdocs/pages.css | 18 ++++++++++++++++++
6 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7d24a82..fbe93ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
Mobile:
* FIX: Fixed logtime filter settings in all mobile views
+ * FIX: fix some layout problems
BI:
* New aggregation function count_ok, that counts the number
diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css
index 958bbd9..f27e3fd 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -51,13 +51,6 @@ div {
padding: 0;
}
-h3 {
- color: white;
- margin-bottom: 2px;
- font-size: 12pt;
- font-weight: normal;
-}
-
img {
border-style: none;
}
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 511dca9..13d12c4 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -476,7 +476,7 @@ class html:
add_style = ""
if "size" in args and args["size"]:
addprops += " size=%d" % (args["size"] + 1)
- if "width:" not in args.get("style", ""):
+ if "width:" not in args.get("style", "") and
not self.mobile:
add_style = "width: %d.5ex; " % args["size"]
if "type" in args:
diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css
index 55aefd5..45e7fb2 100644
--- a/web/htdocs/mobile.css
+++ b/web/htdocs/mobile.css
@@ -178,6 +178,8 @@ body.mobile table.data td.perfometer td.inner {
.ui-li-aside.state {
width: 4.5em;
text-align: center;
+ border-radius: 5px;
+ box-shadow: 0 0 2px #444444;
}
td.pnpgraph img {
diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py
index 87e83af..2c361b2 100644
--- a/web/htdocs/mobile.py
+++ b/web/htdocs/mobile.py
@@ -160,8 +160,8 @@ def page_login():
origtarget = html.req.uri
html.hidden_field('_origtarget', htmllib.attrencode(origtarget))
- html.text_input("_username", size = 50, label = _("Username:"))
- html.password_input("_password", size = 50, label =
_("Password:"))
+ html.text_input("_username", label = _("Username:"))
+ html.password_input("_password", size=None, label =
_("Password:"))
html.write("<br>")
html.button("_login", _('Login'))
html.set_focus("_username")
@@ -369,7 +369,7 @@ def do_commands(view, what, rows):
count += 1
if command:
- html.message(_("Successfully sent %d commands to Nagios.") % count)
+ html.message(_("Successfully sent %d commands.") % count)
return True # Show commands again
def show_context_links(context_links):
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 9518ad5..dd0de35 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -30,6 +30,24 @@ Boston, MA 02110-1301 USA.
styles are not used in the sidebar and in Mobile. */
/*-------------------------------------------------------------------------.
+| ____ _ |
+| / ___| ___ _ __ ___ _ __ __ _| | |
+| | | _ / _ \ '_ \ / _ \ '__/ _` | | |
+| | |_| | __/ | | | __/ | | (_| | | |
+| \____|\___|_| |_|\___|_| \__,_|_| |
+| |
++--------------------------------------------------------------------------+
+| General styles used in the pages |
+'-------------------------------------------------------------------------*/
+
+h3 {
+ color: white;
+ margin-bottom: 2px;
+ font-size: 12pt;
+ font-weight: normal;
+}
+
+/*-------------------------------------------------------------------------.
| _ |
| _ __ ___ __ _(_)_ __ |
| | '_ ` _ \ / _` | | '_ \ |