Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/client/templates/client_edit_limits.htm

@@ -44,6 +44,10 @@
                        {tmpl_var name='parent_client_id'}
                    </select>
                </div>
                <div class="ctrlHolder">
                    <label for="reseller">{tmpl_var name='reseller_txt'}</label>
                    <input type="checkbox" name="reseller" value="1" id="reseller" />
                </div>
                </tmpl_if>
            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
            <div>
@@ -150,6 +154,12 @@
                <div class="ctrlHolder">
                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
                </div>
                <div class="ctrlHolder">
                    <p class="label">{tmpl_var name='limit_backup_txt'}</p>
                    <div class="multiField">
                        {tmpl_var name='limit_backup'}
                    </div>
                </div>
            </div>
            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
@@ -316,16 +326,16 @@
    return ($('#template_master').val() == '0' ? true : false);
}

jQuery('#template_additional_list').find('li > a').click(function(e) {
$('#template_additional_list').find('li > a').click(function(e) {
    e.preventDefault();
    delAdditionalTemplate($(this).parent().attr('rel'));
});

jQuery('div.panel_client')
$('div.panel_client')
        .find('div.pnl_formsarea')
        .find('fieldset')
        .find('input,select,button')
        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id')
        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id,#reseller')
        .click(function(e) {
            if(custom_template_selected()) return true;
            e.preventDefault();