From 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Wed, 21 Jan 2015 18:55:41 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:renky/ispconfig3
---
interface/web/admin/templates/server_ip_list.htm | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index beb5527..7aa2182 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -15,12 +15,12 @@
<table class="table">
<thead class="dark form-group-sm">
<tr>
- <th><tmpl_var name="server_id_txt"></th>
- <th class="small-col"><tmpl_var name="client_id_txt"></th>
- <th><tmpl_var name="ip_type_txt"></th>
- <th><tmpl_var name="ip_address_txt"></th>
- <th><tmpl_var name="virtualhost_txt"></th>
- <th><tmpl_var name="virtualhost_port_txt"></th>
+ <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+ <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
+ <th data-column="ip_type"><tmpl_var name="ip_type_txt"></th>
+ <th data-column="ip_address"><tmpl_var name="ip_address_txt"></th>
+ <th data-column="virtualhost"><tmpl_var name="virtualhost_txt"></th>
+ <th data-column="virtualhost_port"><tmpl_var name="virtualhost_port_txt"></th>
<th class="text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
@@ -31,7 +31,7 @@
<td><select class="form-control" name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
<td><input class="form-control" type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
<td class="text-right">
- <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_ip_list.php');"><span class="icon icon-filter"></span></button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/server_ip_list.php"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -45,7 +45,7 @@
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost"}</a></td>
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost_port"}</a></td>
<td class="text-right">
- <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
--
Gitblit v1.9.1