Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dns/templates/dns_soa_edit.htm

@@ -128,12 +128,12 @@
          <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='dnssec_wanted_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='dnssec_wanted'}
                </div>
                    {tmpl_var name='dnssec_wanted'}<br /><small>({tmpl_var name='dnssec_wanted_info'})</small>
                </div> 
            </div>
            <div class="form-group">
                <label for="update_acl" class="col-sm-3 control-label">{tmpl_var name='dnssec_info_txt'}</label>
                <div class="col-sm-9"><textarea readonly="true" rows="5" class="form-control">{tmpl_var name='dnssec_info'}</textarea></div>
                <div class="col-sm-9"><textarea readonly="true" rows="5" id="dnssec_info" name="dnssec_info" class="form-control">{tmpl_var name='dnssec_info'}</textarea></div>
         </div>
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -170,4 +170,4 @@
        searchFieldWatermark: '',
        resultBoxPosition: ''
    });
</script>
</script>