From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 interface/web/admin/templates/system_config_sites_edit.htm |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index 8a97e52..f98493e 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/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>
@@ -45,10 +45,22 @@
                     {tmpl_var name='vhost_subdomains'}&nbsp;{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>
\ No newline at end of file
+</div>

--
Gitblit v1.9.1