From d7bde08eaa86e2a4118ff153a0bd002ce4177868 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 10 Jul 2012 08:54:04 -0400
Subject: [PATCH] correction of broken css-class for dashboard warnings + add of state-icon for dashboard warnings + removal of empty <p>-element in dashboard warnings
---
interface/web/dashboard/templates/dashboard.htm | 27 +++++++++----
interface/web/themes/default/css/screen/content_ispc.css | 63 ++++++++++++++++++-------------
2 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/interface/web/dashboard/templates/dashboard.htm b/interface/web/dashboard/templates/dashboard.htm
index 383d6b9..09aa158 100644
--- a/interface/web/dashboard/templates/dashboard.htm
+++ b/interface/web/dashboard/templates/dashboard.htm
@@ -4,23 +4,32 @@
<div>
<tmpl_if name='error'>
<div class="systemmonitor-state state-error">
- <tmpl_loop name="error">
- <p>{tmpl_var name='error_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="error">
+ {tmpl_var name='error_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
<tmpl_if name='warning'>
<div class="systemmonitor-state state-warning">
- <tmpl_loop name="warning">
- <p>{tmpl_var name='warning_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="warning">
+ {tmpl_var name='warning_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
<tmpl_if name='info'>
<div class="systemmonitor-state state-info">
- <tmpl_loop name="info">
- <p>{tmpl_var name='info_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="info">
+ {tmpl_var name='info_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
</div>
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index 13ffad9..a2eecb6 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -103,9 +103,10 @@
float: left;
}
- /* Systemmonitor */
+ /* Systemmonitor */
.systemmonitor-server,
- .systemmonitor-ve {
+ .systemmonitor-ve,
+ .systemmonitor-state {
margin: 10px 5px;
font-family: Consolas, "Lucida Console", "Courier New", monospace;
font-size: 0.9em;
@@ -159,40 +160,50 @@
.systemmonitor-server div.icoDevice { background-position: 0 0; }
.systemmonitor-ve div.icoDevice { background-position: -64px 0; }
.systemmonitor-network div.icoDevice { background-position: -128px -0; }
- div.statusDevice { float: left; }
-
- p.status {
+ div.statusDevice, div.statusMsg { float: left; }
+
+ div.statusMsg p {
+ float: left;
+ padding: 5px;
+ }
+ .systemmonitor-state .status {
+ margin: 5px;
+ }
+ .status {
float: right;
width: 32px;
height: 32px;
background: url("../../icons/x32_sprite.png") no-repeat transparent;
- }
- .state-no_state p.status,
- .state-no_state-ve p.status,
- .state-unknown p.status,
- .state-unknown-ve p.status { background-position: 0 -207px; }
-
- .state-ok p.status,
- .state-ok-ve p.status { background-position: 0 -270px; }
-
- .state-info p.status,
- .state-info-ve p.status { background-position: 0 -336px; }
-
- .state-warning p.status,
- .state-warning-ve p.status { background-position: 0 -143px; }
-
- .state-critical p.status,
- .state-critical-ve p.status { background-position: 0 -463px; }
-
- .state-error p.status,
- .state-error-ve p.status { background-position: 0 -400px; }
+ }
+ div.status {
+ float: left !important;
+ }
+ .state-no_state .status,
+ .state-no_state-ve .status,
+ .state-unknown .status,
+ .state-unknown-ve .status { background-position: 0 -207px; }
+
+ .state-ok .status,
+ .state-ok-ve .status { background-position: 0 -270px; }
+
+ .state-info .status,
+ .state-info-ve .status { background-position: 0 -336px; }
+
+ .state-warning .status,
+ .state-warning-ve .status { background-position: 0 -143px; }
+
+ .state-critical .status,
+ .state-critical-ve .status { background-position: 0 -463px; }
+
+ .state-error .status,
+ .state-error-ve .status { background-position: 0 -400px; }
/* Usage unknown
.systemmonitor-content table {
border: none;
margin-top: 10px;
}
-
+
.systemmonitor-content * .online {
border: 1px solid #ffffff;
background-color: #E3FFB8;
--
Gitblit v1.9.1