From 63ca443649094a14a286cf6924ca211bc1b5753c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 5 Feb 2009 18:12:33 +0000 Subject: Add full size image display. Changes the core menu now checks that the user has authotization before displaying the view fullsize icon. It probably needs a better icon, (but u make do with what u have or don't have :-) ) --- core/helpers/core_menu.php | 9 ++++--- core/helpers/core_theme.php | 10 ++++++++ core/images/ico-close.png | Bin 0 -> 1309 bytes core/js/fullsize.js | 57 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 core/images/ico-close.png create mode 100644 core/js/fullsize.js (limited to 'core') diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index 1564e4d4..247fd215 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -87,12 +87,15 @@ class core_menu_Core { } static function photo($menu, $theme) { - $menu - ->append(Menu::factory("link") + if (access::can("view_full", $theme->item())) { + $menu + ->append(Menu::factory("link") ->id("fullsize") ->label(t("View full size")) ->url("#") - ->css_id("gFullsizeLink")) + ->css_id("gFullsizeLink")); + } + $menu ->append(Menu::factory("link") ->id("album") ->label(t("Return to album")) diff --git a/core/helpers/core_theme.php b/core/helpers/core_theme.php index 57664b48..2ac7d327 100644 --- a/core/helpers/core_theme.php +++ b/core/helpers/core_theme.php @@ -29,6 +29,16 @@ class core_theme_Core { url::file("core/css/quick.css") . "\" />"; $buf .= html::script("core/js/quick.js"); } + if ($theme->page_type == "photo" && access::can("view_full", $theme->item())) { + $buf .= ""; + $buf .= html::script("core/js/fullsize.js"); + } return $buf; } diff --git a/core/images/ico-close.png b/core/images/ico-close.png new file mode 100644 index 00000000..444f4872 Binary files /dev/null and b/core/images/ico-close.png differ diff --git a/core/js/fullsize.js b/core/js/fullsize.js new file mode 100644 index 00000000..91e43529 --- /dev/null +++ b/core/js/fullsize.js @@ -0,0 +1,57 @@ +$(document).ready(function() { + $("#gFullsizeLink").click(function() { + var width = $(document).width(); + var height = $(document).height(); + + $("body").append('
'); + + var image_size = _auto_fit(fullsize_detail.width, fullsize_detail.height); + + $("body").append("
" + + "
"); + $("#gFullsizeClose").click(function() { + $("#gFullsizeOverlay*").remove(); + $("#gFullsize").remove(); + }); + }); +}); + +/* + * Calculate the size of the image panel based on the size of the image and the size of the + * window. Scale the image so the entire panel fits in the view port. + */ +function _auto_fit(imageWidth, imageHeight) { + // ui-dialog gives a padding of 2 pixels + var windowWidth = $(window).width() - 10; + var windowHeight = $(window).height() - 10; + + /* If the width is greater then scale the image width first */ + if (imageWidth > windowWidth) { + var ratio = windowWidth / imageWidth; + imageWidth *= ratio; + imageHeight *= ratio; + } + /* after scaling the width, check that the height fits */ + if (imageHeight > windowHeight) { + var ratio = windowHeight / imageHeight; + imageWidth *= ratio; + imageHeight *= ratio; + } + + return {top: (windowHeight - imageHeight) / 2, left: (windowWidth - imageWidth) / 2, + width: imageWidth, height: imageHeight}; +} -- cgit v1.2.3