From 329bd8caa126040ba7abaf28e8f76e0b6739ceff Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Fri, 5 Jun 2009 18:31:15 -0700
Subject: Remove source code copy artefact

---
 modules/gallery/tests/Xss_Security_Test.php | 32 -----------------------------
 1 file changed, 32 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index 03151c8c..e179482c 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -18,41 +18,9 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Xss_Security_Test extends Unit_Test_Case {
-
-  static function scan_php_file($file, &$cache) {
-    $code = file_get_contents($file);
-    $raw_tokens = token_get_all($code);
-    unset($code);
-
-    $tokens = array();
-    $func_token_list = array("t" => array(), "t2" => array());
-    $token_number = 0;
-    // Filter out HTML / whitespace, and build a lookup for global function calls.
-    foreach ($raw_tokens as $token) {
-      if ((!is_array($token)) || (($token[0] != T_WHITESPACE) && ($token[0] != T_INLINE_HTML))) {
-        if (is_array($token)) {
-          if ($token[0] == T_STRING && in_array($token[1], array("t", "t2"))) {
-            $func_token_list[$token[1]][] = $token_number;
-          }
-        }
-        $tokens[] = $token;
-        $token_number++;
-      }
-    }
-    unset($raw_tokens);
-
-    if (!empty($func_token_list["t"])) {
-      l10n_scanner::_parse_t_calls($tokens, $func_token_list["t"], $cache);
-    }
-    if (!empty($func_token_list["t2"])) {
-      l10n_scanner::_parse_plural_calls($tokens, $func_token_list["t2"], $cache);
-    }
-  }
-
   public function find_unescaped_variables_in_views_test() {
     foreach (glob("*/*/views/*.php") as $view) {
       $expr = null;
-      $line = null;
       $level = 0;
       $php = 0;
       $str = null;
-- 
cgit v1.2.3


From c5425f42a4a13f7f585ffe45c070a865cdef6077 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 6 Jun 2009 00:35:30 -0600
Subject: Remove album view icon link, added album link to info module. This
 and breadcrumb should suffice.

---
 modules/gallery/helpers/gallery_menu.php |   6 ------
 modules/info/views/info_block.html.php   |  11 +++++++++++
 themes/default/css/screen.css            |   4 ----
 themes/default/images/ico-view-album.png | Bin 345 -> 0 bytes
 4 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 themes/default/images/ico-view-album.png

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index 2a9e193b..97f0fd81 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/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/themes/default/css/screen.css b/themes/default/css/screen.css
index 67bd7cc2..71711147 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -602,10 +602,6 @@ form .gError,
   width: 43px !important;
 }
 
-#gViewMenu #gAlbumLink {
-  background-image: url('../images/ico-view-album.png');
-}
-
 #gViewMenu #gHybridLink {
   background-image: url('../images/ico-view-hybrid.png');
 }
diff --git a/themes/default/images/ico-view-album.png b/themes/default/images/ico-view-album.png
deleted file mode 100644
index 20b5af20..00000000
Binary files a/themes/default/images/ico-view-album.png and /dev/null differ
-- 
cgit v1.2.3