From d2713e4bf2090bcd85e0c1d7b99f08575d12f133 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Tue, 06 Jan 2015 10:36:10 -0500 Subject: [PATCH] - Fixed bug in quota lib - New dashboard layout --- interface/web/dashboard/templates/dashboard.htm | 84 ++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 52 deletions(-) diff --git a/interface/web/dashboard/templates/dashboard.htm b/interface/web/dashboard/templates/dashboard.htm index 231fb54..65ccc7e 100644 --- a/interface/web/dashboard/templates/dashboard.htm +++ b/interface/web/dashboard/templates/dashboard.htm @@ -1,52 +1,32 @@ -<h1><tmpl_var name="welcome_user"></h1> -<hr /> -<div class="panel panel_dashboard"> - <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:right; 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 +<div class='page-header'> + <h1>Welcome Admin</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