Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dns/templates/dns_soa_edit.htm

@@ -11,22 +11,22 @@
                        <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                        <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                            {tmpl_var name='server_id'}
                        </select>
                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                        </select></div>
                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                        <tmpl_else>
                            <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                            <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                {tmpl_var name='server_id'}
                            </select>
                    </div></tmpl_if>
                            </select></div>
                    </tmpl_if>
                </div>
                <tmpl_unless name="domain_option">
                    <div class="form-group">
                        <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                        <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                            {tmpl_var name='client_group_id'}
                        </select>
                    </div></div>
                        </select></div>
                    </div>
                </tmpl_unless>
            <tmpl_else>
                <tmpl_if name="only_one_server">
@@ -37,14 +37,14 @@
                            <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                            <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                                {tmpl_var name='client_server_id'}
                            </select>
                            </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                            </select></div>
                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                        <tmpl_else>
                            <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                            <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                {tmpl_var name='client_server_id'}
                            </select>
                        </div></tmpl_if>
                            </select></div>
                        </tmpl_if>
                    </div>
                </tmpl_if>
            </tmpl_if>
@@ -54,63 +54,69 @@
                        <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                        <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                            {tmpl_var name='client_group_id'}
                        </select>
                    </div></div>
                        </select></div>
                    </div>
                </tmpl_unless>
            </tmpl_if>
            <div class="form-group">
                <label for="origin" class="col-sm-3 control-label">{tmpl_var name='origin_txt'}</label>
                <tmpl_if name="domain_option">
                    <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
                    <div class="col-sm-9">
                  <select name="origin" id="origin" class="form-control">
                        {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>
                  </select>
                  <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
               </div>
                    <tmpl_else>
                        <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='eg_ns1_domain_tld'}</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='eg_ns1_domain_tld'}</p>
            </div>
            </div>
            <div class="form-group">
                <label for="mbox" class="col-sm-3 control-label">{tmpl_var name='mbox_txt'}</label>
                <div class="col-sm-9"><input type="text" name="mbox" id="mbox" value="{tmpl_var name='mbox'}" class="form-control" />
                </div><p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
                <div class="col-sm-9">
               <input type="text" name="mbox" id="mbox" value="{tmpl_var name='mbox'}" class="form-control" />
               <p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
            </div>
            </div>
            <div class="form-group">
                <label for="refresh" class="col-sm-3 control-label">{tmpl_var name='refresh_txt'}</label>
                <div class="col-sm-9"><input type="text" name="refresh" id="refresh" value="{tmpl_var name='refresh'}" class="form-control" />&nbsp;{tmpl_var name='seconds_txt'}
                <div class="col-sm-6"><input type="text" name="refresh" id="refresh" value="{tmpl_var name='refresh'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='seconds_txt'}
            </div></div>
            <div class="form-group">
                <label for="retry" class="col-sm-3 control-label">{tmpl_var name='retry_txt'}</label>
                <div class="col-sm-9"><input type="text" name="retry" id="retry" value="{tmpl_var name='retry'}" class="form-control" />&nbsp;{tmpl_var name='seconds_txt'}
                <div class="col-sm-6"><input type="text" name="retry" id="retry" value="{tmpl_var name='retry'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='seconds_txt'}
            </div></div>
            <div class="form-group">
                <label for="expire" class="col-sm-3 control-label">{tmpl_var name='expire_txt'}</label>
                <div class="col-sm-9"><input type="text" name="expire" id="expire" value="{tmpl_var name='expire'}" class="form-control" />&nbsp;{tmpl_var name='seconds_txt'}
                <div class="col-sm-6"><input type="text" name="expire" id="expire" value="{tmpl_var name='expire'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='seconds_txt'}
            </div></div>
            <div class="form-group">
                <label for="minimum" class="col-sm-3 control-label">{tmpl_var name='minimum_txt'}</label>
                <div class="col-sm-9"><input type="text" name="minimum" id="minimum" value="{tmpl_var name='minimum'}" class="form-control" />&nbsp;{tmpl_var name='seconds_txt'}
                <div class="col-sm-6"><input type="text" name="minimum" id="minimum" value="{tmpl_var name='minimum'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='seconds_txt'}
            </div></div>
            <div class="form-group">
                <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
                <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />&nbsp;{tmpl_var name='seconds_txt'}
                <div class="col-sm-6"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='seconds_txt'}
            </div></div>
            <div class="form-group">
                <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>
                <div class="col-sm-9"><input type="text" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="also_notify" class="col-sm-3 control-label">{tmpl_var name='also_notify_txt'}</label>
                <div class="col-sm-9"><input type="text" name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="update_acl" class="col-sm-3 control-label">{tmpl_var name='update_acl_txt'}</label>
                <div class="col-sm-9"><input type="text" name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" class="form-control" /></div></div>
                
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
@@ -119,12 +125,22 @@
                </div>
            </div>
        
          <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'}<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" 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'}">
        <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
            
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_soa_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_soa_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
<script language="JavaScript" type="text/javascript">
@@ -154,4 +170,4 @@
        searchFieldWatermark: '',
        resultBoxPosition: ''
    });
</script>
</script>