From 6250b7ea002fd99e40d0170d31e7e19e69f97ccd Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:53:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'
---
interface/web/admin/templates/system_config_sites_edit.htm | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index e60e3fa..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" /> {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>
@@ -46,6 +46,12 @@
</div>
</div>
<div class="ctrlHolder">
+ <p class="label">{tmpl_var name='vhost_aliasdomains_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='vhost_aliasdomains'} {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'}
--
Gitblit v1.9.1