From 10dac9de37eee9b73964e8370eb39333b7760c0c Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Fri, 30 Apr 2010 22:38:17 +0000
Subject: bug 1637: make the privacy level the same everywher, use "who can see
 this photo?" instead of "minimum privacy level".

git-svn-id: http://piwigo.org/svn/trunk@6025 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/configuration.tpl      | 2 +-
 admin/themes/default/template/element_set_global.tpl | 4 ++--
 admin/themes/default/template/element_set_unit.tpl   | 2 +-
 admin/themes/default/template/picture_modify.tpl     | 2 +-
 admin/themes/default/template/site_update.tpl        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'admin/themes/default')

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 4db63e05c..95fe21388 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -377,7 +377,7 @@
 
     <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>
     </li>
diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index f226bff84..857512c5b 100644
--- a/admin/themes/default/template/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
@@ -185,12 +185,12 @@
       </tr>
 
     <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>
     </tr>
diff --git a/admin/themes/default/template/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl
index 5b295d1e8..a70d9075e 100644
--- a/admin/themes/default/template/element_set_unit.tpl
+++ b/admin/themes/default/template/element_set_unit.tpl
@@ -102,7 +102,7 @@
       </td>
     </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}">
           {html_options options=$level_options selected=$element.LEVEL}
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index f771a673b..d299fa718 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -152,7 +152,7 @@
       </tr>
 
   <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">
         {html_options options=$level_options selected=$level_options_selected}
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index 90a2562cf..b13c1ffc8 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -69,7 +69,7 @@
 				<ul style="padding-left:3em">
 					<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>
 		</ul>
-- 
cgit v1.2.3