Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

 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>
@@ -331,7 +335,7 @@
        .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();