diff --git a/css/modal.css b/css/modal.css index 508b044e98416e174f17e7605a87850efcb3ae90..932fa4208f39b7d94ad18e3aa45ce5f68a7a5ddf 100644 --- a/css/modal.css +++ b/css/modal.css @@ -7,7 +7,7 @@ div.ctools-modal-content { border: 1px solid #000; width: 600px; text-align: left; -} +} div.ctools-modal-content .modal-title { font-size: 120%; @@ -37,11 +37,6 @@ div.ctools-modal-content .modal-content { div.ctools-modal-content .modal-form { } -div.ctools-modal-content .form-checkboxes .form-item { - float: left; - width: 24%; -} - div.ctools-modal-content a.close { color: white; } @@ -56,8 +51,6 @@ div.ctools-modal-content a.close img { } div.ctools-modal-content .modal-content .modal-throbber-wrapper { - width: 575px; - height: 400px; text-align: center; } diff --git a/help/ctools.help.ini b/help/ctools.help.ini index c0c13ddbfaf99da203a18db17b9e6b1ac326c7e7..8c9abcd43e0d1706ce074b7a1f9bc05c4667b3ad 100644 --- a/help/ctools.help.ini +++ b/help/ctools.help.ini @@ -26,6 +26,10 @@ parent = context title = Relationship plugins parent = context +[context-content] +title = Content plugins +parent = context + [css] title = CSS scrubbing and caching tool diff --git a/includes/context.theme.inc b/includes/context.theme.inc index f6cd117a3832d7dca9d282f667d22423aabaa696..25c194a8500e482c406f8f2aa10f7436d64df390 100644 --- a/includes/context.theme.inc +++ b/includes/context.theme.inc @@ -6,6 +6,9 @@ * Contains theme registry and theme implementations for the context tool. */ +/** + * Implementation of hook_theme() + */ function ctools_context_theme(&$theme) { $theme['ctools_context_list'] = array( 'arguments' => array('object'), diff --git a/js/modal.js b/js/modal.js index f5260a61c09616d87e6a16f0a5af3218c189f2e0..b3c6cd875274ddd537069a81a2f152bc12038dca 100644 --- a/js/modal.js +++ b/js/modal.js @@ -22,6 +22,14 @@ Drupal.CTools.Modal.show = function() { } $('span.modal-title', Drupal.CTools.Modal.modal).html(Drupal.t('Loading...')); + $('div.ctools-modal-content', Drupal.CTools.Modal.modal).css({ + 'width': $(window).width() * .8 + 'px', + 'height': $(window).height() * .8 + 'px' + }); + $('div.ctools-modal-content .modal-content', Drupal.CTools.Modal.modal).css({ + 'width': ($(window).width() * .8 - 25) + 'px', + 'height': ($(window).height() * .8 - 22) + 'px' + }); Drupal.CTools.Modal.modal.modalContent({ // @todo this should be elsewhere. opacity: '.40',