From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable
---
interface/web/admin/templates/server_config_server_edit.htm | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 53d0db7..e52a543 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -19,11 +19,10 @@
<label for="netmask">{tmpl_var name='netmask_txt'}</label>
<input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
</div>
- <!--<div class="ctrlHolder">
+ <div class="ctrlHolder">
<label for="v6_prefix">{tmpl_var name='v6_prefix_txt'}</label>
<input name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
- -->
+ </div>
<div class="ctrlHolder">
<label for="gateway">{tmpl_var name='gateway_txt'}</label>
<input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
@@ -59,12 +58,28 @@
<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>
<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>
--
Gitblit v1.9.1