From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/admin/templates/server_ip_edit.htm | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm
index 89c0b78..9e895ea 100644
--- a/interface/web/admin/templates/server_ip_edit.htm
+++ b/interface/web/admin/templates/server_ip_edit.htm
@@ -1,29 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_server_ip">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_server_ip"><legend>IP Address</legend>
- <span class="wf_oneField">
- <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
- <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
- </span>
- <span class="wf_oneField">
- <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
- <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15">
- </span>
- <span class="wf_oneField">
- <label for="virtualhost" class="wf_preField">{tmpl_var name='virtualhost_txt'}</label>
- <span class="">{tmpl_var name='virtualhost'}</span>
- </span>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
+<p><tmpl_var name="list_desc_txt"></p>
+
+
+ <legend>IP Address</legend>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="client_id" class="col-sm-3 control-label">{tmpl_var name='client_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_id" id="client_id" class="form-control">
+ {tmpl_var name='client_id'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="ip_type" class="col-sm-3 control-label">{tmpl_var name='ip_type_txt'}</label>
+ <div class="col-sm-9"><select name="ip_type" id="ip_type" class="form-control">
+ {tmpl_var name='ip_type'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='virtualhost_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='virtualhost'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="virtualhost_port" class="col-sm-3 control-label">{tmpl_var name='virtualhost_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" class="form-control" /></div></div>
+
+
+ <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'}" data-submit-form="pageForm" data-form-action="admin/server_ip_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_ip_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
\ No newline at end of file
--
Gitblit v1.9.1