From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/vm/templates/openvz_ip_list.htm | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm
index 861d4a3..fd12694 100644
--- a/interface/web/vm/templates/openvz_ip_list.htm
+++ b/interface/web/vm/templates/openvz_ip_list.htm
@@ -3,45 +3,43 @@
</div>
- <p>{tmpl_var name="toolsarea_head_txt"}</p>
+ <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
- <button class="button iconstxt icoAdd" type="button" data-load-content="vm/openvz_ip_edit.php">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
+ <button class="btn btn-default formbutton-success" type="button" data-load-content="vm/openvz_ip_edit.php">{tmpl_var name="add_new_record_txt"}</button>
- <p><tmpl_var name="list_head_txt"></p>
+ <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
- <th><tmpl_var name="server_id_txt"></th>
- <th><tmpl_var name="vm_id_txt"></th>
- <th><tmpl_var name="ip_address_txt"></th>
- <th><tmpl_var name="reserved_txt"></th>
- <th>{tmpl_var name='search_limit'}</th>
+ <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+ <th data-column="vm_id"><tmpl_var name="vm_id_txt"></th>
+ <th data-column="ip_address"><tmpl_var name="ip_address_txt"></th>
+ <th data-column="reserved"><tmpl_var name="reserved_txt"></th>
+ <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
- <td><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
- <td><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
- <td>
- <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ip_list.php');">{tmpl_var name="filter_txt"}</button>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+ <td><select class="form-control" name="search_reserved">{tmpl_var name='search_reserved'}</select></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"}" data-submit-form="pageForm" data-form-action="vm/openvz_ip_list.php"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <tr>
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="vm_id"}</a></td>
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_address"}</a></td>
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="reserved"}</a></td>
- <td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <td class="text-right">
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
</td>
</tr>
</tmpl_loop>
--
Gitblit v1.9.1