From 5a0424f458323578a6b2e5395a58f3d2bfc034dc Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Tue, 21 Jul 2009 03:30:21 +0800
Subject: Fix some consistency in text. This fixes ticket #546

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/organize/controllers/organize.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 27852904..898be509 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -516,7 +516,7 @@ class Organize_Controller extends Controller {
       break;
 
     case "delete":
-      return array("description" => t("Delete selected photos and albums"),
+      return array("description" => t("Delete selected photos / albums"),
                    "name" => t("Delete images in %name", array("name" => $item->title)),
                    "type" => "delete",
                    "runningMsg" => t("Delete images in progress"),
@@ -537,4 +537,4 @@ class Organize_Controller extends Controller {
       throw new Exception("Operation '$operation' is not implmented");
     }
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 050c82cf80b06a555252efaf701434b0cfd59bed Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 21 Jul 2009 11:09:23 -0700
Subject: Escape bare & symbols so that we use valid entities.  Fixes ticket
 #577.

---
 modules/organize/views/organize.html.php                 | 2 +-
 modules/server_add/views/admin_server_add.html.php       | 2 +-
 modules/server_add/views/server_add_tree_dialog.html.php | 2 +-
 modules/user/views/login.html.php                        | 2 +-
 themes/admin_default/views/admin.html.php                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 65d67d04..1686d255 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -33,7 +33,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an
         <?= $album_tree ?>
       </div>
       <div id="gMicroThumbPanel" class="yui-u"
-           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
+           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
         <ul id="gMicroThumbGrid"></ul>
       </div>
       <div id="gOrganizeEditDrawer" class="yui-u">
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 588a9fca..30ab3536 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -11,7 +11,7 @@
     <ul id="gPathList">
       <? foreach ($paths as $id => $path): ?>
       <li class="ui-icon-left">
-        <a href="<?= url::site("admin/server_add/remove_path?path=$path&csrf=$csrf") ?>"
+        <a href="<?= url::site("admin/server_add/remove_path?path=$path&amp;csrf=$csrf") ?>"
            id="icon_<?= $id?>"
            class="gRemoveDir ui-icon ui-icon-trash">
           X
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 21952849..a4eda3b9 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   var GET_CHILDREN_URL = "<?= url::site("server_add/children?path=__PATH__") ?>";
-  var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
+  var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&amp;csrf=$csrf") ?>";
 </script>
 
 <div id="gServerAdd">
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 4c1a5b3c..42bff4da 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -15,7 +15,7 @@
       p::clean($user->display_name()) . '</a>')) ?>
   </li>
   <li>
-    <a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>"
+    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . url::current(true)) ?>"
        id="gLogoutLink"><?= t("Logout") ?></a>
   </li>
   <? endif ?>
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 575f8a96..b0ddb6c5 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -45,7 +45,7 @@
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
           <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
+          <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&amp;csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>">
           &larr; <?= t("back to the ...") ?>
-- 
cgit v1.2.3