From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/templates/server_config_rescue_edit.htm | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
index 783628e..435449b 100644
--- a/interface/web/admin/templates/server_config_rescue_edit.htm
+++ b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -6,32 +6,34 @@
<legend>Rescue</legend>
<div class="form-group">
- <p class="label" style="width:300px">{tmpl_var name='try_rescue_txt'}</p>
- <div class="multiField" style="width:100px">
+ <label class="col-sm-3 control-label">{tmpl_var name='try_rescue_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='try_rescue'}
</div>
</div>
<div class="form-group">
- <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_httpd_txt'}</p>
- <div class="multiField" style="width:100px">
+ <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_httpd_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='do_not_try_rescue_httpd'}
</div>
</div>
+<!--
<div class="form-group">
- <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</p>
- <div class="multiField" style="width:100px">
+ <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='do_not_try_rescue_mongodb'}
</div>
</div>
+-->
<div class="form-group">
- <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mysql_txt'}</p>
- <div class="multiField" style="width:100px">
+ <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mysql_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='do_not_try_rescue_mysql'}
</div>
</div>
<div class="form-group">
- <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mail_txt'}</p>
- <div class="multiField" style="width:100px">
+ <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mail_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='do_not_try_rescue_mail'}
</div>
</div>
@@ -42,6 +44,6 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" 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="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></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