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/server_config_web_edit.htm | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 602d9f5..ece9d7d 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -35,14 +35,12 @@
<label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
<input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='website_autoalias_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
</div>
- <!--
<div class="ctrlHolder apache">
<label for="vhost_rewrite_v6">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
<div class="multiField">
{tmpl_var name='vhost_rewrite_v6'}
</div>
</div>
- -->
<div class="ctrlHolder apache">
<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
<input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -115,6 +113,28 @@
{tmpl_var name='overtraffic_notify_client'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_admin_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_admin'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_client_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_client'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_onok'}
+ </div>
+ </div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
<div style="display:none;">
<div class="ctrlHolder">
@@ -125,11 +145,11 @@
</div>
<div class="ctrlHolder">
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
- <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
+ <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />
</div>
<div class="ctrlHolder">
<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
- <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
+ <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput" />
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
--
Gitblit v1.9.1