summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/helpers/gallery_menu.php6
-rw-r--r--modules/info/views/info_block.html.php11
2 files changed, 11 insertions, 6 deletions
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>