Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-23 6250b7ea002fd99e40d0170d31e7e19e69f97ccd

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -45,10 +45,22 @@
                    {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
                </div>
            </div>
         <div class="ctrlHolder">
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='vhost_aliasdomains_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='vhost_aliasdomains'}&nbsp;{tmpl_var name='vhost_aliasdomains_note_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='client_username_web_check_disabled'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='reseller_can_use_options_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='reseller_can_use_options'}
                </div>
            </div>
        </fieldset>
@@ -61,4 +73,4 @@
        </div>
    </div>
  
</div>
</div>