Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 b973ff1298fed20030a13d86e1233151a7e3189b

 interface/web/monitor/templates/show_log.htm

@@ -7,8 +7,7 @@
        <legend><tmpl_var name="monTransRefreshsq"></legend>
            
                <div class="form-group">
                    <label for="refreshinterval" class="col-sm-3 control-label">{tmpl_var name='refreshinterval_txt'}</label>
                    <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
                    <div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
                        {tmpl_var name='refresh'}
                    </select></div>
                
@@ -17,6 +16,6 @@
  
    <div class="pnl_formarea">
        <p class="fieldset-legend"><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
            <div class="codeview"><tmpl_var name="log_data"></div>
            <div class="codeview"><pre><tmpl_var name="log_data"></pre></div>
        
    </div>