- Template migration

- Admin Control Panel migration
- Category management


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

9 files changed, 189 insertions, 225 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 7b9dd9462..696f43072 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -1,21 +1,67 @@
 <!-- BEGIN install_warning -->
   <p class="install_warning">{L_INSTALL_WARNING}</div>
 <!-- END install_warning -->
-<div class="adminMenu">
-  <a class="adminMenu" href="{U_CONFIG}">{L_CONFIG}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_USERS}">{L_USERS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_CATEGORIES}">{L_CATEGORIES}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_UPDATE}">{L_UPDATE}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_RETURN}">{L_RETURN}</a> 
+<table style="width:100%;">
+  <tr>
+	<td valign="top" style="padding:10px;width:1%;">
+	<div class="table1">
+
+<div class="titreMenu">{L_LINKS}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_RETURN}">{L_GALLERY_INDEX}</a></li>
+  </ul>
 </div>
-<div align="center">
-<div class="adminMain">
+<div class="titreMenu">{L_GENERAL}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG}">{L_CONFIG}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG}">{L_SITES}</a></li>
+  <!--<li><a class="adminMenu" href="{U_CONFIG}">{L_DEFAULT}</a></li>-->
+  <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
+  <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
+  </ul>
+</div>
+<div class="titreMenu">{L_CATEGORIES}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
+  <li><a class="adminMenu" href="{U_UPLOAD}">{L_UPLOAD}</a></li>
+  <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
+</ul>
+</div>
+<div class="titreMenu">{L_IMAGES}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
+  <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
+  <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
+  <li><a class="adminMenu" href="{U_IMG_UPDATE}">{L_UPDATE}</a></li>
+  </ul>
+</div>
+<div class="titreMenu">{L_IDENTIFY}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_USERS}">{L_USERS}</a></li>
+  <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_AUTH}">{L_AUTH}</a></li>
+  <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">
+<div class="home">
   <div class="titrePage">{PAGE_TITLE}</div>
   {ADMIN_CONTENT}
-</div></div>
+</div>
+	</td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
new file mode 100644
index 000000000..dbc59d487
--- /dev/null
+++ b/template/default/admin/cat_list.tpl
@@ -0,0 +1,55 @@
+<!-- BEGIN errors -->
+<div class="errors">
+<ul>
+  <!-- BEGIN error -->
+  <li>{errors.error.ERROR}</li>
+  <!-- END error -->
+</ul>
+</div>
+<!-- END errors -->
+<div class="admin">{CATEGORIES_NAV}</div>
+<table style="width:100%;">
+<!-- BEGIN category -->
+<tr>
+  <td style="width:1px;padding:5px;">{category.CATEGORY_IMG}</td>
+  <td style="width:50%;text-align:left;"><a class="titreImg" href="{category.U_CATEGORY}">{category.CATEGORY_NAME}</a>
+    <br />
+	<!-- BEGIN storage -->
+    {L_STORAGE} : {category.CATEGORY_DIR} - 
+    <!-- END storage -->
+	{L_NB_IMG} : {category.CATEGORY_NB_IMG}
+  </td>
+  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
+    <a href="{category.U_MOVE_UP}">{L_MOVE_UP}</a><br />
+	<a href="{category.U_MOVE_DOWN}">{L_MOVE_DOWN}</a>
+  </td>
+  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
+    <a href="{category.U_CAT_EDIT}">{L_EDIT}</a>
+  </td>
+  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
+    <!-- BEGIN image_info -->
+    <a href="{category.U_INFO_IMG}">{L_INFO_IMG}</a>
+    <!-- END image_info -->
+    <!-- BEGIN no_image_info -->
+    <span style="color:darkgray;">{L_INFO_IMG}</span>
+    <!-- END no_image_info -->
+  </td>
+  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
+    <a href="{category.U_CAT_UPDATE}">{L_UPDATE}</a>
+  </td>
+  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
+    <!-- BEGIN virtual -->
+    <a href="{category.U_CAT_DELETE}">{L_DELETE}</a>
+    <!-- END virtual -->
+    <!-- BEGIN storage -->
+    <span style="color:darkgray;">{L_DELETE}</span>
+    <!-- END storage -->
+  </td>
+<tr>
+<!-- END category -->
+</table>
+<form 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="submit" />
+</form>
\ No newline at end of file
diff --git a/template/default/admin/cat_list.vtp b/template/default/admin/cat_list.vtp
deleted file mode 100644
index 997f3d1f1..000000000
--- a/template/default/admin/cat_list.vtp
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--VTP_errors-->
-<div class="errors">
-  <div class="errors_title">{#errors_title}</div>
-  <ul>
-    <!--VTP_li-->
-    <li>{#content}</li>
-    <!--/VTP_li-->
-  </ul>
-</div>
-<!--/VTP_errors-->
-<div style="text-align:center;padding-top:10px;padding-bottom:5px;">
-  <form action="" method="post">
-    {#cat_add} <input type="text" name="virtual_name" />
-    {#cat_parent}
-    <!--VTP_associate_LOV-->
-    <select name="associate">
-      <!--VTP_associate_cat-->
-      <option value="{#value}">{#content}</option>
-      <!--/VTP_associate_cat-->
-    </select>
-    <!--/VTP_associate_LOV-->
-    <!--VTP_associate_text-->
-      <input type="text" name="associate" />
-    <!--/VTP_associate_text-->
-   <input type="submit" value="{#submit}" name="submit" />
-  </form>
-</div>
-<table style="width:100%;">
-<!--VTP_cat-->
-<tr>
-  <{#td} style="width:50%;text-align:left;">
-    <a name="{#id}"></a>
-    {#indent}
-    <!--VTP_bullet_collapsed--><a href="{#link}"><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_collapsed-->
-    <!--VTP_bullet_expanded--><a href="{#link}"><img src="../template/{#user_template}/admin/images/expanded.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_expanded-->
-    <!--VTP_bullet_wo_link--><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->
-    &nbsp;{#name} [
-    <!--VTP_storage-->
-    dir : {#dir}
-    <!--/VTP_storage-->
-    <!--VTP_virtual-->
-    <span style="color:blue;">{#cat_virtual}</span>
-    <!--/VTP_virtual-->
-    ]
-    <span style="color:red;font-weight:normal;"> {#invisible} <span style="font-weight:bold;">{#private}</span></span>
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:1px;white-space:nowrap;text-align:center;">
-    <!--VTP_up-->
-    <a href="{#up_url}#{#id}"><img src="./template/{#user_template}/admin/images/arrow_up.gif" alt="{#cat_up}" title="{#cat_up}" style="border:none;" /></a>
-    <!--/VTP_up-->
-    <!--VTP_no_up-->
-    <a href="{#last_url}#{#id}"><img src="./template/{#user_template}/admin/images/arrow_last.gif" alt="{#cat_last}" title="{#cat_last}" style="border:none;" /></a>
-    <!--/VTP_no_up-->
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:1px;white-space:nowrap;text-align:center;">
-    <!--VTP_down-->
-    <a href="{#down_url}#{#id}"><img src="./template/{#user_template}/admin/images/arrow_down.gif" alt="{#cat_down}" title="{#cat_down}" style="border:none;" /></a>
-    <!--/VTP_down-->
-    <!--VTP_no_down-->
-    <a href="{#first_url}#{#id}"><img src="./template/{#user_template}/admin/images/arrow_first.gif" alt="{#cat_first}" title="{#cat_first}" style="border:none;" /></a>
-    <!--/VTP_no_down-->
-  </{#td}>
-  <{#td} class="{#class}" style="width:1px;text-align:center;">
-    <div style="margin-left:3px;margin-right:3px;">{#nb_picture}</div>
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{#edit_url}">{#cat_edit}</a>
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <!--VTP_image_info-->
-    <a href="{#image_info_url}">{#cat_image_info}</a>
-    <!--/VTP_image_info-->
-    <!--VTP_no_image_info-->
-    <span style="color:darkgray;">{#cat_image_info}</span>
-    <!--/VTP_no_image_info-->
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <!--VTP_permission-->
-    <a href="{#url}">{#cat_permission}</a>
-    <!--/VTP_permission-->
-    <!--VTP_no_permission-->
-    <span style="color:darkgray;">{#cat_permission}</span>
-    <!--/VTP_no_permission-->
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <!--VTP_update-->
-    <a href="{#update_url}">{#cat_update}</a>
-    <!--/VTP_update-->
-    <!--VTP_no_update-->
-    <span style="color:darkgray;">{#cat_update}</span>
-    <!--/VTP_no_update-->
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <!--VTP_delete-->
-    <a href="{#delete_url}">{#delete}</a>
-    <!--/VTP_delete-->
-    <!--VTP_no_delete-->
-    <span style="color:darkgray;">{#delete}</span>
-    <!--/VTP_no_delete-->
-  </{#td}>
-<tr>
-<!--/VTP_cat-->
-</table>
\ No newline at end of file
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 845c87435..76d09519a 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -11,197 +11,170 @@
 <div class="info">{L_CONFIRM}</div>
 <!-- END confirmation -->
 <form method="post" action="{F_ACTION}">
-<table width="100%">
+<table width="100%" align="center">
   <tr class="admin">
-    <th colspan="3">{L_CONF_GENERAL}</th>
+    <th colspan="2">{L_CONF_GENERAL}</th>
   </tr>
   <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td width="20%" >{L_ADMIN_NAME}</td>
-	<td><input type="text" size="25" name="webmaster" value="{ADMIN_NAME}" /></td>
-	<td width="50%" >{L_ADMIN_NAME_INFO}</td>
+    <td width="50%" ><strong>{L_ADMIN_NAME} &nbsp;:</strong><br /><span class="small">{L_ADMIN_NAME_INFO}</span></td>
+	<td class="row1"><input type="text" size="25" name="webmaster" value="{ADMIN_NAME}" /></td>
   </tr>
   <tr>
-    <td>{L_ADMIN_MAIL}</td>
-	<td><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{ADMIN_MAIL}" /></td>
-	<td>{L_ADMIN_MAIL_INFO}</td>
+    <td><strong>{L_ADMIN_MAIL}&nbsp;:</strong><br /><span class="small">{L_ADMIN_MAIL_INFO}</span></td>
+	<td class="row1"><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{ADMIN_MAIL}" /></td>
   </tr>
   <tr>
-    <td>{L_THUMBNAIL_PREFIX}</td>
-	<td><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{THUMBNAIL_PREFIX}" /></td>
-	<td>{L_THUMBNAIL_PREFIX_INFO}</td>
+    <td><strong>{L_THUMBNAIL_PREFIX}&nbsp;:</strong><br /><span class="small">{L_THUMBNAIL_PREFIX_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{THUMBNAIL_PREFIX}" /></td>
   </tr>
   <tr>
-  <td>{L_ACCESS}</td>
-	<td><input type="radio" class="radio" name="access" value="free" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
+  <td><strong>{L_ACCESS}&nbsp;:</strong><br /><span class="small">{L_ACCESS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="access" value="free" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="access" value="restricted" {ACCESS_RESTRICTED} />{L_ACCESS_RESTRICTED}</td>
-	<td>{L_ACCESS_INFO}</td>
   </tr>
   <tr>
-    <td>{L_HISTORY}</td>
-	<td><input type="radio" class="radio" name="log" value="true" {HISTORY_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_CONF_HISTORY}&nbsp;:</strong><br /><span class="small">{L_CONF_HISTORY_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="log" value="true" {HISTORY_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="log" value="false" {HISTORY_NO} />{L_NO}</td>
-	<td>{L_HISTORY_INFO}</td>
   </tr>
   <tr>
-    <td>{L_MAIL_NOTIFICATION}</td>
-	<td><input type="radio" class="radio" name="mail_notification" value="true" {MAIL_NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_MAIL_NOTIFICATION}&nbsp;:</strong><br /><span class="small">{L_MAIL_NOTIFICATION_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="mail_notification" value="true" {MAIL_NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="mail_notification" value="false" {MAIL_NOTIFICATION_NO} />{L_NO}</td>
-	<td>{L_MAIL_NOTIFICATION_INFO}</td>
   </tr>
     <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr class="admin">
-    <th colspan="3">{L_CONF_COMMENTS}</th>
+    <th colspan="2">{L_CONF_COMMENTS}</th>
   </tr>
     <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td>{L_SHOW_COMMENTS}</td>
-	<td><input type="radio" class="radio" name="show_comments" value="true" {SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_SHOW_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_SHOW_COMMENTS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="show_comments" value="true" {SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="show_comments" value="false" {SHOW_COMMENTS_NO} />{L_NO}</td>
-	<td>{L_SHOW_COMMENTS_INFO}</td>
   </tr>
   <tr>
-    <td>{L_COMMENTS_ALL}</td>
-	<td><input type="radio" class="radio" name="comments_forall" value="true" {COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="comments_forall" value="false" {COMMENTS_ALL_NO} />{L_NO}</td>
-	<td>{L_COMMENTS_ALL_INFO}</td>
   </tr>
   <tr>
-    <td>{L_NB_COMMENTS_PAGE}</td>
-	<td><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{NB_COMMENTS_PAGE}" /></td>
-	<td>{L_NB_COMMENTS_PAGE_INFO}</td>
+    <td><strong>{L_NB_COMMENTS_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{NB_COMMENTS_PAGE}" /></td>
   </tr>
   <tr>
-    <td>{L_VALIDATE_COMMENTS}</td>
-	<td><input type="radio" class="radio" name="comments_validation" value="true" {VALIDATE_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_VALIDATE_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_VALIDATE_COMMENTS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="comments_validation" value="true" {VALIDATE_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="comments_validation" value="false" {VALIDATE_COMMENTS_NO} />{L_NO}</td>
-	<td>{L_VALIDATE_COMMENTS_INFO}</td>
   </tr>
     <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr class="admin">
-    <th colspan="3">{L_ABILITIES_SETTINGS}</th>
+    <th colspan="2">{L_ABILITIES_SETTINGS}</th>
   </tr>
     <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td>{L_LANG_SELECT}</td>
-	<td>{LANG_SELECT}</td>
-	<td>{L_LANG_SELECT_INFO}</td>
+    <td><strong>{L_LANG_SELECT}&nbsp;:</strong><br /><span class="small">{L_LANG_SELECT_INFO}</span></td>
+	<td class="row1">{LANG_SELECT}</td>
   </tr>
   <tr>
-    <td>{L_NB_IMAGE_LINE}</td>
-	<td><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
-	<td>{L_NB_IMAGE_LINE_INFO}</td>
+    <td><strong>{L_NB_IMAGE_LINE}&nbsp;:</strong><br /><span class="small">{L_NB_IMAGE_LINE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
   </tr>
   <tr>
-    <td>{L_NB_ROW_PAGE}</td>
-	<td><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
-	<td>{L_NB_ROW_PAGE_INFO}</td>
+    <td><strong>{L_NB_ROW_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_ROW_PAGE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
   </tr>
   <tr>
-    <td>{L_STYLE_SELECT}</td>
-	<td>{STYLE_SELECT}</td>
-	<td>{L_STYLE_SELECT_INFO}</td>
+    <td><strong>{L_STYLE_SELECT}&nbsp;:</strong><br /><span class="small">{L_STYLE_SELECT_INFO}</span></td>
+	<td class="row1">{STYLE_SELECT}</td>
   </tr>
   <tr>
-    <td>{L_SHORT_PERIOD}</td>
-	<td><input type="text" size="3" maxlength="2" name="short_period" value="{SHORT_PERIOD}" /></td>
-	<td>{L_SHORT_PERIOD_INFO}</td>
+    <td><strong>{L_SHORT_PERIOD}&nbsp;:</strong><br /><span class="small">{L_SHORT_PERIOD_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="short_period" value="{SHORT_PERIOD}" /></td>
   </tr>
   <tr>
-    <td>{L_LONG_PERIOD}</td>
-	<td><input type="text" size="3" maxlength="2" name="long_period" value="{LONG_PERIOD}" /></td>
-	<td>{L_LONG_PERIOD_INFO}</td>
+    <td><strong>{L_LONG_PERIOD}&nbsp;:</strong><br /><span class="small">{L_LONG_PERIOD_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="long_period" value="{LONG_PERIOD}" /></td>
   </tr>
   <tr>
-    <td>{L_EXPAND_TREE}</td>
-	<td><input type="radio" class="radio" name="auto_expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_EXPAND_TREE}&nbsp;:</strong><br /><span class="small">{L_EXPAND_TREE_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="auto_expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="auto_expand" value="false" {EXPAND_TREE_NO} />{L_NO}</td>
-	<td>{L_EXPAND_TREE_INFO}</td>
   </tr>
   <tr>
-    <td>{L_NB_COMMENTS}</td>
-	<td><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_NB_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}</td>
-	<td>{L_NB_COMMENTS_INFO}</td>
   </tr>
   <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr class="admin">
-    <th colspan="3">{L_CONF_UPLOAD}</th>
+    <th colspan="2">{L_CONF_UPLOAD}</th>
   </tr>
   <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td>{L_UPLOAD}</td>
-	<td><input type="radio" class="radio" name="upload_available" value="true" {UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_AUTH_UPLOAD}&nbsp;:</strong><br /><span class="small">{L_AUTH_UPLOAD_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="upload_available" value="true" {UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="upload_available" value="false" {UPLOAD_NO} />{L_NO}</td>
-	<td>{L_UPLOAD_INFO}</td>
   </tr>
   <tr>
-    <td>{L_UPLOAD_MAXSIZE}</td>
-	<td><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{UPLOAD_MAXSIZE}" /></td>
-	<td>{L_UPLOAD_MAXSIZE_INFO}</td>
+    <td><strong>{L_UPLOAD_MAXSIZE}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXSIZE_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{UPLOAD_MAXSIZE}" /></td>
   </tr>
   <tr>
-    <td>{L_UPLOAD_MAXWIDTH}</td>
-	<td><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{UPLOAD_MAXWIDTH}" /></td>
-	<td>{L_UPLOAD_MAXWIDTH_INFO}</td>
+    <td><strong>{L_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXWIDTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{UPLOAD_MAXWIDTH}" /></td>
   </tr>
   <tr>
-    <td>{L_UPLOAD_MAXHEIGHT}</td>
-	<td><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{UPLOAD_MAXHEIGHT}" /></td>
-	<td>{L_UPLOAD_MAXHEIGHT_INFO}</td>
+    <td><strong>{L_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXHEIGHT_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{UPLOAD_MAXHEIGHT}" /></td>
   </tr>
     <tr>
-    <td>{L_TN_UPLOAD_MAXWIDTH}</td>
-	<td><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{TN_UPLOAD_MAXWIDTH}" /></td>
-	<td>{L_TN_UPLOAD_MAXWIDTH_INFO}</td>
+    <td><strong>{L_TN_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXWIDTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{TN_UPLOAD_MAXWIDTH}" /></td>
   </tr>
   <tr>
-    <td>{L_TN_UPLOAD_MAXHEIGHT}</td>
-	<td><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{TN_UPLOAD_MAXHEIGHT}" /></td>
-	<td>{L_TN_UPLOAD_MAXHEIGHT_INFO}</td>
+    <td><strong>{L_TN_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXHEIGHT_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{TN_UPLOAD_MAXHEIGHT}" /></td>
   </tr>
   <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr class="admin">
-    <th colspan="3">{L_CONF_SESSION}</th>
+    <th colspan="2">{L_CONF_SESSION}</th>
   </tr>
   <tr>
-    <td colspan="3">&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
     <tr>
-    <td>{L_COOKIE}</td>
-	<td><input type="radio" class="radio" name="authorize_cookies" value="true" {COOKIE_YES} />{L_YES}&nbsp;&nbsp;
+    <td><strong>{L_COOKIE}&nbsp;:</strong><br /><span class="small">{L_COOKIE_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="authorize_cookies" value="true" {COOKIE_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="authorize_cookies" value="false" {COOKIE_NO} />{L_NO}</td>
-	<td>{L_COOKIE_INFO}</td>
   </tr>
   <tr>
-    <td>{L_SESSION_LENGTH}</td>
-	<td><input type="text" size="4" maxlength="6" name="session_time" value="{SESSION_LENGTH}" /></td>
-	<td>{L_SESSION_LENGTH_INFO}</td>
+    <td><strong>{L_SESSION_LENGTH}&nbsp;:</strong><br /><span class="small">{L_SESSION_LENGTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="6" name="session_time" value="{SESSION_LENGTH}" /></td>
   </tr>
     <tr>
-    <td>{L_SESSION_ID_SIZE}</td>
-	<td><input type="text" size="2" maxlength="3" name="session_id_size" value="{SESSION_ID_SIZE}" /></td>
-	<td>{L_SESSION_ID_SIZE_INFO}</td>
+    <td><strong>{L_SESSION_ID_SIZE}&nbsp;:</strong><br /><span class="small">{L_SESSION_ID_SIZE_INFO}</span></td>
+	<td class="row1"><input type="text" size="2" maxlength="3" name="session_id_size" value="{SESSION_ID_SIZE}" /></td>
   </tr>
     <!-- BEGIN remote_sites -->
     <tr>
-      <th colspan="3" align="center">{#remote_site}</th>
+      <th colspan="2" align="center">{#remote_site}</th>
     </tr>
     <tr>
       <td colspan=3><div style='margin-bottom:0px'>&nbsp;</div></td>
@@ -216,7 +189,7 @@
       <td>{#url}</td>
       <td align="center"><input type="checkbox" name="delete_site_{#id}" value="1" /></td>
       <!-- BEGIN rowspan -->
-	  <td class="row2" rowspan="{#nb_sites}">{#conf_remote_site_delete_info}</td>
+	  <td class="row2" rowspan="{#nb_sites}">{#conf_remote_site_delete_INFO}</span></td>
 	  <!-- END rowspan -->
     </tr>
     <!-- END site -->
@@ -225,7 +198,7 @@
     </tr>
     <!-- END remote_sites -->
     <tr>
-      <td colspan="3" align="center">
+      <td colspan="2" align="center">
         <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
       </td>
     </tr>
diff --git a/template/default/admin/help.tpl b/template/default/admin/help.tpl
index f603fe5e5..c890e1fea 100644
--- a/template/default/admin/help.tpl
+++ b/template/default/admin/help.tpl
@@ -12,7 +12,7 @@
       <div style="text-align:center;margin:auto;margin-bottom:10px;"><img src="{cat.illustration.SRC_IMG}" style="border:1px solid black;" alt=""/></div>
       {cat.illustration.CAPTION}
       <!-- END illustration -->
-      <ul style="margin-right:10px;">
+      <ul style="text-align:left; margin-right:10px;">
         <!-- BEGIN item -->
         <li>{cat.item.CONTENT}</li>
         <!-- END item -->
diff --git a/template/default/admin/images/icon_folder.gif b/template/default/admin/images/icon_folder.gif
new file mode 100644
index 000000000..9b2bc47c6
--- /dev/null
+++ b/template/default/admin/images/icon_folder.gif
diff --git a/template/default/admin/images/icon_folder_link.gif b/template/default/admin/images/icon_folder_link.gif
new file mode 100644
index 000000000..d5e86d47d
--- /dev/null
+++ b/template/default/admin/images/icon_folder_link.gif
diff --git a/template/default/admin/images/icon_folder_lock.gif b/template/default/admin/images/icon_folder_lock.gif
new file mode 100644
index 000000000..436f3d21c
--- /dev/null
+++ b/template/default/admin/images/icon_folder_lock.gif
diff --git a/template/default/admin/images/icon_subfolder.gif b/template/default/admin/images/icon_subfolder.gif
new file mode 100644
index 000000000..9179303e7
--- /dev/null
+++ b/template/default/admin/images/icon_subfolder.gif