From 57963434331b48627cc2a0bfcff3924b0112995e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 03 Sep 2015 06:20:49 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/templates/server_config_server_edit.htm | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 3cf6af5..5de8154 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -34,20 +34,20 @@
<label for="firewall" class="col-sm-3 control-label">{tmpl_var name='firewall_txt'}</label>
<div class="col-sm-9"><select name="firewall" id="firewall" class="form-control">
{tmpl_var name='firewall'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="loglevel" class="col-sm-3 control-label">{tmpl_var name='loglevel_txt'}</label>
<div class="col-sm-9"><select name="loglevel" id="loglevel" class="form-control">
{tmpl_var name='loglevel'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="admin_notify_events" class="col-sm-3 control-label">{tmpl_var name='admin_notify_events_txt'}</label>
<div class="col-sm-9"><select name="admin_notify_events" id="admin_notify_events" class="form-control">
{tmpl_var name='admin_notify_events'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="backup_dir" class="col-sm-3 control-label">{tmpl_var name='backup_dir_txt'}</label>
<div class="col-sm-9"><input type="text" name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" class="form-control" /></div></div>
@@ -61,8 +61,8 @@
<label for="backup_mode" class="col-sm-3 control-label">{tmpl_var name='backup_mode_txt'}</label>
<div class="col-sm-9"><select name="backup_mode" id="backup_mode" class="form-control">
{tmpl_var name='backup_mode'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='backup_delete_txt'}</label>
<div class="col-sm-9">
@@ -100,6 +100,6 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
--
Gitblit v1.9.1