Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/monitor/templates/show_sys_state.htm

@@ -7,17 +7,15 @@
        <legend><tmpl_var name="monTransRefreshsq"></legend>
            
                <div class="form-group">
                    <label for="refreshinterval" class="col-sm-3 control-label">&nbsp;</label>
                    <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
                    <div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
                        {tmpl_var name='refresh'}
                    </select>
                    </select></div>
                
            </div>
        
    </div>
  
    <div class="pnl_formarea">
        <p></p>
        <p class="fieldset-legend"></p>
            <div class="stateview"><tmpl_var name="state_data"></div>
        
    </div>