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/admin/templates/users_list.htm | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index b5947d5..b787252 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -4,48 +4,46 @@
<p><tmpl_var name="list_desc_txt"></p>
- <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="admin/users_edit.php">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
+ <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/users_edit.php">{tmpl_var name="add_new_record_txt"}</button>
<p><tmpl_var name="warning_txt"></p>
- <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="client_id_txt"></th>
- <th><tmpl_var name="active_txt"></th>
- <th><tmpl_var name="username_txt"></th>
- <th><tmpl_var name="groups_txt"></th>
- <th>{tmpl_var name='search_limit'}</th>
+ <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
+ <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+ <th data-column="username"><tmpl_var name="username_txt"></th>
+ <th data-column="groups"><tmpl_var name="groups_txt"></th>
+ <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td><select name="search_groups">{tmpl_var name='search_groups'}</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','admin/users_list.php');">{tmpl_var name="filter_txt"}</button>
+ <td><input class="form-control" type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" name="search_groups">{tmpl_var name='search_groups'}</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="admin/users_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="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
<td><a href="#" data-load-content="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" data-load-content="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></div></td>
<td>{tmpl_var name="groups"}</td>
- <td>
+ <td class="text-right">
<tmpl_if name="username" op="!=" value="admin">
- <a class="button icons16 icoLoginAs" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}"><span>{tmpl_var name='login_as_txt'}</span></a>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}"><span class="icon icon-loginas"></span></a>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
</tmpl_if>
</td>
</tr>
--
Gitblit v1.9.1