';
+ loading += '
';
+ loading += '
';
+ loading += '' . l(t('More information about formatting options'), 'filter/tips') . '
'; + drupal_add_popup(); + return '' . l(t('More information about formatting options'), 'filter/tips', array('attributes' => array('class' => 'popup'))) . '
'; } /** 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 15 Feb 2009 06:03:53 -0000 @@ -14,7 +14,8 @@ * @see filter_admin_overview_submit() */ function filter_admin_overview() { - + drupal_add_popup(); + // 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' => 'popup-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 15 Feb 2009 06:03:55 -0000 @@ -60,6 +60,7 @@ * Recursive helper function for menu_overview_form(). */ function _menu_overview_tree_form($tree) { + drupal_add_popup(); 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' => 'popup-confirm'))); } // Set the reset column. elseif ($item['module'] == 'system' && $item['customized']) { Index: modules/node/content_types.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v retrieving revision 1.64 diff -u -r1.64 content_types.inc --- modules/node/content_types.inc 26 Jan 2009 14:08:43 -0000 1.64 +++ modules/node/content_types.inc 15 Feb 2009 06:03:55 -0000 @@ -10,6 +10,7 @@ * Displays the content type admin overview page. */ function node_overview_types() { + drupal_add_popup(); $types = node_get_types(); $names = node_get_types('names'); $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => '2')); @@ -25,7 +26,7 @@ // Set the delete column. if ($type->custom) { - $row[] = array('data' => l(t('delete'), 'admin/build/node-type/' . $type_url_str . '/delete')); + $row[] = array('data' => l(t('delete'), 'admin/build/node-type/' . $type_url_str . '/delete', array('attributes' => array('class' => 'popup-confirm')))); } else { $row[] = array('data' => ''); Index: modules/system/popup.tpl.php =================================================================== RCS file: modules/system/popup.tpl.php diff -N modules/system/popup.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/popup.tpl.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,16 @@ + + Index: misc/popup.js =================================================================== RCS file: misc/popup.js diff -N misc/popup.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/popup.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,310 @@ +// $Id$ + +/** + * Popup Modal Dialog API + * + * Provide an API for building and displaying JavaScript, in-page, popup modal dialogs (lightbox style). + * Modality is provided by a fixed, semi-opaque div, positioned in front of the page contents. + * + * Popups xhtml is themeable, but the outter most element must have id="popup". + */ + +/** + * Create the popup object/namespace. + */ +Drupal.popup = function() {}; +Drupal.popup.contentSelector = '#content-content'; // The theme must wrap it's page content. +Drupal.popup.titleSelector = '#page-title'; // The theme must wrap it's page title. + +/** + * Attach the popup behavior to the all the requested links on the page. + * + * @param context + * The jQuery object to apply the behaviors to. + */ +Drupal.behaviors.popup = { + attach: function(context) { + // Add keybinding to close popup. + var $body = $('body'); + if(!$body.hasClass('popup-processed')) { + $body.addClass('popup-processed'); + $(document).bind('keydown', Drupal.popup.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.popup.testContentSelector(); + } + } + + Drupal.popup.attach(context, '.popup', {noUpdate: true}); + // Only attach to confirmation if content selector is correct for theme. + if ($(Drupal.popup.contentSelector).length === 1) { + Drupal.popup.attach(context, '.popup-confirm', {reloadWhenDone: true}); // whole page reload. + } + } +}; + +/** + * Attach the popup behavior to a particular link. + * + * @param selector + * jQuery selector for links to attach popup behavior to. + * @param options + * Hash of options associated with these links. + */ +Drupal.popup.attach = function(context, selector, options) { + $(selector, context).not('.popup-processed').each(function() { + var $element = $(this); + // Tag the element as attached, so it is not processed again. + $element.addClass('popup-processed'); + + // Append note to link title (will show on hover). + var title = $element.attr('title') || ''; + $element.attr('title', title + Drupal.t('[Popup]')); + + // Attach the on-click popup behavior to the element. + $element.click(function(e){ + var element = this; + + // If element is inside of a #popup div, show alert and bail out. + if ($(element).parents('#popup').length) { + alert("Sorry, popup-in-popup is not supported (yet)."); + return false; + } + + return Drupal.popup.openPath(element, options); + }); + }); +}; + + +/** + * Generic dialog builder. + * Add a popup to the page. + */ +Drupal.popup.showPopup = function(title, body, buttons, width) { + Drupal.popup.addOverlay(); + var $popup = $(Drupal.theme('popupDialog', title, body, buttons)); + // Start with dialog off the side. Hiding it with display:none causes flash in FF2. + $popup.css('left', '-9999px'); + if (width) { + $popup.css('width', width); + } + $('body').append($popup); // Add the popup to the DOM. + + // Adding button functions + if (buttons) { + jQuery.each(buttons, function (id, button) { + $('#'+id).click(button.func); + }); + } + $('#popup-close').click(Drupal.popup.close); + $('.popup-close').click(function(){Drupal.popup.close(); return false;}); + + // center on the screen, adding in offsets if the window has been scrolled + var popupWidth = $popup.width(); + var windowWidth = $(window).width(); + var left = (windowWidth / 2) - (popupWidth / 2) + Drupal.popup.scrollLeft(); + + // Get popup's height on the page. + // Need to do it this way, since we get visible flash in FF2 if popup is not visible! + var popupHeight = $popup.height(); + var windowHeight = $(window).height(); + if (popupHeight > (0.9 * windowHeight) ) { // Must fit in 90% of window. + popupHeight = 0.9 * windowHeight; + $popup.height(popupHeight); + } + var top = (windowHeight / 2) - (popupHeight / 2) + Drupal.popup.scrollTop(); + + $popup.css('top', top).css('left', left); // Position the popup to be visible. + + this.refocus(); // TODO: capture the focus when it leaves the dialog. + Drupal.popup.removeLoading(); // Remove the loading img. + + return false; +}; + +Drupal.popup.removePopup = function() { + $('#popup').remove(); +}; + +/** + * Use Ajax to open the URL inside a popup window. + * + * @param element + * Element that was clicked to open the popup. + * @param options + * Hash of options controlling how the popup interacts with the underlying page. + */ +Drupal.popup.openPath = function(element, options) { + // let the user know something is happening + $('body').css("cursor", "wait"); + + Drupal.popup.addOverlay(); + Drupal.popup.addLoading(); + + var href = options.href ? options.href : element.href; + $(document).trigger('popup_open_path', [element, href]); // Broadcast Popup Open Path event. + + ajaxOptions = { + url: href, + success: function(page) { + $title = $(Drupal.popup.titleSelector, page); + $content = $(Drupal.popup.contentSelector, page); + Drupal.popup.showPopup($title.html(), $content.html(), null, options.width); + }, + complete: function() { + $('body').css("cursor", "auto"); // Return the cursor to normal state. + }, + error: function() { + Drupal.popup.message("Unable to open: " + href); + } + }; + $.ajax(ajaxOptions); + + return false; +}; + +/** + * Simple popup that functions like the browser's alert box. + */ +Drupal.popup.message = function(title, message) { + message = message || ''; + var buttons = { + 'popup_ok': {title: Drupal.t('OK'), func: Drupal.popup.close} + }; + Drupal.popup.showPopup(title, message, buttons); +}; + +/** + * Handle any special keys when popup is active. + */ +Drupal.popup.keyHandle = function(e) { + if (!e) { + e = window.event; + } + if (e.keyCode === 27) { // esc + Drupal.popup.close(); + } +}; + +Drupal.popup.addOverlay = function() { + var $overlay = $('#popup-overlay'); + if ($overlay.length === 0) { // Overlay does not already exist, so create it. + $overlay = $(Drupal.theme('popupOverlay')); + $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.popup.close); + $('body').prepend($overlay); + } +}; + +Drupal.popup.removeOverlay = function() { + $('#popup-overlay').remove(); +}; + +Drupal.popup.addLoading = function() { + var $loading = $('#popup-loading'); + if ($loading.length === 0) { // Loading graphic does not already exist, so create it. + var waitImageSize = 100; + var left = ($(window).width() / 2) - (waitImageSize / 2) + Drupal.popup.scrollLeft(); + var top = ($(window).height() / 2) - (waitImageSize / 2) + Drupal.popup.scrollTop(); + $loading = $( Drupal.theme('popupLoading', left, top) ); + $('body').prepend($loading); + } +}; + +Drupal.popup.removeLoading = function() { + $('#popup-loading').remove(); +}; + +/** + * Remove everything. + */ +Drupal.popup.close = function() { + Drupal.popup.removePopup(); + Drupal.popup.removeLoading(); + Drupal.popup.removeOverlay(); + return false; +}; + +/** + * Set the focus on the popup to the first visible form element, + * or the close link if there are no visible form elements. + */ +Drupal.popup.refocus = function() { + $focus = $('#popup input:visible:eq(0)'); + if ($focus.length === 0) { + $focus = $('#popup-close a'); + } + $focus.focus(); +}; + +/** + * Get current position of the left side of the browser window. + * Copied from jQuery offset. + */ +Drupal.popup.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.popup.scrollTop = function() { + return Math.max(document.documentElement.scrollTop, document.body.scrollTop); +}; + +/** + * Warn the user if ajax will not work with the current theme. + */ +Drupal.popup.testContentSelector = function() { + var body = ''; + if ($(Drupal.popup.titleSelector).length !== 1) { + body += Drupal.t('The page title must be wrapped in an element with id') + ' = "' + Drupal.popup.titleSelector + '".';
+ loading += '