Index: lightbox2.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/lightbox2/lightbox2.module,v retrieving revision 1.16.2.17.2.26 diff -u -r1.16.2.17.2.26 lightbox2.module --- lightbox2.module 16 Jan 2008 15:20:04 -0000 1.16.2.17.2.26 +++ lightbox2.module 17 Jan 2008 15:06:29 -0000 @@ -1,5 +1,5 @@ Flickr, Image Assist and CCK Imagefield modules are all -supported (images must have the "inline", "thumbnail", "image-thumbnail" or -"flickr-photo-img" classes). +supported (images must have the "inline", "image-inline", "thumbnail", +"image-thumbnail" or "flickr-photo-img" classes).
  • Imagecache Support: adds a Lightbox2 field formatter for CCK imagefields for your custom views.
  • Image Node Link: a link to the image node can be provided within the lightbox itself.
  • Page Exclusion Capability: exclude certain pages on your site from having the lightbox2 functionality.
    • @@ -152,25 +152,6 @@ '#default_value' => variable_get('lightbox2_use_alt_layout', false), ); - - // Add DropDown for list of available image sizes. - if (module_exists('image')) { - $sizes = _image_get_sizes(); - foreach ($sizes as $size_key => $size) { - if ($size_key == 'original' || $size_key == '_original') { - $size_key = ''; - } - $options[$size_key] = $size['label']; - } - $form['lightbox2_general_options']['lightbox2_img_size'] = array( - '#type' => 'select', - '#title' => t('Lightbox image size'), - '#options' => $options, - '#default_value' => variable_get('lightbox2_img_size', ''), - '#description' => t('Select which image size will be loaded in the lightbox. This only applies to images uploaded with the Image module.'), - ); - } - // Add Checkbox for Force Navigation display $form['lightbox2_general_options']['lightbox2_force_show_nav'] = array( '#type' => 'checkbox', @@ -195,6 +176,19 @@ '#default_value' => variable_get('lightbox2_disable_zoom', false), ); + // Add Checkbox for overlay opacity + for ($i = 0; $i < 10; $i++) { + $opacity_options["0.$i"] = "0.$i"; + } + $opacity_options["1.0"] = "1.0"; + $form['lightbox2_general_options']['lightbox2_overlay_opacity'] = array( + '#type' => 'select', + '#title' => t('Overlay Opacity'), + '#options' => $opacity_options, + '#description' => t('The overlay opacity setting determines how visible or transparent the background page is behind the lightbox. The opacity value can range from 0.0 to 1.0 where 0.0 is 100% transparent and 1.0 is 100% opaque.'), + '#default_value' => variable_get('lightbox2_overlay_opacity', '0.6'), + ); + // Add Checkbox for Gallery2 Image Filter. $form['lightbox2_general_options']['lightbox2G2_filter'] = array( '#type' => 'checkbox', @@ -217,11 +211,11 @@ $form['image_node_options'] = array( '#type' => 'fieldset', '#title' => t('Automatic image handling options'), - '#description' => t('These options allow automatic URL re-formatting of Image Nodes. This removes the need for you to add \'rel="lightbox"\' to each image node link throughout your site. Only image nodes which have the CSS classes "inline", "thumbnail", "image-thumbnail" or "flickr-photo-img" will have their URLs automatically re-formatted. This feature is not available when using Lightbox2 Lite.'), + '#description' => t('These options allow automatic URL re-formatting of Image Nodes. This removes the need for you to add \'rel="lightbox"\' to each image node link throughout your site. Only image nodes which have the CSS classes "inline", "image-inline", "thumbnail", "image-thumbnail" or "flickr-photo-img" will have their URLs automatically re-formatted. This feature is not available when using Lightbox2 Lite.'), '#collapsible' => TRUE, '#collapsed' => FALSE, ); - + // Add Checkbox for Image Node. $form['image_node_options']['lightbox2_image_node'] = array( '#type' => 'checkbox', @@ -229,7 +223,25 @@ '#description' => t('Checking this box will enable automatic URL formatting for Image Nodes.'), '#default_value' => variable_get('lightbox2_image_node', true), ); - + + // Add DropDown for list of available image sizes. + if (module_exists('image')) { + $sizes = _image_get_sizes(); + foreach ($sizes as $size_key => $size) { + if ($size_key == 'original' || $size_key == '_original') { + $size_key = ''; + } + $size_options[$size_key] = $size['label']; + } + $form['image_node_options']['lightbox2_image_size'] = array( + '#type' => 'select', + '#title' => t('Lightbox image size'), + '#options' => $size_options, + '#default_value' => variable_get('lightbox2_image_size', ''), + '#description' => t('Select which image size will be loaded in the lightbox. This only applies to images uploaded with the Image module.'), + ); + } + // Add Checkbox for Flickr Image support $form['image_node_options']['lightbox2_flickr'] = array( '#type' => 'checkbox', @@ -321,7 +333,8 @@ // load the javascript settings $js_settings = array( - 'img_size' => variable_get('lightbox2_img_size', ''), + 'image_size' => variable_get('lightbox2_image_size', ''), + 'overlay_opacity' => variable_get('lightbox2_overlay_opacity', '0.6'), 'use_alt_layout' => variable_get('lightbox2_use_alt_layout', false), 'disable_zoom' => variable_get('lightbox2_disable_zoom', false), 'force_show_nav' => variable_get('lightbox2_force_show_nav', false), Index: js/lightbox.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/lightbox2/js/lightbox.js,v retrieving revision 1.5.2.6.4.15 diff -u -r1.5.2.6.4.15 lightbox.js --- js/lightbox.js 16 Jan 2008 10:21:57 -0000 1.5.2.6.4.15 +++ js/lightbox.js 17 Jan 2008 15:06:30 -0000 @@ -50,7 +50,7 @@ var Lightbox = { - overlayOpacity : 0.8, // controls transparency of shadow overlay + overlayOpacity : 0.6, // controls transparency of shadow overlay fadeInSpeed: 'normal', // controls the speed of the image appearance slideDownSpeed: 'slow', // controls the speed of the image resizing animations borderSize : 18, // if you adjust the padding in the CSS, you will need to update this variable @@ -66,8 +66,11 @@ // to display the shadow overlay and the image container. initialize: function() { + var settings = Drupal.settings.lightbox2; + Lightbox.overlayOpacity = settings.overlay_opacity; + // attach lightbox to any links with rel 'lightbox' - Lightbox.updateImageList(); + Lightbox.updateImageList(); // MAKE THE LIGHTBOX DIVS // Code inserts html at the bottom of the page that looks similar to this: @@ -104,8 +107,6 @@ // // - var settings = Drupal.settings.lightbox2; - var Body = document.getElementsByTagName("body").item(0); var Overlay = document.createElement("div"); Index: js/lightbox2.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/lightbox2/js/Attic/lightbox2.js,v retrieving revision 1.1.2.6 diff -u -r1.1.2.6 lightbox2.js --- js/lightbox2.js 15 Oct 2007 12:06:52 -0000 1.1.2.6 +++ js/lightbox2.js 17 Jan 2008 15:06:30 -0000 @@ -24,6 +24,8 @@ $("input[@name=lightbox2_flickr]").attr("disabled", "disabled"); $("input[@name=lightbox2_disable_nested_galleries]").attr("disabled", "disabled"); $("input[@name=lightbox2_image_count_str]").attr("disabled", "disabled"); + $("select[@name=lightbox2_image_size]").attr("disabled", "disabled"); + $("input[@name=lightbox2_overlay_opacity]").attr("disabled", "disabled"); } else { $("input[@name=lightbox2_use_alt_layout]").removeAttr("disabled"); @@ -35,6 +37,8 @@ $("input[@name=lightbox2_image_group]").removeAttr("disabled"); $("input[@name=lightbox2_disable_nested_galleries]").removeAttr("disabled"); $("input[@name=lightbox2_image_count_str]").removeAttr("disabled"); + $("select[@name=lightbox2_image_size]").removeAttr("disabled"); + $("input[@name=lightbox2_overlay_opacity]").removeAttr("disabled"); image_node_handler(); alt_layout_handler(); } @@ -65,9 +69,11 @@ // image node only stuff if ($("input[@name=lightbox2_image_node]:checked").val() == 1) { $("input[@name=lightbox2_disable_nested_galleries]").removeAttr("disabled"); + $("select[@name=lightbox2_image_size]").removeAttr("disabled"); } else { $("input[@name=lightbox2_disable_nested_galleries]").attr("disabled", "disabled"); + $("select[@name=lightbox2_image_size]").attr("disabled", "disabled"); } } } Index: js/image_nodes.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/lightbox2/js/image_nodes.js,v retrieving revision 1.3.2.4.4.11 diff -u -r1.3.2.4.4.11 image_nodes.js --- js/image_nodes.js 16 Jan 2008 11:04:24 -0000 1.3.2.4.4.11 +++ js/image_nodes.js 17 Jan 2008 15:13:02 -0000 @@ -34,7 +34,7 @@ } // Set the href attribute. - var href = $(child).attr("src").replace(".thumbnail", ((settings.img_size == "")?settings.img_size:"."+ settings.img_size)).replace(/(image\/view\/\d+)(\/\w*)/, ((settings.img_size == "")?"$1/_original":"$1/"+ settings.img_size)); + var href = $(child).attr("src").replace(".thumbnail", ((settings.image_size == "")?settings.image_size:"."+ settings.image_size)).replace(/(image\/view\/\d+)(\/\w*)/, ((settings.image_size == "")?"$1/_original":"$1/"+ settings.image_size)); // Handle flickr images. if ($(child).attr("class").match("flickr-photo-img")) {