From 8ab3cdc09cfbac3157e996664616c229214f6c8d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 21 Oct 2011 06:03:56 -0400
Subject: [PATCH] Merged revisions 2681-2739 from 3.0.4 stable branch.
---
interface/web/admin/templates/server_list.htm | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 7a29511..2bb0691 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -15,8 +15,6 @@
<th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
<th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
<th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
- <th class="tbl_col_proxy_server" scope="col"><tmpl_var name="proxy_server_txt"></th>
- <th class="tbl_col_firewall_server" scope="col"><tmpl_var name="firewall_server_txt"></th>
<th class="tbl_col_buttons" scope="col"> </th>
</tr>
<tr>
@@ -27,8 +25,6 @@
<td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
<td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
<td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
- <td class="tbl_col_proxy_server"><select name="search_active">{tmpl_var name='search_proxy_server'}</select></td>
- <td class="tbl_col_firewallserver"><select name="search_active">{tmpl_var name='search_firewall_server'}</select></td>
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
@@ -42,8 +38,6 @@
<td class="tbl_col_file_server">{tmpl_var name="file_server"}</td>
<td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
<td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
- <td class="tbl_col_proxy_server">{tmpl_var name="proxy_server"}</td>
- <td class="tbl_col_firewall_server">{tmpl_var name="firewall_server"}</td>
<td class="tbl_col_buttons">
<div class="buttons icons16">
<a class="icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
@@ -54,7 +48,7 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="10"><tmpl_var name="paging"></td>
+ <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
--
Gitblit v1.9.1