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 | 22 ++++++++++++++++++++++
1 files changed, 22 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 6dab52f..ade491f 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -58,11 +58,27 @@
<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" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='backup_dir_is_mount_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='backup_dir_is_mount'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="backup_dir_mount_cmd">{tmpl_var name='backup_dir_mount_cmd_txt'}</label>
+ <input name="backup_dir_mount_cmd" id="backup_dir_mount_cmd" value="{tmpl_var name='backup_dir_mount_cmd'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
<div class="ctrlHolder">
<label for="backup_mode">{tmpl_var name='backup_mode_txt'}</label>
<select name="backup_mode" id="backup_mode" class="selectInput">
{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>
@@ -88,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