From 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 21 Aug 2013 10:28:20 -0400
Subject: [PATCH] Merged revisions 4069-4117 from stable branch.
---
interface/web/dashboard/templates/dashboard.htm | 87 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 38 deletions(-)
diff --git a/interface/web/dashboard/templates/dashboard.htm b/interface/web/dashboard/templates/dashboard.htm
index 71e3ee3..c8c3145 100644
--- a/interface/web/dashboard/templates/dashboard.htm
+++ b/interface/web/dashboard/templates/dashboard.htm
@@ -1,41 +1,52 @@
-
<h1><tmpl_var name="welcome_user"></h1>
<hr />
<div class="panel panel_dashboard">
- <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>
- </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>
- </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>
- </tmpl_if>
- </div>
- <div style="float:left; width:350px;">
- <tmpl_loop name='leftcol'>
- {tmpl_var name='content'}
- <p> </p>
- </tmpl_loop>
- </div>
- <div style="float:left; width:350px;">
- <tmpl_loop name='rightcol'>
- {tmpl_var name='content'}
- <p> </p>
- </tmpl_loop>
- </div>
-</div>
-
+ <div>
+ <tmpl_if name='error'>
+ <div class="systemmonitor-state state-error">
+ <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">
+ <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">
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="info">
+ {tmpl_var name='info_msg'}
+ </tmpl_loop>
+ </div>
+ </div>
+ </tmpl_if>
+ </div>
+ <div style="float:left; width:350px;">
+ <tmpl_loop name='leftcol'>
+ {tmpl_var name='content'}
+ <tmpl_if name='content'>
+ <p style="clear:left"> </p>
+ </tmpl_if>
+ </tmpl_loop>
+ </div>
+ <div style="float:left; width:350px;padding-left:15px;">
+ <tmpl_loop name='rightcol'>
+ {tmpl_var name='content'}
+ <tmpl_if name='content'>
+ <p> </p>
+ </tmpl_if>
+ </tmpl_loop>
+ </div>
+</div>
\ No newline at end of file
--
Gitblit v1.9.1