From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 interface/web/themes/default/templates/error.tpl.htm |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/interface/web/themes/default/templates/error.tpl.htm b/interface/web/themes/default/templates/error.tpl.htm
index d75fda4..f0c1081 100644
--- a/interface/web/themes/default/templates/error.tpl.htm
+++ b/interface/web/themes/default/templates/error.tpl.htm
@@ -1,8 +1,9 @@
-<div class="uniForm">
-    <div id="errorMsg">
-        <h3>Error</h3>
-        <ol>
-            <li>###ERRORMSG###</li>
-        </ol>
-    </div>
-</div>
\ No newline at end of file
+<div class='alert alert-danger clear'>
+  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
+  <div class='alert-content'>
+	<ol>
+		<li>###ERRORMSG###</li>
+	</ol>
+	<div>TODO: WRONG HTML ELEMENTS</div>
+  </div>
+</div>

--
Gitblit v1.9.1