Categories option management update.

- Rewrite of the tpl file (no more table in it)
- Deletion of duplicate entry in language files
- French version


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

8 files changed, 79 insertions, 118 deletions

diff --git a/admin.php b/admin.php
index 8176a2f0a..d9e6a700b 100644
--- a/admin.php
+++ b/admin.php
@@ -199,10 +199,10 @@ $template->assign_vars(array(
   'L_GROUPS'=>$lang['groups'],
   'L_AUTH'=>$lang['permissions'],
   'L_UPDATE'=>$lang['update'],
-  'L_CAT_UPLOAD'=>$lang['cat_options_upload_menu'],
-  'L_CAT_COMMENTS'=>$lang['cat_options_comments_menu'],
-  'L_CAT_VISIBLE'=>$lang['cat_options_visible_menu'],
-  'L_CAT_STATUS'=>$lang['cat_options_status_menu'],
+  'L_CAT_UPLOAD'=>$lang['upload'],
+  'L_CAT_COMMENTS'=>$lang['comments'],
+  'L_CAT_VISIBLE'=>$lang['lock'],
+  'L_CAT_STATUS'=>$lang['permissions'],
 
   'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
   'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),
diff --git a/admin/cat_list.php b/admin/cat_list.php
index 639a74ce6..eac3869b3 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -282,8 +282,8 @@ $template->assign_vars(array(
   'L_SUBMIT'=>$lang['submit'],
   'L_STORAGE'=>$lang['storage'],
   'L_NB_IMG'=>$lang['pictures'],
-  'L_MOVE_UP'=>$lang['cat_up'],
-  'L_MOVE_DOWN'=>$lang['cat_down'],
+  'L_MOVE_UP'=>$lang['up'],
+  'L_MOVE_DOWN'=>$lang['down'],
   'L_EDIT'=>$lang['edit'],
   'L_INFO_IMG'=>$lang['cat_image_info'],
   'L_DELETE'=>$lang['delete'],
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index e4d2ffaff..ca133d79c 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -151,7 +151,7 @@ $template->assign_vars(array(
   'L_EDIT_STATUS_INFO'=>$lang['cat_access_info'],
   'L_ACCESS_FREE'=>$lang['free'],
   'L_ACCESS_RESTRICTED'=>$lang['restricted'],
-  'L_EDIT_LOCK'=>$lang['cat_lock'],
+  'L_EDIT_LOCK'=>$lang['lock'],
   'L_EDIT_LOCK_INFO'=>$lang['cat_lock_info'],
   'L_YES'=>$lang['yes'],
   'L_NO'=>$lang['no'],
diff --git a/admin/cat_options.php b/admin/cat_options.php
index b62422961..21eb13434 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -182,11 +182,6 @@ $template->assign_vars(
     'L_SUBMIT'=>$lang['submit'],
     'L_RESET'=>$lang['reset'],
     
-    'U_UPLOAD'=>add_session_id($base_url.'upload'),
-    'U_VISIBLE'=>add_session_id($base_url.'visible'),
-    'U_COMMENTS'=>add_session_id($base_url.'comments'),
-    'U_STATUS'=>add_session_id($base_url.'status'),
-    
     'F_ACTION'=>add_session_id($base_url.$page['section'])
    )
  );
@@ -227,10 +222,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_upload_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_upload_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_upload_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_upload_info'],
+        'L_CAT_TITLE' => $lang['cat_upload_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
+        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_upload_info'],
         )
       );
     $template->assign_block_vars('upload', array());
@@ -250,10 +245,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_comments_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_comments_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_comments_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_comments_info'],
+        'L_CAT_TITLE' => $lang['cat_comments_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
+        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_comments_info'],
         )
       );
     $template->assign_block_vars('comments', array());
@@ -273,10 +268,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_visible_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_visible_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_visible_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_visible_info'],
+        'L_CAT_TITLE' => $lang['cat_lock_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['lock'],
+        'L_CAT_OPTIONS_FALSE' => $lang['unlock'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_lock_info'],
         )
       );
     $template->assign_block_vars('visible', array());
@@ -296,10 +291,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_status_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_status_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_status_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_status_info'],
+        'L_CAT_TITLE' => $lang['cat_status_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
+        'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_status_info'],
         )
       );
     $template->assign_block_vars('status', array());
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 9e1242647..841254bf5 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -45,6 +45,10 @@ $lang['free'] = 'Free';
 $lang['restricted'] = 'Restricted';
 $lang['metadata']='Metadata';
 $lang['visitors'] = 'Visitors';
+$lang['lock'] = 'Lock';
+$lang['unlock'] = 'Unlock';
+$lang['up'] = 'Move up';
+$lang['down'] = 'Move down';
 
 // Specific words
 $lang['phpinfos'] = 'PHP Information';
@@ -77,8 +81,6 @@ $lang['remote_site_local_new'] = '(new site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
 
 // Categories
-$lang['cat_up'] = 'Move up';
-$lang['cat_down'] = 'Move down';
 $lang['cat_add'] = 'Add a virtual category';
 $lang['cat_virtual'] = 'Virtual category';
 $lang['cat_public'] = 'Public category';
@@ -87,13 +89,19 @@ $lang['cat_image_info'] = 'Images info';
 $lang['editcat_status'] = 'Status';
 $lang['editcat_confirm'] = 'Category informations updated successfully.';
 $lang['editcat_perm'] = 'To set permissions for this category, click';
-$lang['cat_upload'] = 'Select uploadable categories';
-$lang['cat_upload_info'] = 'Only non virtual categories are shown.';
-$lang['cat_lock'] = 'Lock';
-$lang['cat_lock_info'] = 'This category will temporary been disabled for maintenance.';
 $lang['cat_access_info'] = 'Permission management.';
 $lang['cat_virtual_added'] = 'Virtual category added';
 $lang['cat_virtual_deleted'] = 'Virtual category deleted';
+$lang['cat_upload_title'] = 'Select uploadable categories';
+$lang['cat_upload_info'] = 'Only non virtual and non remote categories are shown.';
+$lang['cat_lock_title'] = 'Lock categories';
+$lang['cat_lock_info'] = 'Selected categories will temporary been disabled for maintenance.';
+$lang['cat_comments_title'] = 'Authorize users to add comments on selected categories';
+$lang['cat_comments_info'] = 'By inheritance, an element is commentable if it belongs at least to one commentable category.';
+$lang['cat_status_title'] = 'Manage authorizations for selected categories';
+$lang['cat_status_info'] = 'Selected categories are private : you will need to authorize users and/or groups to access to them.
+<br />If you make a category private, all its child categories becomes private.
+<br />It you make a category public, all its parent categories becomes public';
 
 // Titles
 $lang['admin_panel'] = 'Administration Panel';
@@ -324,26 +332,4 @@ $lang['cat_list_update_metadata'] = 'Synchronize<br />metadata';
 $lang['cat_list_update_metadata_confirmation'] = 'files metadata updated';
 $lang['cat_list_virtual_category_added'] = 'virtual category added';
 $lang['cat_list_virtual_category_deleted'] = 'virtual category deleted';
-
-$lang['cat_options_menu'] = 'Options';
-$lang['cat_options_upload_menu'] = 'Upload';
-$lang['cat_options_upload_title'] = 'upload authorization settings for categories';
-$lang['cat_options_visible_menu'] = 'Lock';
-$lang['cat_options_visible_title'] = 'temporary lock categories';
-$lang['cat_options_comments_menu'] = 'Comments';
-$lang['cat_options_comments_title'] = 'authorize comments for categories';
-$lang['cat_options_status_menu'] = 'Access';
-$lang['cat_options_status_title'] = 'make your category private or public';
-$lang['cat_options_upload_true'] = 'upload authorized';
-$lang['cat_options_upload_false'] = 'upload forbidden';
-$lang['cat_options_upload_info'] = '(multi)select categories to make them uploadable or not. Upload is not applicable to virtual categories and to categories from a remote site.';
-$lang['cat_options_comments_true'] = 'comments authorized';
-$lang['cat_options_comments_false'] = 'comments forbidden';
-$lang['cat_options_comments_info'] = '(multi)select categories to make them commentable or not. By inheritance, an element is commentable if it belongs at least to one commentable category.';
-$lang['cat_options_visible_true'] = 'unlocked';
-$lang['cat_options_visible_false'] = 'locked';
-$lang['cat_options_visible_info'] = '(multi)select categories to lock or unlock them. If you lock category,  all its child categories becomes locked. It you unlock a category, all its parent categories becomes unlocked';
-$lang['cat_options_status_true'] = 'public';
-$lang['cat_options_status_false'] = 'private';
-$lang['cat_options_status_info'] = '(multi)select categories to make them public or private. If you make a category private, all its child categories becomes private. It you make a category public, all its parent categories becomes public';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 2c75713aa..fade5b2e8 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -45,6 +45,11 @@ $lang['free'] = 'Libre';
 $lang['restricted'] = 'Restreint';
 $lang['metadata']='Métadonnées';
 $lang['visitors'] = 'Visiteurs';
+$lang['storage'] = 'Répertoire';
+$lang['lock'] = 'Verrouiller';
+$lang['unlock'] = 'Déverrouiller';
+$lang['up'] = 'Monter';
+$lang['down'] = 'Descendre';
 
 // Specific words
 $lang['phpinfos'] = 'Informations PHP';
@@ -77,9 +82,6 @@ $lang['remote_site_local_new'] = '(new site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
 
 // Category words
-$lang['storage'] = 'Répertoire';
-$lang['cat_up'] = 'Monter';
-$lang['cat_down'] = 'Descendre';
 $lang['cat_add'] = 'Ajouter une catégorie virtuelle';
 $lang['cat_virtual'] = 'Catégorie virtuelle';
 $lang['cat_public'] = 'Catégorie publique';
@@ -88,30 +90,19 @@ $lang['cat_image_info'] = 'Infos images';
 $lang['editcat_status'] = 'Statut';
 $lang['editcat_confirm'] = 'Les informations associées à cette catégorie ont été mises à jour.';
 $lang['editcat_perm'] = 'Pour accéder aux permissions associées, cliquez';
-$lang['cat_upload'] = 'Sélectionner les catégories pour lesquelles l\'ajout d\'image est autorisé';
-$lang['cat_upload_info'] = 'Seules les catégories non virtuelles sont repertoriées.';
-$lang['cat_lock'] = 'Verrouiller';
-$lang['cat_lock_info'] = 'Cela rendra la catégorie temporairement invisible pour les utilisateurs (maintenance)';
 $lang['cat_access_info'] = 'Permet de gérer l\'accès à cette catégorie.';
 $lang['cat_virtual_added'] = 'Catégorie virtuelle créée';
 $lang['cat_virtual_deleted'] = 'Catégorie virtuelle détruite';
-$lang['cat_options_menu'] = 'Options';
-$lang['cat_options_menu_upload'] = 'upload';
-$lang['cat_options_menu_visible'] = 'lock';
-$lang['cat_options_menu_comments'] = 'comments';
-$lang['cat_options_menu_status'] = 'access';
-$lang['cat_options_upload_true'] = 'authorize upload';
-$lang['cat_options_upload_false'] = 'forbid upload';
-$lang['cat_options_upload_info'] = '(multi)select categories to make them uploadable or not. Upload is not applicable to virtual categories and to categories from a remote site.';
-$lang['cat_options_comments_true'] = 'authorize comments';
-$lang['cat_options_comments_false'] = 'forbid comments';
-$lang['cat_options_comments_info'] = '(multi)select categories to make them commentable or not. By inheritance, an element is commentable if it belongs at least to one commentable category.';
-$lang['cat_options_visible_true'] = 'unlock';
-$lang['cat_options_visible_false'] = 'lock temporary';
-$lang['cat_options_visible_info'] = '(multi)select categories to lock or unlock them. If you lock category,  all its child categories becomes locked. It you unlock a category, all its parent categories becomes unlocked';
-$lang['cat_options_status_true'] = 'public';
-$lang['cat_options_status_false'] = 'private';
-$lang['cat_options_status_info'] = '(multi)select categories to make them public or private. If you make a category private, all its child categories becomes private. It you make a category public, all its parent categories becomes public';
+$lang['cat_upload_title'] = 'Sélectionner les catégories pour lesquelles l\'ajout d\'image est autorisé';
+$lang['cat_upload_info'] = 'Seules les catégories non virtuelles et non distantes sont repertoriées.';
+$lang['cat_lock_title'] = 'Verrouiller les catégories';
+$lang['cat_lock_info'] = 'Cela rendra la catégorie temporairement invisible pour les utilisateurs (maintenance)';
+$lang['cat_comments_title'] = 'Autoriser les utilisateurs à poster des commentaires';
+$lang['cat_comments_info'] = 'Par héritage, il est possible de poster des commentaires dans une sous-catégorie si cela est autorisé pour au moins une catégorie mère.';
+$lang['cat_status_title'] = 'Gestion des autorisations';
+$lang['cat_status_info'] = 'Les catégories sélectionnées sont privées : vous devrez permettre à vos utilisateurs et / ou groupes d\'y accéder.
+<br />Si une catégorie est déclarée privée, alors toutes ses sous catégories deviennent privées.
+<br />Si une catégorie est déclarée publique, alors toutes les catégories mères deviennent publiques.';
 
 //Titles
 $lang['admin_panel'] = 'Panneau d\'administration';
@@ -129,6 +120,7 @@ $lang['title_thumbnails_2'] = 'pour';
 $lang['title_default'] = 'Administration de PhpWebGallery';
 $lang['title_waiting'] = 'Images en attente de validation';
 $lang['title_upload'] = 'Sélectionner les catégories pour lesquelles l\'ajout d\'image est autorisé';
+$lang['title_cat_options'] = 'Options relatives aux catégories';
 
 //Error messages
 $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données';
diff --git a/template/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
index 1a5f442ba..91e63b8a2 100644
--- a/template/default/admin/cat_options.tpl
+++ b/template/default/admin/cat_options.tpl
@@ -1,44 +1,30 @@
-<table width="100%" align="center">
-  <tr class="admin">
-    <th colspan="2">{L_TITLE}</th>
-  </tr>
-</table>
-
-<form action="{F_ACTION}" method="post">
-
-  <table>
-    <tr>
-      <td style="text-align:center;">{L_CAT_OPTIONS_TRUE}</td>
-      <td></td>
-      <td style="text-align:center;">{L_CAT_OPTIONS_FALSE}</td>
-    </tr>
-    <tr>
-      <td>
-  <select style="width:300px" multiple="multiple" name="cat_true[]" size="20">
+<div class="admin">{L_CAT_TITLE}</div>
+<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_OPTIONS_TRUE}</span><br />
+  <select style="height:auto;width:280px" name="cat_true[]" multiple="multiple" size="10">
     <!-- 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>
-      </td>
-      <td valign="middle">
-  <input type="submit" value="&rarr;" name="falsify" style="font-size:15px;" class="bouton" />
-  <br />
-  <input type="submit" value="&larr;" name="trueify" style="font-size:15px;" class="bouton" />
-      </td>
-      <td>
-  <select style="width:300px" multiple="multiple" name="cat_false[]" size="20">
+  </div>
+  <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
+    <input type="submit" value="&larr;" name="trueify" style="font-size:15px;" class="bouton" /><br/>
+    <input type="submit" value="&rarr;" name="falsify" style="font-size:15px;" class="bouton" />
+  </div>
+  <div style="float:right;padding:10px;width:300px;">
+   <span class="titreMenu">{L_CAT_OPTIONS_FALSE}</span><br />
+  <select style="width:280px" name="cat_false[]" multiple="multiple" size="10">
     <!-- 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>
-      </td>
-    </tr>
-  </table>
-
-  <p>{L_CAT_OPTIONS_INFO}</p>
-
-  <p style="text-align:center;">
-    <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-  </p>
-
+  </div>
+</div>
+<div style="clear:both;"></div>
+<input type="reset" name="reset" value="{L_RESET}" class="bouton" />
 </form>
+<div class="information">{L_CAT_OPTIONS_INFO}</div>
+
diff --git a/template/default/default.css b/template/default/default.css
index d1f0aa84c..fe0092477 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -50,8 +50,9 @@ body {
 h1 {
 	font:			bold 18pt 'Trebuchet MS', Verdana, sans-serif;
 	text-decoration:none; 
-	line-height:	120%; 
+	line-height:	120%;
 }
+
 h2 {
 	font:			bold 12pt Arial, Helvetica, sans-serif;
 	text-decoration:none; 
@@ -350,8 +351,9 @@ color : #FFF48E;
 }
 
 div.information {
-  text-align:center;
-  border:2px solid #E0E0E0;
+  text-align:left;
+  font-size:14px;
+  font-weight:bold;
   margin:10px;
   padding:5px;
 }