Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dns/templates/dns_slave_edit.htm

@@ -46,12 +46,18 @@
                        {tmpl_var name='domain_option'}
                    </select></div>
                    <tmpl_else>
                        <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" /></div></tmpl_if>
                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
                        <div class="col-sm-9">
                     <input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" />
                     <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
                  </div></tmpl_if>
                
            </div>
            <div class="form-group">
                <label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
                <div class="col-sm-9"><input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" /></div><p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
                <div class="col-sm-9">
               <input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
               <p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
            </div>
            </div>
            <div class="form-group">
                <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>