Index: contrib/views_slideshow_cycle/views_slideshow_cycle.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.module,v retrieving revision 1.1.2.11.2.2 diff -u -p -r1.1.2.11.2.2 views_slideshow_cycle.module --- contrib/views_slideshow_cycle/views_slideshow_cycle.module 1 Jan 2011 01:20:21 -0000 1.1.2.11.2.2 +++ contrib/views_slideshow_cycle/views_slideshow_cycle.module 8 Jan 2011 00:01:05 -0000 @@ -20,17 +20,19 @@ function views_slideshow_cycle_init() { } } - $module_path = drupal_get_path('module', 'views_slideshow_cycle'); + // Set location of the libraries directory. + $libraries_path = 'sites/all/libraries'; // Otherwise, we'll add the version included with this module. - if (!$js && file_exists($module_path . '/js/jquery.cycle.all.min.js')) { - drupal_add_js($module_path . '/js/jquery.cycle.all.min.js'); + if (!$js && file_exists($libraries_path . '/jquery.cycle/jquery.cycle.all.min.js')) { + drupal_add_js($libraries_path . '/jquery.cycle/jquery.cycle.all.min.js'); } - if (file_exists($module_path . '/js/json2.js')) { - drupal_add_js($module_path . '/js/json2.js'); + if (file_exists($libraries_path . '/json2/json2.js')) { + drupal_add_js($libraries_path . '/json2/json2.js'); } + $module_path = drupal_get_path('module', 'views_slideshow_cycle'); drupal_add_js($module_path . '/js/views_slideshow_cycle.js'); drupal_add_css($module_path . '/views_slideshow_cycle.css', 'module'); Index: contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.views_slideshow.inc,v retrieving revision 1.1.2.17.2.2 diff -u -p -r1.1.2.17.2.2 views_slideshow_cycle.views_slideshow.inc --- contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc 7 Jan 2011 07:48:59 -0000 1.1.2.17.2.2 +++ contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc 8 Jan 2011 00:01:05 -0000 @@ -53,9 +53,9 @@ function views_slideshow_cycle_views_sli function views_slideshow_cycle_views_slideshow_slideshow_type_form(&$form, &$form_state, &$view) { - if (!file_exists(drupal_get_path('module', 'views_slideshow_cycle') . '/js/jquery.cycle.all.min.js')) { + if (!file_exists('sites/all/libraries/jquery.cycle/jquery.cycle.all.min.js')) { $form['views_slideshow_cycle']['no_cycle_js'] = array( - '#markup' => '
' . t('You need to download jQuery cycle plugin and copy jquery.cycle.all.min.js to views_slideshow/contrib/views_slideshow_cycle/js You can find the module at !url.', array('!url' => l('http://malsup.com/jquery/cycle', 'http://malsup.com/jquery/cycle', array('attributes' => array('target' => '_blank'))))) . '
', + '#markup' => '
' . t('You need to download jQuery cycle plugin and copy jquery.cycle.all.min.js to sites/all/libraries/jquery.cycle You can find the plugin at !url.', array('!url' => l('http://malsup.com/jquery/cycle', 'http://malsup.com/jquery/cycle', array('attributes' => array('target' => '_blank'))))) . '
', ); } @@ -330,9 +330,9 @@ function views_slideshow_cycle_views_sli '#markup' => '

' . t('jQuery Cycle Custom Options') . '

', ); - if (!file_exists(drupal_get_path('module', 'views_slideshow_cycle') . '/js/json2.js')) { + if (!file_exists('sites/all/libraries/json2/json2.js')) { $form['views_slideshow_cycle']['no_json_js'] = array( - '#markup' => '
' . t('To use the advanced options you need to download json2.js. You can do this by clicking the download button at !url and extract json2.js to views_slideshow/contrib/views_slideshow_cycle/js', array('!url' => l('https://github.com/douglascrockford/JSON-js', 'https://github.com/douglascrockford/JSON-js', array('attributes' => array('target' => '_blank'))))) . '
', + '#markup' => '
' . t('To use the advanced options you need to download json2.js. You can do this by clicking the download button at !url and extract json2.js to sites/all/libraries/json2', array('!url' => l('https://github.com/douglascrockford/JSON-js', 'https://github.com/douglascrockford/JSON-js', array('attributes' => array('target' => '_blank'))))) . '
', ); } else {