20 files changed, 145 insertions, 103 deletions
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index c3973b003..b6303b960 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_categories}</h1>
+
 <div class="admin">{CATEGORIES_NAV}</div>
 
 <form id="categoryOrdering" action="" method="post">
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index c2ddfc7ee..54de1af66 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_edit_cat}</h1>
+
 <h2>{CATEGORIES_NAV}</h2>
 
 <ul class="categoryActions">
diff --git a/template/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
index a86be6849..a3895f78c 100644
--- a/template/default/admin/cat_options.tpl
+++ b/template/default/admin/cat_options.tpl
@@ -1,30 +1,11 @@
-<div class="admin">{L_CAT_TITLE}</div>
+<h1>{lang:title_cat_options}</h1>
 
 <form method="post" action="{F_ACTION}">
-  <table class="doubleSelect">
-    <tr>
-      <td>
-        <h3>{L_CAT_OPTIONS_TRUE}</h3>
-        <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
-          <!-- BEGIN category_option_true -->
-          <option class="{category_option_true.CLASS}" {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
-          <!-- END category_option_true -->
-        </select>
-        <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
-      </td>
-
-      <td>
-        <h3>{L_CAT_OPTIONS_FALSE}</h3>
-        <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
-          <!-- BEGIN category_option_false -->
-          <option class="{category_option_false.CLASS}" {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
-          <!-- END category_option_false -->
-        </select>
-        <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
-      </td>
-    </tr>
-  </table>
+  <fieldset>
+    <legend>{L_SECTION}</legend>
+    {DOUBLE_SELECT}
+  </fieldset>
 </form>
 
-<div class="information">{L_CAT_OPTIONS_INFO}</div>
+<p class="information">{L_CAT_OPTIONS_INFO}</div>
 
diff --git a/template/default/admin/cat_perm.tpl b/template/default/admin/cat_perm.tpl
index 6b7061c65..0cddb2549 100644
--- a/template/default/admin/cat_perm.tpl
+++ b/template/default/admin/cat_perm.tpl
@@ -1,3 +1,5 @@
+<h1>{TITLE}</h1>
+
 <form action="{F_ACTION}" method="post" id="categoryPermissions">
 
   <h2>{lang:Groups}</h2>
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 0f8bccf01..c7835f080 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_configuration}</h1>
+
 <form method="post" action="{F_ACTION}">
 <table width="100%" align="center">
 <!-- BEGIN general -->
diff --git a/template/default/admin/double_select.tpl b/template/default/admin/double_select.tpl
new file mode 100644
index 000000000..1745c52d3
--- /dev/null
+++ b/template/default/admin/double_select.tpl
@@ -0,0 +1,23 @@
+<table class="doubleSelect">
+  <tr>
+    <td>
+      <h3>{L_CAT_OPTIONS_TRUE}</h3>
+      <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
+        <!-- BEGIN category_option_true -->
+        <option {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
+        <!-- END category_option_true -->
+      </select>
+      <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
+    </td>
+
+    <td>
+      <h3>{L_CAT_OPTIONS_FALSE}</h3>
+      <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
+        <!-- BEGIN category_option_false -->
+        <option {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
+        <!-- END category_option_false -->
+      </select>
+      <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
+    </td>
+  </tr>
+</table>
diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl
index 9b41a5219..6014291f9 100644
--- a/template/default/admin/element_set_global.tpl
+++ b/template/default/admin/element_set_global.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:Batch management}</h1>
+
 <div class="admin">{CATEGORY_TITLE}</div>
 
 <p style="text-align:center;">
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
index 5fac3e4bb..1bce717ed 100644
--- a/template/default/admin/group_list.tpl
+++ b/template/default/admin/group_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_groups}</h1>
+
 <form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
   <fieldset>
     <legend>{lang:Add group}</legend>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
new file mode 100644
index 000000000..ebb4be2e7
--- /dev/null
+++ b/template/default/admin/group_perm.tpl
@@ -0,0 +1,7 @@
+<h1>{TITLE}</h1>
+
+<form method="post" action="{F_ACTION}">
+  {DOUBLE_SELECT}
+</form>
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/default/admin/help.tpl b/template/default/admin/help.tpl
index bcc02ce8b..2a119dcde 100644
--- a/template/default/admin/help.tpl
+++ b/template/default/admin/help.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_instructions}</h1>
+
 <table style="width:100%;">
   <!-- BEGIN cat -->
   <tr class="admin">
diff --git a/template/default/admin/intro.tpl b/template/default/admin/intro.tpl
index cb77bcc11..f42e9caae 100644
--- a/template/default/admin/intro.tpl
+++ b/template/default/admin/intro.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_default}</h1>
+
 <dl>
   <dt>{lang:PhpWebGallery version}</dt>
   <dd>
@@ -19,18 +21,23 @@
   <dt>{lang:Database}</dt>
   <dd>
     <ul>
-      <li>{DB_ELEMENTS}</li>
+      <li>
+        {DB_ELEMENTS}
+        <!-- BEGIN waiting -->
+        (<a href="{waiting.URL}">{waiting.INFO}</a>)
+        <!-- END waiting -->
+      </li>
       <li>{DB_CATEGORIES}</li>
       <li>{DB_USERS}</li>
       <li>{DB_GROUPS}</li>
-      <li>{DB_COMMENTS}</li>
+      <li>
+        {DB_COMMENTS}
+        <!-- BEGIN unvalidated -->
+        (<a href="{unvalidated.URL}">{unvalidated.INFO}</a>)
+        <!-- END unvalidated -->
+      </li>
       <li>{DB_DATE}</li>
     </ul>
   </dd>
 
-  <dt></dt>
-  <dd></dd>
-
-  <dt></dt>
-  <dd></dd>
 </dl>
diff --git a/template/default/admin/maintenance.tpl b/template/default/admin/maintenance.tpl
index cb8f506ff..3a809a9d2 100644
--- a/template/default/admin/maintenance.tpl
+++ b/template/default/admin/maintenance.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:Maintenance}</h1>
+
 <ul>
   <li><a href="{U_MAINT_CATEGORIES}">{lang:update categories informations}</a></li>
   <li><a href="{U_MAINT_IMAGES}">{lang:update images informations}</a></li>
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index 5cd889e83..f16dce412 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_picmod}</h1>
+
 <div class="admin">{TITLE_IMG}</div>
 <form action="{F_ACTION}" method="POST">
   <table style="width:100%;">
@@ -60,76 +62,64 @@
   </table>
 </form>
 
-<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
-  <div style="clear:both;"></div>
-
-  <div style="height:auto;">
-
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
-      <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
-        <!-- BEGIN associated_option -->
-        <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
-        <!-- END associated_option -->
-      </select>
-    </div>
-
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="associate" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" class="bouton" />
-    </div>
-
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
-      <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
-        <!-- BEGIN dissociated_option -->
-        <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
-        <!-- END dissociated_option -->
-      </select>
-    </div>
-
-  </div>
-
-  <div style="clear:both;"></div>
-
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form1" method="post" action="{F_ACTION}">
+  <fieldset>
+    <legend>{lang:Association to categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{L_CAT_ASSOCIATED}</h3>
+          <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
+            <!-- BEGIN associated_option -->
+            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+            <!-- END associated_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"/></p>
+        </td>
+
+        <td>
+          <h3>{L_CAT_DISSOCIATED}</h3>
+          <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
+            <!-- BEGIN dissociated_option -->
+            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+            <!-- END dissociated_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
 </form>
 
-<form name="form2" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
-  <div style="clear:both;"></div>
-
-  <div style="height:auto;">
-
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_REPRESENTS}</span><br />
-      <select style="height:auto;width:280px" name="cat_elected[]" multiple="multiple" size="10">
-        <!-- BEGIN elected_option -->
-        <option class="{elected_option.CLASS}" {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
-        <!-- END elected_option -->
-      </select>
-    </div>
-
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="elect" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" class="bouton" />
-    </div>
-
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_DOESNT_REPRESENT}</span><br />
-      <select style="width:280px" name="cat_dismissed[]" multiple="multiple" size="10">
-        <!-- BEGIN dismissed_option -->
-        <option class="{dismissed_option.CLASS}" {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
-        <!-- END dismissed_option -->
-      </select>
-    </div>
-
-  </div>
-
-  <div style="clear:both;"></div>
-
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form2" method="post" action="{F_ACTION}">
+  <fieldset>
+    <legend>{lang:Representation of categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{L_REPRESENTS}</h3>
+          <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
+            <!-- BEGIN elected_option -->
+            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
+            <!-- END elected_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"/></p>
+        </td>
+
+        <td>
+          <h3>{L_DOESNT_REPRESENT}</h3>
+          <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
+            <!-- BEGIN dismissed_option -->
+            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
+            <!-- END dismissed_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
 </form>
diff --git a/template/default/admin/remote_site.tpl b/template/default/admin/remote_site.tpl
index 46a466c29..4458bf01c 100644
--- a/template/default/admin/remote_site.tpl
+++ b/template/default/admin/remote_site.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:remote_sites}</h1>
+
 {REMOTE_SITE_TITLE}
 
 <!-- BEGIN update -->
diff --git a/template/default/admin/stats.tpl b/template/default/admin/stats.tpl
index b0e8ea924..c858c504e 100644
--- a/template/default/admin/stats.tpl
+++ b/template/default/admin/stats.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_history}</h1>
+
 <div class="admin">{L_STAT_TITLE}</div>
 <img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
 <div class="admin">{L_STAT_MONTH_TITLE}</div>
diff --git a/template/default/admin/thumbnail.tpl b/template/default/admin/thumbnail.tpl
index 8f4738950..c99190050 100644
--- a/template/default/admin/thumbnail.tpl
+++ b/template/default/admin/thumbnail.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_thumbnails}</h1>
+
 <!-- BEGIN results -->
 <div class="admin">{L_RESULTS}</div>
 <table style="width:100%;">
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index 3a1ae33d3..ef47d47e0 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_update}</h1>
+
 <!-- BEGIN update -->
 <div class="admin">{L_RESULT_UPDATE}</div>
 <ul style="text-align:left;">
diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
index ce9634c65..a66c6f4ba 100644
--- a/template/default/admin/user_list.tpl
+++ b/template/default/admin/user_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_liste_users}</h1>
+
 <form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
   <fieldset>
     <legend>{lang:Add a user}</legend>
@@ -83,7 +85,6 @@
     <td>{user.EMAIL}</td>
     <td>{user.GROUPS}</td>
     <td style="text-align:center;">
-      <a href="{user.U_MOD}"><img src="./template/default/theme/profile.png" style="border:none" alt="profile" title="profile" /></a>
       <a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
     </td>
   </tr>
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
new file mode 100644
index 000000000..ebb4be2e7
--- /dev/null
+++ b/template/default/admin/user_perm.tpl
@@ -0,0 +1,7 @@
+<h1>{TITLE}</h1>
+
+<form method="post" action="{F_ACTION}">
+  {DOUBLE_SELECT}
+</form>
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
index 06bd7881f..9daf2c75d 100644
--- a/template/default/admin/waiting.tpl
+++ b/template/default/admin/waiting.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_waiting}</h1>
+
 <form action="{F_ACTION}" method="post">
   <table style="width:100%;" >
     <tr class="throw">