Changeset 13646 for trunk

Timestamp:

Mar 19, 2012, 12:07:08 PM (12 years ago)

Author:

plg

Message:

feature 2596: Batch Manager, improve ergonomy on privacy level filter

Location:

trunk

Files:

• admin/batch_manager.php (modified) (2 diffs)
• admin/batch_manager_global.php (modified) (1 diff)
• admin/themes/default/template/batch_manager_global.tpl (modified) (2 diffs)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/batch_manager.php

@@ -84 +84 @@
     {
       $_SESSION['bulk_manager_filter']['level'] = $_POST['filter_level'];
+      
+      if (isset($_POST['filter_level_include_lower']))
+      {
+        $_SESSION['bulk_manager_filter']['level_include_lower'] = true;
+      }
     }
   }
@@ -290 +295 @@
 if (isset($_SESSION['bulk_manager_filter']['level']))
 {
+  $operator = '=';
+  if (isset($_SESSION['bulk_manager_filter']['level_include_lower']))
+  {
+    $operator = '<=';
+  }
+  
   $query = '
 SELECT id
   FROM '.IMAGES_TABLE.'
-  WHERE level >= '.$_SESSION['bulk_manager_filter']['level'].'
+  WHERE level '.$operator.' '.$_SESSION['bulk_manager_filter']['level'].'
 ;';
   array_push(

trunk/admin/batch_manager_global.php

@@ -520 +520 @@
 
 // privacy level
+foreach ($conf['available_permission_levels'] as $level)
+{
+  $level_options[$level] = l10n(sprintf('Level %d', $level));
+
+  if (0 == $level)
+  {
+    $level_options[$level] = l10n('Everybody');
+  }
+}
 $template->assign(
-    array(
-      'filter_level_options'=> get_privacy_level_options(),
-      'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level'])
-        ? $_SESSION['bulk_manager_filter']['level']
-        : 0,
+  array(
+    'filter_level_options'=> $level_options,
+    'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level'])
+    ? $_SESSION['bulk_manager_filter']['level']
+    : 0,
     )
   );
 
+// tags
 if (!empty($_SESSION['bulk_manager_filter']['tags']))
 {

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -539 +539 @@
         <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
         <input type="checkbox" name="filter_level_use" class="useFilterCheckbox" {if isset($filter.level)}checked="checked"{/if}>
-        {'Who can see these photos?'|@translate}
+        {'Privacy level'|@translate}
         <select name="filter_level" size="1">
           {html_options options=$filter_level_options selected=$filter_level_options_selected}
         </select>
+        <label><input type="checkbox" name="filter_level_include_lower" {if isset($filter.level_include_lower)}checked="checked"{/if}> {'include photos with lower privacy level'|@translate}</label>
       </li>
     </ul>
@@ -553 +554 @@
         <option value="filter_category">{'Album'|@translate}</option>
                                 <option value="filter_tags">{'Tags'|@translate}</option>
-        <option value="filter_level">{'Who can see these photos?'|@translate}</option>
+        <option value="filter_level">{'Privacy level'|@translate}</option>
       </select>
 <!--      <input id="removeFilters" class="submit" type="submit" value="Remove all filters" name="removeFilters"> -->

trunk/language/en_UK/admin.lang.php

@@ -874 +874 @@
 $lang['Select users...'] = 'Select users...';
 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u users have automatic permission because they belong to a granted group.';
+$lang['include photos with lower privacy level'] = 'include photos with lower privacy level';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -889 +889 @@
 $lang['Select users...'] = 'Sélectionnez les utilisateurs...';
 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u utilisateurs ont automatiquement la permission car ils appartiennent à un groupe autorisé.';
+$lang['include photos with lower privacy level'] = 'inclure les photos d\'un niveau de confidentialité inférieur';
 ?>