? 215927-improve-exposed-form-in-block.patch ? 696402-context-node-form.patch ? 713526-panels-stacked-tpl-conditions.patch ? 718368-ignore-query-string.patch ? 812744-query-string-still-there.patch ? 827310-hide-disabled-comments.patch ? 848580-wysiwyg-works.patch ? 853368-field-override-broken.patch ? 865428-post-comment.patch ? 867898-clone-edited-item.patch ? 868410-ie-opacity-fix.patch ? 870820.patch ? 872072-customize-modal-rerolled_1.patch ? 872072-customize-modal.patch ? 873216-broken-stylizer-borders.patch ? 876988-stop-rendering-during-editing.patch ? TODO.txt ? auto-guess-type-ajax-element.patch ? comment_links_8.patch ? ctools-853114-docs.patch ? ctools-862320.patch ? ctools-ajax-redirect-with-delayed-optional-check-for-positive-delay.patch ? ctools-ajax-responder.js-imce-compat.patch ? ctools-custom_content.patch ? ctools-no-base-types-1.patch ? ctools-object-cache.inc-session-handling_0.patch ? ctools_ahah_callback_rebuilds_831922.patch ? ctools_ajax_sample ? ctools_node_build_modes_views_style_0.patch ? export_ui_revert_path.patch ? flexible_css_1.patch ? views-dimensions.js_.patch ? help/stylizer.html Index: css/modal.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/css/modal.css,v retrieving revision 1.6.2.2 diff -u -p -r1.6.2.2 modal.css --- css/modal.css 9 Jul 2010 01:02:24 -0000 1.6.2.2 +++ css/modal.css 19 Aug 2010 23:15:58 -0000 @@ -30,8 +30,6 @@ div.ctools-modal-content .modal-header a div.ctools-modal-content .modal-content { padding: 1em 1em 0 1em; overflow: auto; - width: 575px; - height: 400px; } div.ctools-modal-content .modal-form { Index: includes/modal.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/modal.inc,v retrieving revision 1.7.2.3 diff -u -p -r1.7.2.3 modal.inc --- includes/modal.inc 16 Jun 2010 17:32:30 -0000 1.7.2.3 +++ includes/modal.inc 19 Aug 2010 23:15:59 -0000 @@ -48,17 +48,17 @@ function ctools_modal_add_js() { return; } - $settings = array('CToolsModal' => array( - 'closeText' => t('Close Window'), - 'closeImage' => theme('image', ctools_image_path('icon-close-window.png'), t('Close window'), t('Close window')), - 'throbber' => theme('image', ctools_image_path('throbber.gif'), t('Loading...'), t('Loading')), - 'backDropOpacity' => '.55', - 'backDropColor' => '#fff' - )); + $settings = array( + 'CToolsModal' => array( + 'loadingText' => t('Loading...'), + 'closeText' => t('Close Window'), + 'closeImage' => theme('image', ctools_image_path('icon-close-window.png'), t('Close window'), t('Close window')), + 'throbber' => theme('image', ctools_image_path('throbber.gif'), t('Loading...'), t('Loading')), + ), + ); drupal_add_js($settings, 'setting'); drupal_add_js('misc/jquery.form.js'); - ctools_add_js('dimensions'); ctools_add_js('mc'); ctools_add_js('ajax-responder'); ctools_add_js('modal'); Index: js/mc.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/js/mc.js,v retrieving revision 1.3.2.2 diff -u -p -r1.3.2.2 mc.js --- js/mc.js 5 Aug 2010 22:46:51 -0000 1.3.2.2 +++ js/mc.js 19 Aug 2010 23:16:00 -0000 @@ -59,10 +59,10 @@ // Get our dimensions // Get the docHeight and (ugly hack) add 50 pixels to make sure we dont have a *visible* border below our div - var docHeight = $(document).outerHeight() + 50; - var docWidth = $(document).innerWidth(); + var docHeight = $(document).height() + 50; + var docWidth = $(document).width(); var winHeight = $(window).height(); - var winWidth = $(window).innerWidth(); + var winWidth = $(window).width(); if( docHeight < winHeight ) docHeight = winHeight; // Create our divs @@ -122,8 +122,8 @@ // Move and resize the modalBackdrop and modalContent on resize of the window modalContentResize = function(){ // Get our heights - var docHeight = $(document).outerHeight(); - var docWidth = $(document).innerWidth(); + var docHeight = $(document).height(); + var docWidth = $(document).width(); var winHeight = $(window).height(); var winWidth = $(window).width(); if( docHeight < winHeight ) docHeight = winHeight; Index: js/modal.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/js/modal.js,v retrieving revision 1.17.2.15 diff -u -p -r1.17.2.15 modal.js --- js/modal.js 19 Aug 2010 20:35:03 -0000 1.17.2.15 +++ js/modal.js 19 Aug 2010 23:16:00 -0000 @@ -16,37 +16,84 @@ /** * Display the modal + * + * @todo -- document the settings. */ - Drupal.CTools.Modal.show = function() { + Drupal.CTools.Modal.show = function(choice) { + var settings = {}; + + if (choice && typeof choice == 'string' && Drupal.settings[choice]) { + // This notation guarantees we are actually copying it. + $.extend(true, settings, Drupal.settings[choice]); + } + else if (choice) { + $.extend(true, settings, choice); + } + + var defaults = { + modalTheme: 'CToolsModalDialog', + throbberTheme: 'CToolsModalThrobber', + animation: 'show', + animationSpeed: 'fast', + modalSize: { + type: 'scale', + width: .8, + height: .8, + addWidth: 0, + addHeight: 0, + // How much to remove from the inner content to make space for the + // theming. + contentRight: 25, + contentBottom: 45, + }, + modalOptions: { + opacity: .55, + background: '#fff' + } + }; + + $.extend(true, settings, Drupal.settings.CToolsModal, defaults); + + Drupal.CTools.Modal.currentSettings = settings; + var resize = function(e) { - // For reasons I do not understand, when creating the modal the context must be - // Drupal.CTools.Modal.modal but otherwise the context must be more than that. + // When creating the modal, it actually exists only in a theoretical + // place that is not in the DOM. But once the modal exists, it is in the + // DOM so the context must be set appropriately. var context = e ? document : Drupal.CTools.Modal.modal; + + if (settings.modalSize.type == 'scale') { + var width = $(window).width() * settings.modalSize.width; + var height = $(window).height() * settings.modalSize.height; + } + else { + var width = settings.modalSize.width; + var height = settings.modalSize.height; + } + + // Use the additionol pixels for creating the width and height. $('div.ctools-modal-content', context).css({ - 'width': $(window).width() * .8 + 'px', - 'height': $(window).height() * .8 + 'px' + 'width': width + settings.modalSize.addWidth + 'px', + 'height': height + settings.modalSize.addHeight + 'px' }); $('div.ctools-modal-content .modal-content', context).css({ - 'width': ($(window).width() * .8 - 25) + 'px', - 'height': ($(window).height() * .8 - 35) + 'px' + 'width': (width - settings.modalSize.contentRight) + 'px', + 'height': (height - settings.modalSize.contentBottom) + 'px' }); } if (!Drupal.CTools.Modal.modal) { - Drupal.CTools.Modal.modal = $(Drupal.theme('CToolsModalDialog')); - $(window).bind('resize', resize); + Drupal.CTools.Modal.modal = $(Drupal.theme(settings.modalTheme)); + if (settings.modalSize.type == 'scale') { + $(window).bind('resize', resize); + } } resize(); - $('span.modal-title', Drupal.CTools.Modal.modal).html(Drupal.t('Loading...')); - var opts = { - // @todo this should be elsewhere. - opacity: Drupal.settings.CToolsModal.backDropOpacity, - background: Drupal.settings.CToolsModal.backDropColor - }; - Drupal.CTools.Modal.modalContent(Drupal.CTools.Modal.modal, opts); - $('#modalContent .modal-content').html(Drupal.theme('CToolsModalThrobber')); + $('span.modal-title', Drupal.CTools.Modal.modal).html(Drupal.CTools.Modal.currentSettings.loadingText); + Drupal.CTools.Modal.modalContent(Drupal.CTools.Modal.modal, settings.modalOptions, settings.animation, settings.animationSpeed); + $('#modalContent .modal-content').html(Drupal.theme(settings.throbberTheme)); }; /** @@ -67,7 +114,7 @@ html += '
' // panels-modal-content html += '
'; html += ' '; - html += Drupal.settings.CToolsModal.closeText + Drupal.settings.CToolsModal.closeImage; + html += Drupal.CTools.Modal.currentSettings.closeText + Drupal.CTools.Modal.currentSettings.closeImage; html += ' '; html += '  '; html += '
'; @@ -86,7 +133,7 @@ var html = ''; html += ' '; @@ -94,10 +141,20 @@ }; /** + * Figure out what settings string to use to display a modal. + */ + Drupal.CTools.Modal.getSettings = function (object) { + var match = $(object).attr('class').match(/ctools-modal-(\S+)/); + if (match) { + return match[1]; + } + } + + /** * Click function for modals that can be cached. */ Drupal.CTools.Modal.clickAjaxCacheLink = function () { - Drupal.CTools.Modal.show(); + Drupal.CTools.Modal.show(Drupal.CTools.Modal.getSettings(this)); return Drupal.CTools.AJAX.clickAJAXCacheLink.apply(this); }; @@ -107,7 +164,7 @@ */ Drupal.CTools.Modal.clickAjaxLink = function () { // show the empty dialog right away. - Drupal.CTools.Modal.show(); + Drupal.CTools.Modal.show(Drupal.CTools.Modal.getSettings(this)); Drupal.CTools.AJAX.clickAJAXLink.apply(this); if (!$(this).hasClass('ctools-ajaxing')) { Drupal.CTools.Modal.dismiss(); @@ -125,7 +182,7 @@ return false; } - Drupal.CTools.Modal.show(); + Drupal.CTools.Modal.show(Drupal.CTools.Modal.getSettings(this)); Drupal.CTools.AJAX.clickAJAXButton.apply(this); if (!$(this).hasClass('ctools-ajaxing')) { Drupal.CTools.Modal.dismiss(); @@ -217,8 +274,8 @@ */ Drupal.CTools.AJAX.commands.modal_loading = function(command) { Drupal.CTools.AJAX.commands.modal_display({ - output: Drupal.theme('CToolsModalThrobber'), - title: Drupal.t('Loading...') + output: Drupal.theme(Drupal.CTools.Modal.currentSettings.throbberTheme), + title: Drupal.CTools.Modal.currentSettings.loadingText }); } })(jQuery);