From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/admin/templates/server_config_server_edit.htm | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index aed2447..6dab52f 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -48,6 +48,12 @@
{tmpl_var name='loglevel'}
</select>
</div>
+ <div class="ctrlHolder">
+ <label for="admin_notify_events">{tmpl_var name='admin_notify_events_txt'}</label>
+ <select name="admin_notify_events" id="admin_notify_events" class="selectInput">
+ {tmpl_var name='admin_notify_events'}
+ </select>
+ </div>
<div class="ctrlHolder">
<label for="backup_dir">{tmpl_var name='backup_dir_txt'}</label>
<input name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -58,6 +64,30 @@
{tmpl_var name='backup_mode'}
</select>
</div>
+ <div class="ctrlHolder">
+ <label for="monit_url">{tmpl_var name='monit_url_txt'}</label>
+ <input name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='monit_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+ </div>
+ <div class="ctrlHolder">
+ <label for="monit_user">{tmpl_var name='monit_user_txt'}</label>
+ <input name="monit_user" id="monit_user" value="{tmpl_var name='monit_user'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="monit_password">{tmpl_var name='monit_password_txt'}</label>
+ <input name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="munin_url">{tmpl_var name='munin_url_txt'}</label>
+ <input name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='munin_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+ </div>
+ <div class="ctrlHolder">
+ <label for="munin_user">{tmpl_var name='munin_user_txt'}</label>
+ <input name="munin_user" id="munin_user" value="{tmpl_var name='munin_user'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="munin_password">{tmpl_var name='munin_password_txt'}</label>
+ <input name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
--
Gitblit v1.9.1