- new : HTML BODY identifier to let CSS stylesheets manage specific

  behaviour.

- deletion : admin/search useless

- improvement : in admin/user_list, special behaviour for true/false fields
  (expand, show_comments)

- new : gallery_title and gallery_description are displayed at the top of
  each page.

- improvement : simplification in HTML for categories menu.

- improvement : standardization of presentation in all public pages
  (identification, registration, search, profile, notification, comments,
  etc.)

(not in ChangeLog, below this line)

- add forgotten notification.php (should have been added in a previous
  commit)

- [template cclear] deletion of useless class .bouton

- [template cclear] for test purpose, new presentation of register page
  (using FORM.filter)

- [template cclear] adaptation of admin/group_list from template default

- [template cclear] deletion of obsolete admin/infos_images

- [template cclear] deletion of obsolete admin/search_username

- [template cclear] new icon register.png


git-svn-id: http://piwigo.org/svn/trunk@850 68402e56-0260-453c-a942-63ccdbb3a9ee

14 files changed, 129 insertions, 254 deletions

diff --git a/template/cclear/admin.tpl b/template/cclear/admin.tpl
index ef1f89a80..98f555332 100644
--- a/template/cclear/admin.tpl
+++ b/template/cclear/admin.tpl
@@ -1,4 +1,5 @@
 <!-- $Id$ -->
+
 <div id="menubar">
   <dl>
     <dt>{lang:links}</dt>
@@ -66,7 +67,6 @@
 </div> <!-- menubar -->
 
 <div id="content">
-  <!--h2>{PAGE_TITLE}</h2-->
   <!-- BEGIN errors -->
   <div id="errors">
     <ul>
@@ -89,5 +89,3 @@
 
   {ADMIN_CONTENT}
 </div>
-
-
diff --git a/template/cclear/admin/cat_list.tpl b/template/cclear/admin/cat_list.tpl
index 7331fe2e3..6b59afb03 100644
--- a/template/cclear/admin/cat_list.tpl
+++ b/template/cclear/admin/cat_list.tpl
@@ -37,12 +37,12 @@
     </li>
     <!-- END category -->
 
-  <p><input name="submitOrder" type="submit" class="bouton" value="{lang:Save order}" /></p>
+  <p><input name="submitOrder" type="submit" value="{lang:Save order}" /></p>
 
 </form>
 
 <form action="{F_ACTION}" method="post">
   {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
   <input type="hidden" name="rank" value="{NEXT_RANK}"/>
-  <input type="submit" value="{L_SUBMIT}" class="bouton" name="submitAdd" />
+  <input type="submit" value="{L_SUBMIT}" name="submitAdd" />
 </form>
diff --git a/template/cclear/admin/cat_perm.tpl b/template/cclear/admin/cat_perm.tpl
index a066e5214..39374d5ed 100644
--- a/template/cclear/admin/cat_perm.tpl
+++ b/template/cclear/admin/cat_perm.tpl
@@ -4,7 +4,7 @@
 
 <form action="{F_ACTION}" method="post" id="categoryPermissions">
 
-  <h3>{lang:Groups}</h3>
+  <h4>{lang:Groups}</h4>
 
   <fieldset>
     <legend>{lang:Permission granted}</legend>
@@ -26,7 +26,7 @@
     <input type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" />
   </fieldset>
 
-  <h3>{lang:Users}</h3>
+  <h4>{lang:Users}</h4>
   
   <fieldset>
     <legend>{lang:Permission granted}</legend>
diff --git a/template/cclear/admin/configuration.tpl b/template/cclear/admin/configuration.tpl
index a806b2af9..591a1bbca 100644
--- a/template/cclear/admin/configuration.tpl
+++ b/template/cclear/admin/configuration.tpl
@@ -190,8 +190,8 @@
 <!-- END metadata -->
     <tr>
       <td colspan="2" align="center">
-        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
-	<input type="reset" name="reset" class="bouton" value="{L_RESET}">
+        <input type="submit" name="submit" value="{L_SUBMIT}">
+	<input type="reset" name="reset" value="{L_RESET}">
       </td>
     </tr>
   </table>
diff --git a/template/cclear/admin/element_set_global.tpl b/template/cclear/admin/element_set_global.tpl
index def1d30a0..081bb808a 100644
--- a/template/cclear/admin/element_set_global.tpl
+++ b/template/cclear/admin/element_set_global.tpl
@@ -27,7 +27,7 @@
   
   </ul>
 
-  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" class="bouton" /></p>
+  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" /></p>
 
 </fieldset>
 
@@ -152,7 +152,7 @@
   </p>
 
     
-  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /></p>
+  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" /></p>
 
 </fieldset>
 
diff --git a/template/cclear/admin/group_list.tpl b/template/cclear/admin/group_list.tpl
index 3a5688af0..4344c10da 100644
--- a/template/cclear/admin/group_list.tpl
+++ b/template/cclear/admin/group_list.tpl
@@ -1,52 +1,27 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-<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>
+<h2>{lang:title_groups}</h2>
+
+<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">
+  <tr class="throw">
+    <th>{lang:Group name}</th>
+    <th>{lang:Members}</th>
+    <th>{lang:Actions}</th>
   </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>
+  <!-- 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 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>
\ No newline at end of file
diff --git a/template/cclear/admin/group_perm.tpl b/template/cclear/admin/group_perm.tpl
index 9bf490e5b..91c2f637a 100644
--- a/template/cclear/admin/group_perm.tpl
+++ b/template/cclear/admin/group_perm.tpl
@@ -1,7 +1,7 @@
-<!-- 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" />
+<h2>{TITLE}</h2>
+
+<form method="post" action="{F_ACTION}">
+  {DOUBLE_SELECT}
 </form>
-<!-- END select_box -->
\ No newline at end of file
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/cclear/admin/infos_images.tpl b/template/cclear/admin/infos_images.tpl
deleted file mode 100644
index 2e786483b..000000000
--- a/template/cclear/admin/infos_images.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-
-<form action="{F_ACTION}" method="POST">
-<div class="admin">{L_INFOS_TITLE} &quot;{CATEGORY}&quot;</div>
-  <table width="100%">
-    <tr>
-      <td><div style="margin-left:50px;">{L_AUTHOR}</div></td>
-      <td style="row1">
-        <input type="text" name="author_cat" value="" maxlength="255" />
-      </td>
-      <td style="text-align:left;">
-        <input type="checkbox" name="use_common_author" value="1" />
-        {L_INFOS_OVERALL_USE}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <div style="margin-left:50px;">{L_INFOS_CREATION_DATE} [DD/MM/YYYY]</div>
-      </td>
-      <td style="row1">
-        <input type="text" name="date_creation_cat" value="" size="12" maxlength="10"/>
-      </td>
-      <td style="text-align:left;">
-        <input type="checkbox" name="use_common_date_creation" value="1" />
-        {L_INFOS_OVERALL_USE}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <div style="margin-left:50px;">{L_KEYWORD} {L_KEYWORD_SEPARATION}</div>
-      </td>
-      <td style="row1">
-        <input type="text" name="keywords_cat" value="" maxlength="255" />
-      </td>
-      <td style="text-align:left;">
-        <input type="radio" name="common_keywords" value="add" />
-        {L_INFOS_ADDTOALL}
-        <input type="radio" name="common_keywords" value="remove" />
-        {L_INFOS_REMOVEFROMALL}
-      </td>
-    </tr>
-  </table>
-  <br />
-  <div class="admin">{L_INFOS_DETAIL}</div>
-  <div class="navigationBar">{NAV_BAR}</div>
-  <table width="100%">
-    <tr>
-      <td style="width:0px;">&nbsp;</td>
-      <td class="row2" style="text-align:center;">{L_THUMBNAIL}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_IMG}</td>
-      <td class="row2" style="text-align:center;">{L_AUTHOR}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_COMMENT}</td>
-      <td class="row2" style="text-align:center;">{L_INFOS_CREATION_DATE}</td>
-      <td class="row2" style="text-align:center;">{L_KEYWORD}</td>
-    </tr>
-    <!-- BEGIN picture -->
-    <tr>
-      <td style="width:0px;">
-        <div style="margin-left:2px;margin-right:2px;">
-          <input type="checkbox" name="check-{picture.ID_IMG}" value="1" />
-        </div>
-      </td>
-      <td style="text-align:center;"><a name="{picture.DEFAULTNAME_IMG}" href="{picture.URL_IMG}"><img src="{picture.TN_URL_IMG}" alt="" class="miniature" title="{picture.FILENAME_IMG}" /></a></td>
-      <td style="text-align:center;">{picture.DEFAULTNAME_IMG}<br /><input type="text" name="name-{picture.ID_IMG}" value="{picture.NAME_IMG}" maxlength="255"/></td>
-      <td style="text-align:center;"><input type="text" name="author-{picture.ID_IMG}" value="{picture.AUTHOR_IMG}" maxlength="255" size="12" /></td>
-      <td style="text-align:center;"><textarea name="comment-{picture.ID_IMG}" rows="5" cols="30" style="overflow:auto">{picture.COMMENT_IMG}</textarea></td>
-      <td style="text-align:center;"><input type="text" name="date_creation-{picture.ID_IMG}" value="{picture.DATE_IMG}" maxlength="10" size="10" /></td>
-      <td style="text-align:center;"><input type="text" name="keywords-{picture.ID_IMG}" value="{picture.KEYWORDS_IMG}" length="255" /></td>
-    </tr>
-    <!-- END picture -->
-    <tr>
-      <td colspan="7">
-        <img src="./template/clear/admin/images/arrow_select.gif" alt="&uarr;" />
-        {L_INFOS_ASSOCIATE}
-        <select style="width:400px" name="associate" size="1">
-          <!-- BEGIN associate_option -->
-          <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.OPTION}</option>
-          <!-- END category_option -->
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="7" style="text-align:center;">
-        <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/template/cclear/admin/remote_site.tpl b/template/cclear/admin/remote_site.tpl
index 4b8260279..f4b31d1e4 100644
--- a/template/cclear/admin/remote_site.tpl
+++ b/template/cclear/admin/remote_site.tpl
@@ -55,7 +55,7 @@
 <form action="{F_ACTION}" method="post">
   {L_REMOTE_SITE_CREATE} 
   <input type="text" name="galleries_url" value="{F_GALLERIES_URL}" />
-  <input class="bouton" type="submit" name="submit" value="{L_SUBMIT}" />
+  <input type="submit" name="submit" value="{L_SUBMIT}" />
 </form>
 
 <table>
diff --git a/template/cclear/admin/search_username.tpl b/template/cclear/admin/search_username.tpl
deleted file mode 100644
index f3e676f8d..000000000
--- a/template/cclear/admin/search_username.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<script language="javascript" type="text/javascript">
-<!--
-function refresh_username(selected_username)
-{
-	opener.document.forms['post'].username.value = selected_username;
-	opener.focus();
-	window.close();
-}
-//-->
-</script>
-<div class="titrePage">{L_SEARCH_USERNAME}</div>
-<form method="post" name="search" action="{F_SEARCH_ACTION}">
-  <input type="text" name="search_username" value="{USERNAME}" class="post" />&nbsp; 
-  <input type="submit" name="search" value="{L_SEARCH}" class="bouton" /><br />
-  <span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
-  <!-- BEGIN switch_select_name -->
-  <span class="genmed">{L_UPDATE_USERNAME}<br />
-  <select name="username_list">{switch_select_name.F_USERNAME_OPTIONS}</select>&nbsp; 
-  <input type="submit" class="bouton" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
-  <!-- END switch_select_name -->
-  <br /><a href="javascript:window.close();" class="adminMenu">{L_CLOSE_WINDOW}</a>
-</form>
diff --git a/template/cclear/admin/thumbnail.tpl b/template/cclear/admin/thumbnail.tpl
index e6e140f7d..aa8bbcd0f 100644
--- a/template/cclear/admin/thumbnail.tpl
+++ b/template/cclear/admin/thumbnail.tpl
@@ -98,7 +98,7 @@
     </tr>
     <tr>
       <td colspan="3" style="text-align:center;">
-        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"/>
+        <input type="submit" name="submit" value="{L_SUBMIT}"/>
       </td>
     </tr>
   </table>
diff --git a/template/cclear/admin/update.tpl b/template/cclear/admin/update.tpl
index 182a9a868..8e952c329 100644
--- a/template/cclear/admin/update.tpl
+++ b/template/cclear/admin/update.tpl
@@ -79,8 +79,8 @@
   </fieldset>
 
   <p class="bottomButtons">
-    <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
-    <input type="reset"  value="{L_RESET}"  name="reset"  class="bouton" />
+    <input type="submit" value="{L_SUBMIT}" name="submit" />
+    <input type="reset"  value="{L_RESET}"  name="reset"  />
   </p>
 
 </form>
diff --git a/template/cclear/admin/user_list.tpl b/template/cclear/admin/user_list.tpl
index a66c6f4ba..ad6b18678 100644
--- a/template/cclear/admin/user_list.tpl
+++ b/template/cclear/admin/user_list.tpl
@@ -1,11 +1,11 @@
-<h1>{lang:title_liste_users}</h1>
+<h2>{lang:title_liste_users}</h2>
 
 <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" />
+    <input type="submit" name="submit_add" value="{L_SUBMIT}" />
   </fieldset>
 </form>
 
@@ -60,7 +60,7 @@
   </select>
   </label>
 
-  <input type="submit" name="submit_filter" value="{L_SUBMIT}" class="bouton" />
+  <input type="submit" name="submit_filter" value="{L_SUBMIT}" />
 
 </fieldset>
 
@@ -68,14 +68,14 @@
 
 <form method="post" name="preferences" action="{F_PREF_ACTION}">
 
-<table class="table2" style="width:100%;" >
+<table class="table2">
   <tr class="throw">
-    <th style="width:1%;"></th>
-    <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>
+    <th>&nbsp;</th>
+    <th>{L_USERNAME}</th>
+    <th>{L_STATUS}</th>
+    <th>{L_EMAIL}</th>
+    <th>{lang:Groups}</th>
+    <th>{L_ACTIONS}</th>
   </tr>
   <!-- BEGIN user -->
   <tr class="{user.CLASS}">
@@ -90,13 +90,34 @@
   </tr>
   <!-- END user -->
 </table>
+
 <div class="navigationBar">{NAVBAR}</div>
 
 <!-- delete the selected users ? -->
 <fieldset>
   <legend>{lang:Deletions}</legend>
-  <input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}
-  <input type="submit" value="{lang:Delete selected users}" name="delete" class="bouton" />
+  <label><input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}</label>
+  <input type="submit" value="{lang:Delete selected users}" name="delete" />
+</fieldset>
+
+<fieldset>
+  <legend>{lang:Status}</legend>
+
+  <table>
+    <tr>
+      <td>{L_STATUS}</td>
+      <td>
+        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label>
+        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label>
+        <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
+          <!-- BEGIN pref_status_option -->
+          <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
+          <!-- END pref_status_option -->
+        </select>
+      </td>
+    </tr>
+  </table>
+
 </fieldset>
 
 <!-- form to set properties for many users at once -->
@@ -139,8 +160,8 @@
   <tr>
     <td>{L_NB_IMAGE_LINE}</td>
     <td>
-      <input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> set to
+      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label>
       <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
              size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" />
     </td>
@@ -149,8 +170,8 @@
   <tr>
     <td>{L_NB_LINE_PAGE}</td>
     <td>
-      <input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> set to
+      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label>
       <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
              size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" />
     <td>
@@ -159,8 +180,8 @@
   <tr>
     <td>{L_TEMPLATE}</td>
     <td>
-      <input type="radio" name="template_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="template_action" value="set" id="template_action_set" /> set to
+      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label>
       <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
         <!-- BEGIN template_option -->
         <option {template_option.SELECTED} value="{template_option.VALUE}">{template_option.CONTENT}</option>
@@ -172,8 +193,8 @@
   <tr>
     <td>{L_LANGUAGE}</td>
     <td>
-      <input type="radio" name="language_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="language_action" value="set" id="language_action_set" /> set to
+      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {lang:set to}</label>
       <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
         <!-- BEGIN language_option -->
         <option {language_option.SELECTED} value="{language_option.VALUE}">{language_option.CONTENT}</option>
@@ -185,8 +206,8 @@
   <tr>
     <td>{L_RECENT_PERIOD}</td>
     <td>
-      <input type="radio" name="recent_period_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> set to
+      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label>
       <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
              type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
     </td>
@@ -195,33 +216,29 @@
   <tr>
     <td>{L_EXPAND}</td>
     <td>
-      <input type="radio" name="expand_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="expand_action" value="set" id="expand_action_set" /> set to
-      <input onmousedown="document.getElementById('expand_action_set').checked = true;" 
-             type="radio" class="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}
-      <input onmousedown="document.getElementById('expand_action_set').checked = true;"
-             type="radio" class="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}
+      <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label>
+      / {lang:set to}
+      <label><input type="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}</label>
+      <label><input type="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}</label>
     </td>
   </tr>
 
   <tr>
     <td>{L_SHOW_NB_COMMENTS}</td>
     <td>
-      <input type="radio" name="show_nb_comments_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="show_nb_comments_action" value="set" id="show_nb_comments_action_set" /> set to
-      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
-             type="radio" class="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}
-      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
-             type="radio" class="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}
+      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label>
+      / {lang:set to}
+      <label><input type="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}</label>
+      <label><input type="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}</label>
     </td>
   </tr>
 
   <tr>
     <td>{L_MAXWIDTH}</td>
     <td>
-      <input type="radio" name="maxwidth_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="maxwidth_action" value="unset" /> unset
-      <input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> set to 
+      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label>
+      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {lang:set to}</label>
       <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
              type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
     </td>
@@ -231,40 +248,28 @@
   <tr>
     <td>{L_MAXHEIGHT}</td>
     <td>
-      <input type="radio" name="maxheight_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="maxheight_action" value="unset" /> unset
-      <input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> set to 
+      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label>
+      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {lang:set to}</label>
       <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
              type="text" size="4" maxlength="4" name="maxheight" value="{maxheight}" />
     </td>
   </tr>
 
-  <tr>
-    <td>{L_STATUS}</td>
-    <td>
-      <input type="radio" name="status_action" value="leave" checked="checked" /> leave unchanged
-      <input type="radio" name="status_action" value="set" id="status_action_set" /> set to
-      <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
-        <!-- BEGIN pref_status_option -->
-        <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
-        <!-- END pref_status_option -->
-      </select>
-    </td>
-  </tr>
 
 </table>
 
 </fieldset>
 
-<p style="text-align:center;">
-  target  
-  <input type="radio" name="target" value="all" /> all
-  <input type="radio" name="target" value="selection" checked="checked" /> selection
+<p>
+  {lang:target}
+  <label><input type="radio" name="target" value="all" /> {lang:all}
+  <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection}
 </p>
 
-<p style="text-align:center;">
-  <input type="submit" value="{L_SUBMIT}" name="pref_submit" class="bouton" />
-  <input type="reset" value="{L_RESET}" name="pref_reset" class="bouton" />
+<p>
+  <input type="submit" value="{L_SUBMIT}" name="pref_submit" />
+  <input type="reset" value="{L_RESET}" name="pref_reset" />
 </p>
 
 </form>
diff --git a/template/cclear/admin/user_perm.tpl b/template/cclear/admin/user_perm.tpl
index e3944fe42..a24fd9096 100644
--- a/template/cclear/admin/user_perm.tpl
+++ b/template/cclear/admin/user_perm.tpl
@@ -1,6 +1,21 @@
-<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
+<h2>{TITLE}</h2>
+
+<!-- BEGIN groups -->
+<fieldset>
+  <legend>{lang:Categories authorized thanks to group associations}</legend>
+
+  <ul>
+    <!-- BEGIN category -->
+    <li>{groups.category.NAME}</li>
+    <!-- END category -->
+  </ul>
+</fieldset>
+<!-- END groups -->
+
+<fieldset>
+  <legend>{lang:Other private categories}</legend>
+
+  <form method="post" action="{F_ACTION}">
+    {DOUBLE_SELECT}
+  </form>
+</fieldset>