From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 interface/web/admin/templates/server_config_server_edit.htm |   12 ++++++++++++
 1 files changed, 12 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 7c0c7b7..ade491f 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -74,6 +74,12 @@
                     {tmpl_var name='backup_mode'}
                 </select>
             </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='backup_delete_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='backup_delete'}
+                </div>
+            </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" />&nbsp;{tmpl_var name='monit_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
@@ -98,6 +104,12 @@
                 <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>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name='monitor_system_updates_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='monitor_system_updates'}
+                </div>
+            </div>
         </fieldset>
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

--
Gitblit v1.9.1