';
+ loading += '' . l(t('More information about formatting options'), 'filter/tips') . '
'; + drupal_add_popbox(); + return '' . l(t('More information about formatting options'), 'filter/tips', array('attributes' => array('class' => 'popbox'))) . '
'; } /** Index: modules/filter/filter.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v retrieving revision 1.24 diff -u -r1.24 filter.admin.inc --- modules/filter/filter.admin.inc 5 Feb 2009 19:52:02 -0000 1.24 +++ modules/filter/filter.admin.inc 1 Mar 2009 02:30:58 -0000 @@ -14,7 +14,8 @@ * @see filter_admin_overview_submit() */ function filter_admin_overview() { - + drupal_add_popbox(); + // Overview of all formats. $formats = filter_formats(); $error = FALSE; @@ -33,7 +34,7 @@ $form[$id]['name'] = array('#markup' => $format->name); $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use the default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format'))); $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/filter/' . $id)); - $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filter/delete/' . $id)); + $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filter/delete/' . $id, array('attributes' => array('class' => 'popbox-confirm')))); $form[$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight); } $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1)); Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.38 diff -u -r1.38 menu.admin.inc --- modules/menu/menu.admin.inc 3 Feb 2009 18:55:30 -0000 1.38 +++ modules/menu/menu.admin.inc 1 Mar 2009 02:31:00 -0000 @@ -60,6 +60,7 @@ * Recursive helper function for menu_overview_form(). */ function _menu_overview_tree_form($tree) { + drupal_add_popbox(); static $form = array('#tree' => TRUE); foreach ($tree as $data) { $title = ''; @@ -97,7 +98,7 @@ $operations['edit'] = l(t('edit'), 'admin/build/menu/item/' . $item['mlid'] . '/edit'); // Only items created by the menu module can be deleted. if ($item['module'] == 'menu' || $item['updated'] == 1) { - $operations['delete'] = l(t('delete'), 'admin/build/menu/item/' . $item['mlid'] . '/delete'); + $operations['delete'] = l(t('delete'), 'admin/build/menu/item/' . $item['mlid'] . '/delete', array('attributes' => array('class' => 'popbox-confirm'))); } // Set the reset column. elseif ($item['module'] == 'system' && $item['customized']) { Index: misc/popbox.js =================================================================== RCS file: misc/popbox.js diff -N misc/popbox.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/popbox.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,352 @@ +// $Id$ +(function($) { + +/** + * popbox Modal Dialog API + * + * Provide an API for building and displaying JavaScript, in-page, popbox modal dialogs (lightbox style). + * Modality is provided by a fixed, semi-opaque div, positioned in front of the page contents. + * + * popboxes xhtml is themeable, but the outter most element must have id="popbox". + */ + +/** + * Create the popbox object/namespace. + */ +Drupal.popbox = function() {}; +Drupal.popbox.contentSelector = '#content-area'; // The theme must wrap it's page content. +Drupal.popbox.titleSelector = '#page-title'; // The theme must wrap it's page title. + +/** + * Attach the popbox behavior to the all the requested links on the page. + * + * @param context + * The jQuery object to apply the behaviors to. + */ +Drupal.behaviors.popbox = { + attach: function(context) { + // Add keybinding to close popbox. + var $body = $('body'); + if(!$body.hasClass('popbox-processed')) { + $body.addClass('popbox-processed'); + $(document).bind('keydown', Drupal.popbox.keyHandle); + + // If we are on the status report page, run the selector test and report the result. + status = 'admin/reports/status'; + current = window.location.href; + if (current.substring(current.length - status.length) === status) { + Drupal.popbox.testContentSelector(); + } + } + + Drupal.popbox.attach(context, '.popbox', {noUpdate: true}); + // Only attach to confirmation if content selector is correct for theme. + if ($(Drupal.popbox.contentSelector).length === 1) { + Drupal.popbox.attach(context, '.popbox-confirm', {reloadWhenDone: true}); // whole page reload. + Drupal.popbox.attachToForm(context, {}); + } + } +}; + +/** + * Attach the popbox behavior to a particular link. + * + * @param selector + * jQuery selector for links to attach popbox behavior to. + * @param options + * Hash of options associated with these links. + */ +Drupal.popbox.attach = function(context, selector, options) { + $(selector, context).not('.popbox-processed').each(function() { + var $element = $(this); + // Tag the element as attached, so it is not processed again. + $element.addClass('popbox-processed'); + + // Append note to link title (will show on hover). + var title = $element.attr('title') || ''; + $element.attr('title', title + Drupal.t('[popbox]')); + + // Attach the on-click popbox behavior to the element. + $element.click(function(e){ + return Drupal.popbox.openPath(this, options); + }); + }); +}; + +Drupal.popbox.attachToForm = function(context, options) { + $('form input.popbox-form-confirm', context).parents('form').not('.popbox-processed').each(function() { + $form = $(this); + // Tag the form as attached, so it is not processed again. + $form.addClass('popbox-processed'); + + // Attach ajaxForm submission to form. + $form.ajaxForm({ + success: function(response, status) { + $title = $(Drupal.popbox.titleSelector, response); + $content = $(Drupal.popbox.contentSelector, response); + Drupal.popbox.showPopbox($title.html(), $content.html(), null, options.width); + } + }); + + // If submit button is NOT the popbox button, remove the ajaxForm submit. + // We need to do it this way so the submit button value is submitted with rest of form. + $('input:submit', $form).not('.popbox-form-confirm').click(function(e){ + $form.ajaxFormUnbind(); + }); + }); +}; + +/** + * Generic dialog builder. + * Add a popbox to the page. + */ +Drupal.popbox.showPopbox = function(title, body, buttons, width) { + Drupal.popbox.addOverlay(); + var $popbox = $(Drupal.theme('popboxDialog', title, body, buttons)); + // Start with dialog off the side. Hiding it with display:none causes flash in FF2. + $popbox.css('left', '-9999px'); + if (width) { + $popbox.css('width', width); + } + $('body').append($popbox); // Add the popbox to the DOM. + + // Adding button functions + if (buttons) { + jQuery.each(buttons, function (id, button) { + $('#'+id).click(button.func); + }); + } + $('#popbox-close').click(Drupal.popbox.close); + $('.popbox-close').click(function(){Drupal.popbox.close(); return false;}); + + // center on the screen, adding in offsets if the window has been scrolled + var popboxWidth = $popbox.width(); + var windowWidth = $(window).width(); + var left = (windowWidth / 2) - (popboxWidth / 2) + Drupal.popbox.scrollLeft(); + + // Get popbox's height on the page. + // Need to do it this way, since we get visible flash in FF2 if popbox is not visible! + var popboxHeight = $popbox.height(); + var windowHeight = $(window).height(); + if (popboxHeight > (0.9 * windowHeight) ) { // Must fit in 90% of window. + popboxHeight = 0.9 * windowHeight; + $popbox.height(popboxHeight); + } + var top = (windowHeight / 2) - (popboxHeight / 2) + Drupal.popbox.scrollTop(); + + $popbox.css('top', top).css('left', left); // Position the popbox to be visible. + + // Focus on the first input element in the popbox window. + this.refocus(); + + // Remove the loading image. + Drupal.popbox.removeLoading(); + + return false; +}; + +Drupal.popbox.removePopbox = function() { + $('#popbox').remove(); +}; + +/** + * Use Ajax to open the URL inside a popbox window. + * + * @param element + * Element that was clicked to open the popbox. + * @param options + * Hash of options controlling how the popbox interacts with the underlying page. + */ +Drupal.popbox.openPath = function(element, options) { + // let the user know something is happening + $('body').css("cursor", "wait"); + + Drupal.popbox.addOverlay(); + Drupal.popbox.addLoading(); + + var href = options.href ? options.href : element.href; + $(document).trigger('popbox_open_path', [element, href]); // Broadcast popbox Open Path event. + + ajaxOptions = { + url: href, + success: function(page) { + $title = $(Drupal.popbox.titleSelector, page); + $content = $(Drupal.popbox.contentSelector, page); + Drupal.popbox.showPopbox($title.html(), $content.html(), null, options.width); + }, + complete: function() { + $('body').css("cursor", "auto"); // Return the cursor to normal state. + }, + error: function() { + Drupal.popbox.message("Unable to open: " + href); + } + }; + $.ajax(ajaxOptions); + + return false; +}; + +/** + * Simple popbox that functions like the browser's alert box. + */ +Drupal.popbox.message = function(title, message) { + message = message || ''; + var buttons = { + 'popbox_ok': {title: Drupal.t('OK'), func: Drupal.popbox.close} + }; + Drupal.popbox.showPopbox(title, message, buttons); +}; + +/** + * Handle any special keys when popbox is active. + */ +Drupal.popbox.keyHandle = function(e) { + if (!e) { + e = window.event; + } + if (e.keyCode === 27) { // esc + Drupal.popbox.close(); + } +}; + +Drupal.popbox.addOverlay = function() { + var $overlay = $('#popbox-overlay'); + if ($overlay.length === 0) { // Overlay does not already exist, so create it. + $overlay = $(Drupal.theme('popboxOverlay')); + $overlay.css('opacity', '0.4'); // for ie6(?) + // Doing absolute positioning, so make overlay's size equal the entire body. + $doc = $(document); + $overlay.width($doc.width()).height($doc.height()); + $overlay.click(Drupal.popbox.close); + $('body').prepend($overlay); + } +}; + +Drupal.popbox.removeOverlay = function() { + $('#popbox-overlay').remove(); +}; + +Drupal.popbox.addLoading = function() { + var $loading = $('#popbox-loading'); + if ($loading.length === 0) { // Loading graphic does not already exist, so create it. + $loading = $(Drupal.theme('popboxLoading')); + $('body').prepend($loading); // Loading div is initially display:none. + var width = $loading.width(); + var height = $loading.height(); + var left = ($(window).width() / 2) - (width / 2) + Drupal.popbox.scrollLeft(); + var top = ($(window).height() / 2) - (height / 2) + Drupal.popbox.scrollTop(); + $loading.css({'top': top, 'left': left, 'display': 'block'}); // Center it and make it visible. + } +}; + +Drupal.popbox.removeLoading = function() { + $('#popbox-loading').remove(); +}; + +/** + * Remove everything. + */ +Drupal.popbox.close = function() { + Drupal.popbox.removePopbox(); + Drupal.popbox.removeLoading(); + Drupal.popbox.removeOverlay(); + return false; +}; + +/** + * Set the focus on the popbox to the first visible form element, + * or the close link if there are no visible form elements. + */ +Drupal.popbox.refocus = function() { + $focus = $('#popbox :input:visible:enabled:first'); + if ($focus.length === 0) { + $focus = $('#popbox-close a'); + } + $focus.focus(); +}; + +/** + * Get current position of the left side of the browser window. + * Copied from jQuery offset. + */ +Drupal.popbox.scrollLeft = function() { + return Math.max(document.documentElement.scrollLeft, document.body.scrollLeft); +}; + +/** + * Get current position of the top of the browser window. + * Copied from jQuery offset. + */ +Drupal.popbox.scrollTop = function() { + return Math.max(document.documentElement.scrollTop, document.body.scrollTop); +}; + +/** + * Warn the user if ajax will not work with the current theme. + */ +Drupal.popbox.testContentSelector = function() { + var body = ''; + if ($(Drupal.popbox.titleSelector).length !== 1) { + body += Drupal.t('The page title must be wrapped in an element with id') + ' = "' + Drupal.popbox.titleSelector + '".';
+ loading += '