Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

 interface/web/monitor/templates/show_data.htm

@@ -1,11 +1,14 @@
<h2><tmpl_var name="title"></h2>



<div class="panel panel_system">



  <div class="pnl_formarea">

    <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>

      <div class="systemmonitor"><tmpl_var name="output"></div>

    </fieldset>

  </div>



</div>

<div class='page-header'>
   <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_system">

    <div class="pnl_formarea">
        <p class="fieldset-legend"><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
            <div class="systemmonitor"><tmpl_var name="output"></div>
        
    </div>

</div>