Merge branch 'stable-3.1'

Marius Burkard

2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87

 interface/web/dns/templates/dns_dmarc_edit.htm

@@ -41,7 +41,7 @@

            <div class="form-group">
            <label class="col-sm-2 control-label">{tmpl_var name='dmarc_fo_txt'}</label>
             <div class="col-sm-3">
             <div class="col-sm-1">
               <input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>
            </div>
            <div class="col-sm-3 input-sm">
@@ -50,7 +50,7 @@
         </div>
            <div class="form-group">
            <label class="col-sm-2 control-label"></label>
            <div class="col-sm-3">
            <div class="col-sm-1">
               <input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
            </div>
            <div class="col-sm-3 input-sm">
@@ -59,7 +59,7 @@
            </div>
            <div class="form-group">
            <label class="col-sm-2 control-label"></label>
            <div class="col-sm-3">
            <div class="col-sm-1">
               <input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
            </div>
            <div class="col-sm-3 input-sm">
@@ -68,7 +68,7 @@
            </div>
            <div class="form-group">
            <label class="col-sm-2 control-label"></label>
            <div class="col-sm-3">
            <div class="col-sm-1">
               <input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
            </div>
            <div class="col-sm-3 input-sm">
@@ -96,7 +96,7 @@
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
                 <div class="col-sm-3">
                 <div class="col-sm-1">
                    <input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
                </div>
                <div class="col-sm-3 input-sm">
@@ -104,8 +104,8 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label"></label>
                <div class="col-sm-3">
                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_iodef'}</label>
                <div class="col-sm-1">
                    <input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
                </div>
                <div class="col-sm-3 input-sm">