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_edit_services.htm | 138 +++++++++++++++++++++-------------------------
1 files changed, 63 insertions(+), 75 deletions(-)
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index 17ff55d..595f16d 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -3,80 +3,68 @@
<div class="panel panel_server">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_name">{tmpl_var name='server_name_txt'}</label>
- <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mail_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='mail_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='web_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='dns_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='dns_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='file_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='file_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='db_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='db_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='vserver_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='vserver_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='proxy_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='proxy_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='firewall_server_txt'}</p>
- <div class="multiField">
- {tmpl_var name='firewall_server'}
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
- <select name="mirror_server_id" id="server_id" class="selectInput">
- {tmpl_var name='mirror_server_id'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="active">{tmpl_var name='active_txt'}</label>
- <select name="active" id="active" class="selectInput formLengthBool">
- {tmpl_var name='active'}
- </select>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_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_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <label for="server_name">{tmpl_var name='server_name_txt'}</label>
+ <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mail_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mail_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='web_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='web_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='dns_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='dns_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='file_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='file_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='db_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='db_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='vserver_server_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='vserver_server'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
+ <select name="mirror_server_id" id="server_id" class="selectInput">
+ {tmpl_var name='mirror_server_id'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="active">{tmpl_var name='active_txt'}</label>
+ <select name="active" id="active" class="selectInput formLengthBool">
+ {tmpl_var name='active'}
+ </select>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_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_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
</div>
- </div>
-</div>
+</div>
\ No newline at end of file
--
Gitblit v1.9.1