Changeset 6025

Timestamp:

May 1, 2010, 12:38:17 AM (14 years ago)

Author:

plg

Message:

bug 1637: make the privacy level the same everywher, use "who can see this photo?"
instead of "minimum privacy level".

Location:

trunk

Files:

• admin/element_set_global.php (modified) (1 diff)
• admin/element_set_unit.php (modified) (3 diffs)
• admin/photos_add_direct.php (modified) (1 diff)
• admin/picture_modify.php (modified) (1 diff)
• admin/site_update.php (modified) (1 diff)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• admin/themes/default/template/element_set_global.tpl (modified) (1 diff)
• admin/themes/default/template/element_set_unit.tpl (modified) (1 diff)
• admin/themes/default/template/picture_modify.tpl (modified) (1 diff)
• admin/themes/default/template/site_update.tpl (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (2 diffs)

trunk/admin/element_set_global.php

@@ -410 +410 @@
 
 // image level options
-$tpl_options = array();
-foreach ($conf['available_permission_levels'] as $level)
-{
-  $tpl_options[$level] = l10n( sprintf('Level %d', $level) );
-}
 $template->assign(
     array(
-      'level_options'=> $tpl_options,
+      'level_options'=> get_privacy_level_options(),
+      'level_options_selected' => 0,
     )
   );

trunk/admin/element_set_unit.php

@@ -139 +139 @@
 ksort($month_list);
 
-$tpl_options = array();
-foreach ($conf['available_permission_levels'] as $level)
-{
-  $tpl_options[$level] = l10n( sprintf('Level %d', $level) );
-}
-
 $template->assign(
   array(
@@ -157 +151 @@
     'F_ACTION'=>$base_url.get_query_string_diff(array()),    
     'month_list' => $month_list,
-    'level_options' => $tpl_options
+    'level_options' => get_privacy_level_options(),
     )
   );
@@ -246 +240 @@
         'NAME' => !empty($row['name'])?$row['name']:'',
         'AUTHOR' => !empty($row['author'])?$row['author']:'',
-        'LEVEL' => !empty($row['level'])?$row['level']:'',
+        'LEVEL' => !empty($row['level'])?$row['level']:'0',
         'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'',
         'DATE_CREATION_YEAR' => $year,

trunk/admin/photos_add_direct.php

@@ -431 +431 @@
 
 // image level options
-$tpl_options = array();
-foreach (array_reverse($conf['available_permission_levels']) as $level)
-{
-  $label = null;
-  
-  if (0 == $level)
-  {
-    $label = l10n('Everybody');
-  }
-  else
-  {
-    $labels = array();
-    $sub_levels = array_reverse($conf['available_permission_levels']);
-    foreach ($sub_levels as $sub_level)
-    {
-      if ($sub_level == 0 or $sub_level < $level)
-      {
-        break;
-      }
-      array_push(
-        $labels,
-        l10n(
-          sprintf(
-            'Level %d',
-            $sub_level
-            )
-          )
-        );
-    }
-    
-    $label = implode(', ', $labels);
-  }
-  $tpl_options[$level] = $label;
-}
 $selected_level = isset($_POST['level']) ? $_POST['level'] : 0;
 $template->assign(
     array(
-      'level_options'=> $tpl_options,
+      'level_options'=> get_privacy_level_options(),
       'level_options_selected' => array($selected_level)
     )

trunk/admin/picture_modify.php

@@ -260 +260 @@
 
 // image level options
-$tpl_options = array();
-foreach ($conf['available_permission_levels'] as $level)
-{
-  $tpl_options[$level] = l10n( sprintf('Level %d', $level) ).' ('.$level.')';
-}
 $selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level'];
 $template->assign(
     array(
-      'level_options'=> $tpl_options,
+      'level_options'=> get_privacy_level_options(),
       'level_options_selected' => array($selected_level)
     )

trunk/admin/site_update.php

@@ -891 +891 @@
 }
 
-$tpl_introduction['privacy_level_options']=array();
-foreach ($conf['available_permission_levels'] as $level)
-{
-  $tpl_introduction['privacy_level_options'][$level] = l10n( sprintf('Level %d', $level) );
-}
+$tpl_introduction['privacy_level_options'] = get_privacy_level_options();
 
 $template->assign('introduction', $tpl_introduction);

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

@@ -378 +378 @@
     <li>
       <label>
-        <span class="property">{'Privacy level'|@translate} ({'available for administrators only'|@translate})</span>
+        <span class="property">{'Who can see this photo?'|@translate} ({'available for administrators only'|@translate})</span>
         <input type="checkbox" name="picture_informations[privacy_level]" {if ($display.picture_informations.privacy_level)}checked="checked"{/if}>
       </label>

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

@@ -186 +186 @@
 
     <tr>
-      <td>{'Minimum privacy level'|@translate}</td>
+      <td>{'Who can see these photos?'|@translate}</td>
       <td>
         <label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label>
         <label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label>
         <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
-          {html_options options=$level_options}
+          {html_options options=$level_options selected=$level_options_selected}
         </select>
       </td>

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

@@ -103 +103 @@
     </tr>
     <tr>
-      <td><strong>{'Minimum privacy level'|@translate}</strong></td>
+      <td><strong>{'Who can see this photo?'|@translate}</strong></td>
       <td>
         <select name="level-{$element.ID}">

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

@@ -153 +153 @@
 
   <tr>
-    <td><strong>{'Minimum privacy level'|@translate}</strong></td>
+    <td><strong>{'Who can see this photo?'|@translate}</strong></td>
     <td>
       <select name="level" size="1">

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

@@ -70 +70 @@
                                         <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added categories and elements, deleted categories and elements)'|@translate}</label></li>
                                         <li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li>
-                                        <li><label>{'Minimum privacy level'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
+                                        <li><label>{'Who can see these photos?'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
                                 </ul>
                         </li>

trunk/include/functions.inc.php

@@ -1525 +1525 @@
   }
 }
+
+
+function get_privacy_level_options()
+{
+  global $conf;
+  
+  $options = array();
+  foreach (array_reverse($conf['available_permission_levels']) as $level)
+  {
+    $label = null;
+  
+    if (0 == $level)
+    {
+      $label = l10n('Everybody');
+    }
+    else
+    {
+      $labels = array();
+      $sub_levels = array_reverse($conf['available_permission_levels']);
+      foreach ($sub_levels as $sub_level)
+      {
+        if ($sub_level == 0 or $sub_level < $level)
+        {
+          break;
+        }
+        array_push(
+          $labels,
+          l10n(
+            sprintf(
+              'Level %d',
+              $sub_level
+              )
+            )
+          );
+      }
+      
+      $label = implode(', ', $labels);
+    }
+    $options[$level] = $label;
+  }
+  return $options;
+}
 ?>

trunk/language/en_UK/admin.lang.php

@@ -671 +671 @@
 $lang['Everybody'] = 'Everybody';
 $lang['Who can see these photos?'] = 'Who can see these photos?';
+$lang['Who can see this photo?'] = 'Who can see this photo?';
 $lang['... or switch to the old style form'] = '... or switch to the old style form';
 $lang['... or switch to the multiple files form'] = '... or switch to the multiple files form';

trunk/language/fr_FR/admin.lang.php

@@ -672 +672 @@
 $lang['Everybody'] = 'Tout le monde';
 $lang['Who can see these photos?'] = 'Qui peut voir ces photos ?';
+$lang['Who can see this photo?'] = 'Qui peut voir cette photo ?';
 $lang['... or switch to the old style form'] = '... ou utiliser le formulaire "à l\'ancienne"';
 $lang['... or switch to the multiple files form'] = '... ou utiliser le formulaire multi-fichiers';

trunk/picture.php

@@ -783 +783 @@
     );
 
-  $template->assign('available_permission_levels', $conf['available_permission_levels']);
+  $template->assign('available_permission_levels', get_privacy_level_options());
 }
 

trunk/themes/default/template/picture.tpl

@@ -223 +223 @@
 {if $display_info.privacy_level and isset($available_permission_levels) }
         <tr id="Privacy">
-                <td class="label">{'Privacy level'|@translate}:</td>
+                <td class="label">{'Who can see this photo?'|@translate}</td>
                 <td class="value"> 
 <script type="text/javascript">
@@ -241 +241 @@
 </script>
         <select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
-        {foreach from=$available_permission_levels item=level}
-                <option value="{$level}"{if $current.level==$level} selected="selected"{/if}>{$pwg->l10n($pwg->sprintf('Level %d',$level))}</option>
-        {/foreach}
+          {html_options options=$available_permission_levels selected=$current.level}
         </select>
         </td></tr>