Merge branch 'master' of git@github.com:gallery/gallery3

11 files changed, 61 insertions, 43 deletions

diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index dd8d5c5d..bab1d0ed 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -159,6 +159,8 @@ how it wants to round. */
 #l10n-client-string-editor .source .source-text {
       line-height:1.5em;
       background:#eee;
+      font-family: monospace;
+      text-align: left;
       height:16em; margin:1em; padding:1em;
       overflow:auto;
       direction: ltr;
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index 854086c1..9729a868 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -100,12 +100,6 @@ class gallery_menu_Core {
                ->url("#")
                ->css_class("gFullSizeLink"));
     }
-    $menu
-      ->append(Menu::factory("link")
-               ->id("album")
-               ->label(t("Return to album"))
-               ->url($theme->item()->parent()->url("show={$theme->item->id}"))
-               ->css_id("gAlbumLink"));
   }
 
   static function admin($menu, $theme) {
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index e3dbb188..b71262df 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -283,8 +283,11 @@ modules/image_block/views/image_block_block.html.php         4   DIRTY $item->th
 modules/info/views/info_block.html.php                       6         $item->title
 modules/info/views/info_block.html.php                       11        $item->description
 modules/info/views/info_block.html.php                       17        $item->name
-modules/info/views/info_block.html.php                       23  DIRTY $item->captured
-modules/info/views/info_block.html.php                       29        $item->owner->name
+modules/info/views/info_block.html.php                       25  DIRTY $parent->id
+modules/info/views/info_block.html.php                       25  DIRTY $item->id
+modules/info/views/info_block.html.php                       26        $parent->title
+modules/info/views/info_block.html.php                       34  DIRTY $item->captured
+modules/info/views/info_block.html.php                       40        $item->owner->name
 modules/notification/views/comment_published.html.php        4         $subject
 modules/notification/views/comment_published.html.php        7         $subject
 modules/notification/views/comment_published.html.php        11        $comment->text
@@ -339,9 +342,9 @@ modules/organize/views/organize_thumb_grid.html.php          7   DIRTY $child->i
 modules/organize/views/organize_thumb_grid.html.php          8   DIRTY $child->id
 modules/organize/views/organize_thumb_grid.html.php          8   DIRTY $item_class
 modules/organize/views/organize_thumb_grid.html.php          9   DIRTY $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true)
-modules/recaptcha/views/admin_recaptcha.html.php             5   DIRTY $form->get_key_url
-modules/recaptcha/views/admin_recaptcha.html.php             8   DIRTY $form
-modules/recaptcha/views/admin_recaptcha.html.php             21  DIRTY $public_key
+modules/recaptcha/views/admin_recaptcha.html.php             6   DIRTY $form->get_key_url
+modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY $form
+modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY $public_key
 modules/rss/views/comment.mrss.php                           9         $title
 modules/rss/views/comment.mrss.php                           10  DIRTY $link
@@ -470,11 +473,11 @@ modules/user/views/admin_users_group.html.php                22  DIRTY $user->id
 modules/user/views/admin_users_group.html.php                22  DIRTY $group->id
 modules/user/views/admin_users_group.html.php                25        $user->name
 modules/user/views/admin_users_group.html.php                25        $group->name
-modules/user/views/login.html.php                            11  DIRTY $user->id
-modules/user/views/login.html.php                            14        $user->full_name
-modules/user/views/login.html.php                            14        $user->name
-modules/user/views/login.html.php                            14        $user->full_name
-modules/user/views/login.html.php                            15  DIRTY $csrf
+modules/user/views/login.html.php                            12  DIRTY $user->id
+modules/user/views/login.html.php                            15        $user->full_name
+modules/user/views/login.html.php                            15        $user->name
+modules/user/views/login.html.php                            15        $user->full_name
+modules/user/views/login.html.php                            18  DIRTY $csrf
 modules/user/views/login_ajax.html.php                       37  DIRTY $form
 modules/user/views/reset_password.html.php                   9         $user->full_name
 modules/user/views/reset_password.html.php                   9         $user->full_name
diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php
index eb450b16..f093b70b 100644
--- a/modules/gallery/views/admin_theme_details.html.php
+++ b/modules/gallery/views/admin_theme_details.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gAdminThemeDetails">
-  <h1> <?= t("Theme Details") ?> </h1>
+  <h1> <?= t("Theme Options") ?> </h1>
 
   <?= $form ?>
 </div>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index f85bce70..dc13a6a0 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -7,7 +7,7 @@
   }
 </script>
 
-<h1> <?= t("Theme Administration") ?> </h1>
+<h1> <?= t("Theme Choice") ?> </h1>
 <p>
   <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
 </p>
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index faa6e939..2e53f48f 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -16,7 +16,7 @@
        [other] - <?= $string["source"]["other"] ?>
         <? else: ?>
         <?= $string["source"] ?>
-        <? endif; ?> 
+        <? endif; ?>
       </li>
       <? endforeach; ?>
     </ul>
@@ -25,7 +25,7 @@
   </div>
   <div id="l10n-client-string-editor">
     <div class="source">
-      <pre class="source-text"></pre>
+      <p class="source-text"></p>
     </div>
     <div class="translation">
       <form method="post" action="<?= url::site("l10n_client/save") ?>" id="gL10nClientSaveForm">
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index db664894..f8e5f35e 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -17,6 +17,17 @@
       <td><?= p::clean($item->name) ?></td>
     </tr>
     <? endif ?>
+    <? if ($item->id != 1): ?>
+    <? $parent = $item->parent(); ?>
+    <tr>
+      <th><?= t("Album: ") ?></th>
+      <td>
+        <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+          <?= p::clean($parent->title) ?>
+        </a>
+      </td>
+    </tr>
+    <? endif ?>
     <? if ($item->captured): ?>
     <tr>
       <th><?= t("Captured:") ?></th>
diff --git a/modules/notification/helpers/notification_menu.php b/modules/notification/helpers/notification_menu.php
index 87927874..696aad62 100644
--- a/modules/notification/helpers/notification_menu.php
+++ b/modules/notification/helpers/notification_menu.php
@@ -18,19 +18,21 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class notification_menu_Core {
-  static function album($menu, $theme) {
+  static function site($menu, $theme) {
     if (!user::active()->guest) {
       $item = $theme->item();
-
-      if ($item) {
+      
+      if ($item && $item->is_album()) {
         $watching = notification::is_watching($item);
 
-        $menu
+        $watching ? $label = t("Remove notifications") : $label = t("Enable notifications");
+
+        $menu->get("options_menu")
           ->append(Menu::factory("link")
             ->id("watch")
-            ->label(t("Enable notifications for this album"))
-            ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token()))
-            ->css_id($watching ? "gRemoveNotifyLink" : "gAddNotifyLink"));
+            ->label($label)
+            ->css_id("gNotifyLink")
+            ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
       }
     }
   }
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index ed90aea9..74932a96 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -2,7 +2,9 @@
 <div id="gAdminRecaptcha">
   <h1> <?= t("ReCaptcha Challenge Filtering") ?> </h1>
   <p>
-    <?= t("Recaptcha is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows. automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"{$form->get_key_url}\">ReCaptcha Public/Private Key pair</a>, which is also free.  Once registered, the the challenge and response strings are evaluated at <a href=\"%url\">recaptcha.net</a> to determine if the form content has been entered by a bot.", array("url" => "http://recaptcha.net")) ?>
+    <?= t("Recaptcha is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows. automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"%domain_url\">ReCaptcha Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
+          array("domain_url" => $form->get_key_url,
+                "recaptcha_url" => "http://recaptcha.net")) ?>
   </p>
 
      <?= $form ?>
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 3b0eac66..2dde11b8 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -19,9 +19,9 @@
  */
 class Password_Controller extends Controller {
   public function reset() {
-    access::verify_csrf();
-
     if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
       $this->_send_reset();
     } else {
       print $this->_reset_form();
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 3889f06e..7617d131 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,18 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul id="gLoginMenu">
   <? if ($user->guest): ?>
-  <li class="first"><a href="<?= url::site("login/ajax") ?>"
-      title="<?= t("Login to Gallery") ?>"
-      id="gLoginLink"><?= t("Login") ?></a></li>
+  <li class="first">
+    <a href="<?= url::site("login/ajax") ?>"
+       title="<?= t("Login to Gallery") ?>"
+       id="gLoginLink"><?= t("Login") ?></a>
+  </li>
   <? else: ?>
-     <li class="first"><?=
-        t('Logged in as %name',
-          array('name' =>
-                '<a href="' . url::site("form/edit/users/{$user->id}") .
-                '" title="' . t("Edit Your Profile") .
-                '" id="gUserProfileLink" class="gDialogLink">' .
-                p::clean(empty($user->full_name) ? $user->name : $user->full_name) . '</a>')) ?></li>
-  <li><a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>"
-      id="gLogoutLink"><?= t("Logout") ?></a></li>
-  <? endif; ?>
+  <li class="first">
+    <?= t('Logged in as %name', array('name' =>
+    '<a href="' . url::site("form/edit/users/{$user->id}") .
+      '" title="' . t("Edit Your Profile") .
+      '" id="gUserProfileLink" class="gDialogLink">' .
+      p::clean(empty($user->full_name) ? $user->name : $user->full_name) . '</a>')) ?>
+  </li>
+  <li>
+    <a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>"
+       id="gLogoutLink"><?= t("Logout") ?></a>
+  </li>
+  <? endif ?>
 </ul>