6 files changed, 31 insertions, 74 deletions
diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index ab8df9d63..4c11115b9 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -62,13 +62,6 @@
   <li><a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a></li>
 </ul>
 </div>
-<div class="titreMenu">{L_AUTH}</div>
-<div class="menu">
-<ul class="menu">
-  <li><a class="adminMenu" href="{U_USERS_AUTH}">{L_USERS}</a></li>
-  <li><a class="adminMenu" href="{U_GROUPS_AUTH}">{L_GROUPS}</a></li>
-</ul>
-</div>
       </div>
 	</td>
 	<td style="padding:10px;width:99%;" valign="top">
@@ -95,7 +88,7 @@
   </div>
   <!-- END infos -->
   <div id="adminMain">
-    {ADMIN_CONTENT}{ADMIN_CONTENT_2}
+    {ADMIN_CONTENT}
   </div>
 </div>
 	</td>
diff --git a/template/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
index 83829cff5..a86be6849 100644
--- a/template/default/admin/cat_options.tpl
+++ b/template/default/admin/cat_options.tpl
@@ -1,8 +1,6 @@
 <div class="admin">{L_CAT_TITLE}</div>
 
 <form method="post" action="{F_ACTION}">
-  <input type="hidden" name="{HIDDEN_NAME}" value="{HIDDEN_VALUE}" />
-
   <table class="doubleSelect">
     <tr>
       <td>
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
index 89cdf1bb2..5fac3e4bb 100644
--- a/template/default/admin/group_list.tpl
+++ b/template/default/admin/group_list.tpl
@@ -1,43 +1,25 @@
-<form method="post" name="post" action="{S_GROUP_ACTION}">
-<div class="admin">{L_GROUP_SELECT}</div>
-<!-- BEGIN select_box -->
-{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
-<input type="submit" name="delete" value="{L_GROUP_DELETE}" class="bouton" />
-<div style="vertical-align:middle;">
-<input type="checkbox" name="confirm_delete" value="1">{L_GROUP_CONFIRM}
-</div>
-<!-- END select_box -->
-<input type="text" name="newgroup">
-<input type="submit" class="bouton" name="new" value="{L_CREATE_NEW_GROUP}" />
-<br />
-<br />
-<!-- BEGIN edit_group -->
-<div class="admin">{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]</div>
-<table class="table2" width="60%" style="margin-left:20%;">
-<tr class="throw">
-    <th width="25%">{L_USER_NAME}</th>
-	  <th width="25%">{L_USER_EMAIL}</th>
-    <th width="10%">{L_USER_SELECT}</th>
-</tr>
-<!-- BEGIN user -->
-  <tr class="{edit_group.user.T_CLASS}">
-    <td>{edit_group.user.NAME}</td>
-    <td>{edit_group.user.EMAIL}</td>
-	  <td align="center"><input name="members[]" type="checkbox" value="{edit_group.user.ID}"></td>
+<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
+  <fieldset>
+    <legend>{lang:Add group}</legend>
+    <label>{lang:Group name} <input type="text" name="groupname" maxlength="50" size="20" /></label>
+    <input type="submit" name="submit_add" value="{lang:Add}" />
+  </fieldset>
+</form>
+
+<table class="table2" style="width:100%;" >
+  <tr class="throw">
+    <th>{lang:Group name}</th>
+    <th>{lang:Members}</th>
+    <th>{lang:Actions}</th>
+  </tr>
+  <!-- BEGIN group -->
+  <tr class="{group.CLASS}">
+    <td>{group.NAME}</td>
+    <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
+    <td style="text-align:center;">
+      <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
+      <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
+    </td>
   </tr>
-<!-- END user -->
-<tr>
-  <td colspan="3" align="right" valign="middle">
-    <input type="submit" name="deny_user" value="{L_DENY_SELECTED}" class="bouton" />
-  </td>
-</tr>
+  <!-- END group -->
 </table>
-<div align="left" style="margin-left:20%;">
-<input type="text" name="username" maxlength="50" size="20" />
-<input type="submit" name="add" value="{L_ADD_MEMBER}" class="bouton" />
-<input name="edit_group_id" type="hidden" value="{edit_group.GROUP_ID}">
-<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
-</div>
-<br />
-<!-- END edit_group -->
-</form>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
deleted file mode 100644
index 9bf490e5b..000000000
--- a/template/default/admin/group_perm.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- BEGIN select_box -->
-<form method="post" name="post" action="{S_GROUP_ACTION}">
-  <div class="admin">{L_GROUP_SELECT}</div>
-  {S_GROUP_SELECT}&nbsp;&nbsp;
-  <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
-</form>
-<!-- END select_box -->
-\ No newline at end of file
diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
index 2c8a6cc9f..ce9634c65 100644
--- a/template/default/admin/user_list.tpl
+++ b/template/default/admin/user_list.tpl
@@ -1,15 +1,12 @@
-<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 class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
+  <fieldset>
+    <legend>{lang:Add a user}</legend>
+    <label>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" /></label>
+    <label>{L_PASSWORD} <input type="text" name="password" /></label>
+    <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
+  </fieldset>
 </form>
 
-<div class="admin">{L_USERS_LIST}</div>
-
 <form class="filter" method="get" name="filter" action="{F_FILTER_ACTION}">
 
   <input type="hidden" name="page" value="user_list" />
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
deleted file mode 100644
index e3944fe42..000000000
--- a/template/default/admin/user_perm.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<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>
-\ No newline at end of file