2 files changed, 59 insertions, 59 deletions
diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
new file mode 100644
index 000000000..906828afa
--- /dev/null
+++ b/template/default/admin/user_list.tpl
@@ -0,0 +1,59 @@
+<div class="admin">{L_GROUP_ADD_USER}</div>
+
+<form method="post" name="add_user" action="{F_ADD_ACTION}">
+<div style="text-align:center">
+  {L_USERNAME} <input type="text" name="login" maxlength="50" size="20" />
+  {L_PASSWORD} <input type="text" name="password" />
+  <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
+</div>
+</form>
+
+<div class="admin">{L_USERS_LIST}</div>
+
+<form method="get" name="filter" action="{F_FILTER_ACTION}">
+
+<div style="text-align:center">
+
+  <input type="hidden" name="page" value="user_list" />
+  
+  <!-- BEGIN session -->
+  <input type="hidden" name="id" value="{session.ID}" />
+  <!-- END session -->
+
+  username <input type="text" name="username" value="{F_USERNAME}" />
+
+  {L_ORDER_BY}
+  <select name="order_by">
+    <!-- BEGIN order_by -->
+    <option value="{order_by.VALUE}" {order_by.SELECTED} >{order_by.CONTENT}</option>
+    <!-- END order_by -->
+  </select>
+  <select name="direction">
+    <!-- BEGIN direction -->
+    <option value="{direction.VALUE}" {direction.SELECTED} >{direction.CONTENT}</option>
+    <!-- END direction -->
+  </select>
+  <input type="submit" name="submit_filter" value="{L_SUBMIT}" class="bouton" />
+</div>
+
+</form>
+
+<table style="width:100%;" >
+  <tr class="throw">
+    <th style="width:20%;">{L_USERNAME}</th>
+    <th style="width:20%;">{L_STATUS}</th>
+    <th style="width:30%;">{L_EMAIL}</th>
+    <th style="width:30%;">{L_GROUPS}</th>
+    <th style="width:1%;">{L_ACTIONS}</th>
+  </tr>
+  <!-- BEGIN user -->
+  <tr>
+    <td><a href="{user.U_MOD}">{user.USERNAME}</a></td>
+    <td>{user.STATUS}</td>
+    <td>{user.EMAIL}</td>
+    <td>{user.GROUPS}</td>
+    <td>[<a href="{user.U_PERM}">{L_PERMISSIONS}</a>]</td>
+  </tr>
+  <!-- END user -->
+</table>
+<div class="navigationBar">{NAVBAR}</div>
diff --git a/template/default/profile.tpl b/template/default/profile.tpl
index 500b10066..f8b9dd2e5 100644
--- a/template/default/profile.tpl
+++ b/template/default/profile.tpl
@@ -8,64 +8,6 @@
 </div>
 <!-- END errors -->
 
-<!-- BEGIN add_user -->
-<div class="admin">{L_GROUP_ADD_USER}</div>
-<form method="post" name="post" action="{add_user.F_ACTION}">
-  {L_USERNAME} <input type="text" name="login" maxlength="50" size="20" />
-  {L_PASSWORD} <input type="text" name="password" />
-  <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
-</form>
-<!-- END add_user -->
-
-<!-- BEGIN select_user -->
-<div class="admin">{L_SELECT_USERNAME}</div>
-<form method="post" name="post" action="{F_SEARCH_USER_ACTION}">
-  <input type="text" name="username" maxlength="50" size="20" />
-  <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" /> 
-  <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
-</form>
-
-<div class="admin">{L_USERS_LIST}</div>
-<form method="get" action="{F_ORDER_ACTION}">
-<input type="hidden" name="page" value="profile" />
-<div style="text-align:center">
-  {L_ORDER_BY}
-  <select name="order_by">
-    <!-- BEGIN order_by -->
-    <option value="{select_user.order_by.VALUE}" {select_user.order_by.SELECTED} >{select_user.order_by.CONTENT}</option>
-    <!-- END order_by -->
-  </select>
-  <select name="direction">
-    <!-- BEGIN direction -->
-    <option value="{select_user.direction.VALUE}" {select_user.direction.SELECTED} >{select_user.direction.CONTENT}</option>
-    <!-- END direction -->
-  </select>
-  <input type="submit" value="{L_SUBMIT}" class="bouton" />
-</div>
-</form>
-
-<table style="width:100%;" >
-  <tr class="throw">
-    <th style="width:20%;">{L_USERNAME}</th>
-    <th style="width:20%;">{L_STATUS}</th>
-    <th style="width:30%;">{L_EMAIL}</th>
-    <th style="width:30%;">{L_GROUPS}</th>
-    <th style="width:1%;">{L_ACTIONS}</th>
-  </tr>
-  <!-- BEGIN user -->
-  <tr>
-    <td><a href="{select_user.user.U_MOD}">{select_user.user.USERNAME}</a></td>
-    <td>{select_user.user.STATUS}</td>
-    <td>{select_user.user.EMAIL}</td>
-    <td>{select_user.user.GROUPS}</td>
-<!-- [<a href="{select_user.user.U_MOD}">{L_MODIFY}</a>] -->
-    <td>[<a href="{select_user.user.U_PERM}">{L_PERMISSIONS}</a>]</td>
-  </tr>
-  <!-- END user -->
-</table>
-<div class="navigationBar">{NAVBAR}</div>
-<!-- END select_user -->
-<!-- BEGIN modify -->
 <!-- BEGIN profile -->
 <div class="titrePage">{L_TITLE}</div>
 <!-- END profile -->
@@ -169,4 +111,3 @@
 <a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
 </div>
 <!-- END profile -->
-<!-- END modify -->