Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dashboard/templates/dashboard.htm

@@ -1,41 +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">
         <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>&nbsp;</p>
   </tmpl_loop>
   </div>
   <div style="float:left; width:350px;">
   <tmpl_loop name='rightcol'>
   {tmpl_var name='content'}
   <p>&nbsp;</p>
   </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>