Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/dns/templates/dns_slave_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_if>
            <tmpl_if name="is_reseller">
@@ -35,8 +35,8 @@
                        <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">
@@ -44,14 +44,20 @@
                <tmpl_if name="domain_option">
                    <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></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='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>
@@ -68,7 +74,7 @@
        <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_slave_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_slave_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_slave_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
<script language="JavaScript" type="text/javascript">