From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/dashboard/templates/dashboard.htm |   68 +++++++++++++++-------------------
 1 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/interface/web/dashboard/templates/dashboard.htm b/interface/web/dashboard/templates/dashboard.htm
index dd46147..7c8b46e 100644
--- a/interface/web/dashboard/templates/dashboard.htm
+++ b/interface/web/dashboard/templates/dashboard.htm
@@ -1,40 +1,32 @@
-
-<h1><tmpl_var name="welcome_user"></h1>
-
-<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>
-	<p>&nbsp;</p>
-	<h2>{tmpl_var name='available_modules_txt'}</h2>
-	<div style="width:700px;">
-	<tmpl_loop name='modules'>
-		<div class="dashboard-modules {tmpl_var name='modules_name'}">
-			<a href="#" onclick="capp('{tmpl_var name='modules_name'}')">
-			{tmpl_var name='modules_title'}
-			</a>
-		</div>
-	</tmpl_loop>
-	</div>
+<div class='page-header'>
+  <h1>{tmpl_var name='welcome_user'}</h1>
 </div>
 
+<tmpl_if name='error'>
+	<div class="alert alert-danger">
+		<tmpl_loop name="error">
+			{tmpl_var name='error_msg'}
+		</tmpl_loop>
+	</div>
+</tmpl_if>
+<tmpl_if name='warning'>
+	<div class="alert alert-danger">
+		<tmpl_loop name="warning">
+			{tmpl_var name='warning_msg'}
+		</tmpl_loop>
+	</div>
+</tmpl_if>
+<tmpl_if name='info'>
+	<div class="alert alert-notification">
+		<tmpl_loop name="info">
+			{tmpl_var name='info_msg'}
+		</tmpl_loop>
+	</div>
+</tmpl_if>
+
+<tmpl_loop name='leftcol'>
+	{tmpl_var name='content'}
+</tmpl_loop>
+<tmpl_loop name='rightcol'>
+	{tmpl_var name='content'}
+</tmpl_loop>

--
Gitblit v1.9.1