[Collective-checkins] r247527 - in simplelayout/simplelayout.ui.base/branches/plone4: . docs simplelayout/ui/base/browser/resources/jquery_lightbox simplelayout/ui/base/browser/resources/jquery_lightbox/images

[Mathias L. <svn...@pl...>]

Author: maethu
Date: Thu Dec 22 14:13:31 2011
New Revision: 247527

Modified:
   simplelayout/simplelayout.ui.base/branches/plone4/   (props changed)
   simplelayout/simplelayout.ui.base/branches/plone4/docs/HISTORY.txt
   simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/images/lightbox-btn-next.png
   simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/images/lightbox-btn-prev.png
   simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/jquery.lightbox-0.5.min.js
Log:
merge branch es_plone4_lightbox into trunk

Modified: simplelayout/simplelayout.ui.base/branches/plone4/docs/HISTORY.txt
==============================================================================
--- simplelayout/simplelayout.ui.base/branches/plone4/docs/HISTORY.txt	(original)
+++ simplelayout/simplelayout.ui.base/branches/plone4/docs/HISTORY.txt	Thu Dec 22 14:13:31 2011
@@ -5,6 +5,12 @@
 3.0.0
 ----------------
 
+* Add image-download-link to lightbox
+  [22.12.2011, eschmutz]
+
+* Add new arrowimages
+  [22.12.2011, eschmutz]
+
 * Plone 4.1 compatibility: Use _ instead of - as ID sepereator.
   [03.08.2011, jbaumann]
 

Modified: simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/images/lightbox-btn-next.png
==============================================================================
Binary files. No diff available.

Modified: simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/images/lightbox-btn-prev.png
==============================================================================
Binary files. No diff available.

Modified: simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/jquery.lightbox-0.5.min.js
==============================================================================
--- simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/jquery.lightbox-0.5.min.js	(original)
+++ simplelayout/simplelayout.ui.base/branches/plone4/simplelayout/ui/base/browser/resources/jquery_lightbox/jquery.lightbox-0.5.min.js	Thu Dec 22 14:13:31 2011
@@ -38,6 +38,7 @@
 			// Configuration related to texts in caption. For example: Image 2 of 8. You can alter either "Image" and "of" texts.
 			txtImage:				'Bild',	// (string) Specify text "Image"
 			txtOf:					'von',		// (string) Specify text "of"
+			txtDownload:             'Original Bild', // (string) Specify text "Download"
 			// Configuration related to keyboard navigation
 			keyToClose:				'c',		// (string) (c = close) Letter to close the jQuery lightBox interface. Beyond this letter, the letter X and the SCAPE key is used to.
 			keyToPrev:				'p',		// (string) (p = previous) Letter to show the previous image
@@ -241,12 +242,22 @@
 			$('#lightbox-container-image-data-box').slideDown('fast');
 			$('#lightbox-image-details-caption').hide();
 			if ( settings.imageArray[settings.activeImage][1] ) {
-				$('#lightbox-image-details-caption').html(settings.imageArray[settings.activeImage][1]).show();
+				$('#lightbox-image-details-caption').html(settings.imageArray[settings.activeImage][1] + ' - ' + _get_download_link()).show();
 			}
 			// If we have a image set, display 'Image X of X'
 			if ( settings.imageArray.length > 1 ) {
 				$('#lightbox-image-details-currentNumber').html(settings.txtImage + ' ' + ( settings.activeImage + 1 ) + ' ' + settings.txtOf + ' ' + settings.imageArray.length).show();
-			}		
+			}
+		}
+		function _get_download_link() {
+            // In simplelayout a view called download_image is registered on a
+            // simplelayout-block. this view return the downloadable image
+		    url = jq('#lightbox-container-image > img').url().trim().split('/');
+		    url.pop(url.length);
+		    url.push('download_image');
+		    download_url = url.join('/');
+		    
+		    return '<a href=' + download_url + '>' + settings.txtDownload + '</a>';
 		}
 		/**
 		 * Display the button navigations