diff options
| author | jhilden <jakobhilden@gmail.com> | 2009-06-16 22:39:08 -0400 |
|---|---|---|
| committer | jhilden <jakobhilden@gmail.com> | 2009-06-16 22:39:08 -0400 |
| commit | a5b314e7e63a67c347bd595f77a114dab5341432 (patch) | |
| tree | 11a107e8c2ee60da1003057e373eb5af9def54d1 /modules/gallery/helpers | |
| parent | 0054caa9a8b0984ad8fdce002ad2947c5d75cd06 (diff) | |
| parent | 7ad5e9ee2c6c912932e8c38c992c9b1194c9107a (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/gallery_menu.php | 11 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 4499e50a..fb0234b1 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -96,12 +96,11 @@ class gallery_menu_Core { static function photo($menu, $theme) { if (access::can("view_full", $theme->item())) { - $menu - ->append(Menu::factory("link") - ->id("fullsize") - ->label(t("View full size")) - ->url("#") - ->css_class("gFullSizeLink")); + $menu->append(Menu::factory("link") + ->id("fullsize") + ->label(t("View full size")) + ->url($theme->item()->file_url()) + ->css_class("gFullSizeLink")); } } diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index c28c9040..44c1d3f1 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -31,16 +31,6 @@ class gallery_theme_Core { url::file("modules/gallery/css/quick.css") . "\" />"; $buf .= html::script("modules/gallery/js/quick.js"); } - if ($theme->page_type == "photo" && access::can("view_full", $theme->item())) { - $buf .= "<script type=\"text/javascript\" >" . - " var fullsize_detail = { " . - " close: \"" . url::file("modules/gallery/images/ico-close.png") . "\", " . - " url: \"" . $theme->item()->file_url() . "\", " . - " width: " . $theme->item()->width . ", " . - " height: " . $theme->item()->height . "};" . - "</script>"; - $buf .= html::script("modules/gallery/js/fullsize.js"); - } if (module::is_active("rss")) { if ($item = $theme->item()) { |