Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/shadowbox/INSTALL.txt,v retrieving revision 1.3.2.4.2.5.2.9 diff -u -p -r1.3.2.4.2.5.2.9 INSTALL.txt --- INSTALL.txt 7 Jan 2010 18:56:46 -0000 1.3.2.4.2.5.2.9 +++ INSTALL.txt 24 Feb 2010 18:14:06 -0000 @@ -10,7 +10,7 @@ INSTALLATION [2] http://drupal.org/project/drush 2. Download Shadowbox 3.0 from http://www.shadowbox-js.com/download.html. - Both build and source versions work fine. + Simply customize it to your needs, jQuery is suggested as the adapter, since it is included in Drupal. 3. Extract the download and place it in sites/all/libraries so you have, for example: sites/all/libraries/shadowbox @@ -28,10 +28,10 @@ drush dl shadowbox drush enable shadowbox mkdir sites/all/libraries cd sites/all/libraries -wget http://freestylesystems.co.uk/sites/freestylesystems.co.uk/files/shadowbox-build-3.0rc1.tgz -tar xf shadowbox-build-3.0rc1.tgz -rm shadowbox-build-3.0rc1.tgz -mv shadowbox-build-3.0rc1 shadowbox +wget http://freestylesystems.co.uk/sites/freestylesystems.co.uk/files/shadowbox-3.0.2.tgz +tar xf shadowbox-3.0.2.tgz +rm shadowbox-3.0.2.tgz +mv shadowbox-3.0.2 shadowbox OPTIONAL Index: shadowbox.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/shadowbox/Attic/shadowbox.admin.inc,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 shadowbox.admin.inc --- shadowbox.admin.inc 3 Jan 2010 22:52:15 -0000 1.1.2.8 +++ shadowbox.admin.inc 24 Feb 2010 18:14:07 -0000 @@ -58,77 +58,6 @@ function shadowbox_global_settings() { '#description' => t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page. If the PHP-mode is chosen, enter PHP code between php tags. Note that executing incorrect PHP-code can break your Drupal site.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '')), ); - // Supported media - $form['shadowbox']['shadowbox_supported_media'] = array( - '#type' => 'fieldset', - '#title' => t('Supported media'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $columns = array('width' => 10); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_images'] = array( - '#type' => 'checkboxes', - '#title' => t('Image'), - '#description' => t('Supported image file extensions.'), - '#options' => drupal_map_assoc(shadowbox_get_types('image')), - '#default_value' => variable_get('shadowbox_supported_images', shadowbox_get_types('image')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_swf'] = array( - '#type' => 'checkboxes', - '#title' => t('SWF'), - '#description' => t('Supported SWF file extensions.'), - '#options' => drupal_map_assoc(shadowbox_get_types('swf')), - '#default_value' => variable_get('shadowbox_supported_swf', array('swf')), - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_flv'] = array( - '#type' => 'checkboxes', - '#title' => t('FLV'), - '#description' => t('Supported FLV file extensions. MP4 and MOV can be opened in the FLV Player rather than Quicktime if desired. Options checked here will override those from Quicktime.'), - '#options' => drupal_map_assoc(shadowbox_get_types('flv')), - '#default_value' => variable_get('shadowbox_supported_flv', array('flv')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_quicktime'] = array( - '#type' => 'checkboxes', - '#title' => t('Quicktime'), - '#description' => t('Movie file extensions supported by QuickTime.'), - '#options' => drupal_map_assoc(shadowbox_get_types('quicktime')), - '#default_value' => variable_get('shadowbox_supported_quicktime', shadowbox_get_types('quicktime')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_wmp'] = array( - '#type' => 'checkboxes', - '#title' => t('Windows Media Player'), - '#description' => t('Movie file extensions supported by Windows Media Player.'), - '#options' => drupal_map_assoc(shadowbox_get_types('wmp')), - '#default_value' => variable_get('shadowbox_supported_wmp', shadowbox_get_types('wmp')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_qtwmp'] = array( - '#type' => 'checkboxes', - '#title' => t('Quicktime and Windows Media Player'), - '#description' => t('Movie file extensions supported by both QuickTime and Windows Media Player.'), - '#options' => drupal_map_assoc(shadowbox_get_types('qtwmp')), - '#default_value' => variable_get('shadowbox_supported_qtwmp', shadowbox_get_types('qtwmp')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - $form['shadowbox']['shadowbox_supported_media']['shadowbox_supported_iframe'] = array( - '#type' => 'checkboxes', - '#title' => t('IFrame'), - '#description' => t('File extensions that will be display in an iframe'), - '#options' => drupal_map_assoc(shadowbox_get_types('iframe')), - '#default_value' => variable_get('shadowbox_supported_iframe', array('asp', 'aspx', 'cgi', 'cfm', 'htm', 'html', 'pl', 'php', 'php3', 'php4', 'php5', 'phtml', 'rb', 'rhtml', 'shtml', 'vbs')), - '#checkall' => TRUE, - '#multicolumn' => $columns, - ); - // Options $form['shadowbox']['shadowbox_options'] = array( '#type' => 'fieldset', Index: shadowbox.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/shadowbox/shadowbox.install,v retrieving revision 1.1.2.5.2.3.2.6 diff -u -p -r1.1.2.5.2.3.2.6 shadowbox.install --- shadowbox.install 3 Jan 2010 22:52:15 -0000 1.1.2.5.2.3.2.6 +++ shadowbox.install 24 Feb 2010 18:14:07 -0000 @@ -41,13 +41,12 @@ function shadowbox_requirements($phase) 'value' => $t('Third party !shadowbox software missing', array('!shadowbox' => l('Shadowbox', $shadowbox_site))), ); } - elseif (!file_exists("$path/shadowbox.js") || !file_exists("$path/adapters/shadowbox-jquery.js")) { + elseif (!file_exists("$path/shadowbox.js")) { $requirements['shadowbox'] = array( 'title' => $t('Shadowbox'), - 'description' => $t('The %path path exists but it appears that the directory structure underneath is incorrect. Please check that %shadowbox and %jquery exist.', + 'description' => $t('The %path path exists but it appears that the directory structure underneath is incorrect. Please check that %shadowbox exists.', array('%path' => $path, '%shadowbox' => "$path/shadowbox.js", - '%jquery' => "$path/adapters/shadowbox-jquery.js", )), 'severity' => $phase == 'install' ? REQUIREMENT_WARNING : REQUIREMENT_ERROR, 'value' => $t('3rd party Shadowbox software not properly installed'), Index: shadowbox.make =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/shadowbox/Attic/shadowbox.make,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 shadowbox.make --- shadowbox.make 10 Dec 2009 13:41:57 -0000 1.1.2.3 +++ shadowbox.make 24 Feb 2010 18:14:07 -0000 @@ -5,5 +5,5 @@ core = 6.x libraries[shadowbox][download][type] = "get" -libraries[shadowbox][download][url] = "http://freestylesystems.co.uk/sites/freestylesystems.co.uk/files/shadowbox-build-3.0rc1.tgz" +libraries[shadowbox][download][url] = "http://freestylesystems.co.uk/sites/freestylesystems.co.uk/files/shadowbox-build-3.0.2.tgz" libraries[shadowbox][directory_name] = "shadowbox" Index: shadowbox.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/shadowbox/shadowbox.module,v retrieving revision 1.1.2.12.2.28.2.26 diff -u -p -r1.1.2.12.2.28.2.26 shadowbox.module --- shadowbox.module 26 Jan 2010 15:58:41 -0000 1.1.2.12.2.28.2.26 +++ shadowbox.module 24 Feb 2010 18:14:07 -0000 @@ -353,42 +353,10 @@ function shadowbox_construct_header() { if (shadowbox_active() && variable_get('shadowbox_enabled', TRUE)) { // Add the base files. shadowbox_library_add_js('shadowbox.js'); - shadowbox_library_add_js('adapters/shadowbox-jquery.js'); shadowbox_library_add_css('shadowbox.css'); $shadowbox_location = variable_get('shadowbox_location', SHADOWBOX_DEFAULT_PATH); - // Add the language file. - $language_file = "${shadowbox_location}/languages/shadowbox-$language->language.js"; - if (file_exists($language_file)) { - drupal_add_js($language_file); - } - else { - // If a language file doesn't exist, default to English. - shadowbox_library_add_js('languages/shadowbox-en.js'); - } - - // Add the "player" files. - if (shadowbox_media_support('images')) { - shadowbox_library_add_js('players/shadowbox-img.js'); - } - if (shadowbox_media_support('swf')) { - shadowbox_library_add_js('players/shadowbox-swf.js'); - } - if (shadowbox_media_support('flv')) { - shadowbox_library_add_js('players/shadowbox-flv.js'); - } - if (shadowbox_media_support('quicktime')) { - shadowbox_library_add_js('players/shadowbox-qt.js'); - } - if (shadowbox_media_support('wmp') || shadowbox_media_support('qtwmp')) { - shadowbox_library_add_js('players/shadowbox-wmp.js'); - } - if (shadowbox_media_support('iframe')) { - shadowbox_library_add_js('players/shadowbox-html.js'); - shadowbox_library_add_js('players/shadowbox-iframe.js'); - } - // Print the JavaScript settings to the page. drupal_add_js(shadowbox_get_settings(), 'setting'); @@ -405,15 +373,6 @@ function shadowbox_construct_header() { } } -function shadowbox_media_support($type) { - $types = variable_get("shadowbox_supported_$type", shadowbox_get_types($type)); - if (is_null($types)) { - $types = array(); - } - $types = array_filter($types); - return !empty($types); -} - function shadowbox_add_css($file) { drupal_add_css(drupal_get_path('module', 'shadowbox') . '/' . $file); } @@ -442,27 +401,6 @@ function shadowbox_library_add_css($file function shadowbox_get_settings($override = array()) { global $language; - $players = array(); - if (shadowbox_media_support('images')) { - $players[] = 'img'; - } - if (shadowbox_media_support('swf')) { - $players[] = 'swf'; - } - if (shadowbox_media_support('flv')) { - $players[] = 'flv'; - } - if (shadowbox_media_support('quicktime')) { - $players[] = 'qt'; - } - if (shadowbox_media_support('wmp') || shadowbox_media_support('qtwmp')) { - $players[] = 'wmp'; - } - if (shadowbox_media_support('iframe')) { - $players[] = 'html'; - $players[] = 'iframe'; - } - $settings = array( 'animate' => variable_get('shadowbox_animate', TRUE), 'animateFade' => variable_get('shadowbox_animate_fade', TRUE),