Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-08-13 f382f091aa97d10056b4c433aa55298fece010d4

 interface/web/dns/templates/dns_slave_edit.htm

@@ -20,24 +20,34 @@
                            </select>
                    </tmpl_if>
                </div>
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                <tmpl_unless name="domain_option">
                    <div class="ctrlHolder">
                        <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                        <select name="client_group_id" id="client_group_id" class="selectInput">
                            {tmpl_var name='client_group_id'}
                        </select>
                    </div>
                </tmpl_unless>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                <tmpl_unless name="domain_option">
                    <div class="ctrlHolder">
                        <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                        <select name="client_group_id" id="client_group_id" class="selectInput">
                            {tmpl_var name='client_group_id'}
                        </select>
                    </div>
                </tmpl_unless>
            </tmpl_if>
            <div class="ctrlHolder">
                <label for="origin">{tmpl_var name='origin_txt'}</label>
                <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
                <tmpl_if name="domain_option">
                    <select name="origin" id="origin" class="selectInput">
                        {tmpl_var name='domain_option'}
                    </select>
                    <tmpl_else>
                        <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
                </tmpl_if>
                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
            </div>
            <div class="ctrlHolder">
@@ -94,4 +104,4 @@
        searchFieldWatermark: '',
        resultBoxPosition: 'e'
    });   
</script>
</script>