Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -33,7 +33,7 @@
            </div>
            <div class="ctrlHolder">
                <label for="phpmyadmin_url">{tmpl_var name='phpmyadmin_url_txt'}</label>
                <input name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" size="30" maxlength="255" type="text" class="textInput" />
                <input name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='phpmyadmin_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>, <a href="javascript:void(0);" class="addPlaceholder">[DATABASENAME]</a>
            </div>
            <div class="ctrlHolder">
                <label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
@@ -43,6 +43,24 @@
                <p class="label">{tmpl_var name='vhost_subdomains_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='vhost_subdomains'}&nbsp;{tmpl_var name='vhost_subdomains_note_txt'}
                </div>
            </div>
            <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>
@@ -55,4 +73,4 @@
        </div>
    </div>
  
</div>
</div>