From b7d542f8ca76bad47e0c904882975d0b574a9766 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Wed, 2 Mar 2011 16:05:54 -0500
Subject: [PATCH] Changed the wording on the admin screen to explain the new
 hide only functionality.

---
 3.0/modules/albumpassword/controllers/admin_albumpassword.php | 2 +-
 3.0/modules/albumpassword/views/admin_albumpassword.html.php  | 2 +-
 3.1/modules/albumpassword/controllers/admin_albumpassword.php | 2 +-
 3.1/modules/albumpassword/views/admin_albumpassword.html.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/albumpassword/controllers/admin_albumpassword.php b/3.0/modules/albumpassword/controllers/admin_albumpassword.php
index 035978c7..d146a194 100644
--- a/3.0/modules/albumpassword/controllers/admin_albumpassword.php
+++ b/3.0/modules/albumpassword/controllers/admin_albumpassword.php
@@ -40,7 +40,7 @@ class Admin_Albumpassword_Controller extends Admin_Controller {
     // Should protected items be hidden, or completely in-accessable?
     $albumpassword_group = $form->group("album_password_group");
     $albumpassword_group->checkbox("hideonly")
-                        ->label("Only hide protected albums?")
+                        ->label(t("Do not require passwords"))
                         ->checked(module::get_var("albumpassword", "hideonly"));
 
     // Add a save button to the form.
diff --git a/3.0/modules/albumpassword/views/admin_albumpassword.html.php b/3.0/modules/albumpassword/views/admin_albumpassword.html.php
index 05e46454..93544e63 100644
--- a/3.0/modules/albumpassword/views/admin_albumpassword.html.php
+++ b/3.0/modules/albumpassword/views/admin_albumpassword.html.php
@@ -4,6 +4,6 @@
   </h2>
   <br />
   <div class="g-block">
-    <?= t("If this box is checked, protected albums will only be hidden.  Anyone with the URL to either the album or it's contents will be able to access it without a password.") ?><br /><br />
     <?= $albumpassword_form ?>
+    <?= t("If this box is checked, accessing a protected album/photo/video will automatically log the visitor in with that items password.") ?><br /><br />
   </div>
diff --git a/3.1/modules/albumpassword/controllers/admin_albumpassword.php b/3.1/modules/albumpassword/controllers/admin_albumpassword.php
index 035978c7..d146a194 100644
--- a/3.1/modules/albumpassword/controllers/admin_albumpassword.php
+++ b/3.1/modules/albumpassword/controllers/admin_albumpassword.php
@@ -40,7 +40,7 @@ class Admin_Albumpassword_Controller extends Admin_Controller {
     // Should protected items be hidden, or completely in-accessable?
     $albumpassword_group = $form->group("album_password_group");
     $albumpassword_group->checkbox("hideonly")
-                        ->label("Only hide protected albums?")
+                        ->label(t("Do not require passwords"))
                         ->checked(module::get_var("albumpassword", "hideonly"));
 
     // Add a save button to the form.
diff --git a/3.1/modules/albumpassword/views/admin_albumpassword.html.php b/3.1/modules/albumpassword/views/admin_albumpassword.html.php
index 05e46454..93544e63 100644
--- a/3.1/modules/albumpassword/views/admin_albumpassword.html.php
+++ b/3.1/modules/albumpassword/views/admin_albumpassword.html.php
@@ -4,6 +4,6 @@
   </h2>
   <br />
   <div class="g-block">
-    <?= t("If this box is checked, protected albums will only be hidden.  Anyone with the URL to either the album or it's contents will be able to access it without a password.") ?><br /><br />
     <?= $albumpassword_form ?>
+    <?= t("If this box is checked, accessing a protected album/photo/video will automatically log the visitor in with that items password.") ?><br /><br />
   </div>