? 817696-views_slideshow-d7.patch
? views_slideshow_817696.patch
Index: views_slideshow.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.info,v
retrieving revision 1.2.4.1
diff -u -p -r1.2.4.1 views_slideshow.info
--- views_slideshow.info	23 Feb 2010 22:35:07 -0000	1.2.4.1
+++ views_slideshow.info	14 Dec 2010 15:10:14 -0000
@@ -3,4 +3,8 @@ name = Views Slideshow
 description = Provides a View style that displays rows as a jQuery slideshow.
 dependencies[] = views
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_slideshow.module
+files[] = views_slideshow.theme.inc
+files[] = views_slideshow.views.inc
+files[] = views_slideshow_plugin_style_slideshow.inc
Index: views_slideshow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.module,v
retrieving revision 1.11.2.2.2.12.2.1
diff -u -p -r1.11.2.2.2.12.2.1 views_slideshow.module
--- views_slideshow.module	20 Apr 2010 22:04:17 -0000	1.11.2.2.2.12.2.1
+++ views_slideshow.module	14 Dec 2010 15:10:15 -0000
@@ -7,12 +7,12 @@
  */
 
 /**
- * Implement hook_theme().
+ * Implements hook_theme().
  */
 function views_slideshow_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_main_section' => array(
-      'arguments' => array('id' => NULL, 'hidden_elements' => NULL, 'plugin' => NULL),
+      'variables' => array('id' => NULL, 'hidden_elements' => NULL, 'plugin' => NULL),
       'file' => 'views_slideshow.theme.inc',
     ),
   );
@@ -51,5 +51,5 @@ function template_preprocess_views_slide
   if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'ddblock', 'slider'))) {
     $options['mode'] = 'views_slideshow_' . $options['mode'];
   }
-  $vars['slideshow'] = theme($options['mode'], $vars['view'], $options, $vars['rows'], $vars['title']);
+  $vars['slideshow'] = theme($options['mode'], array('view' => $vars['view'], 'options' => $options, 'rows' => $vars['rows'], 'title' => $vars['title']));
 }
Index: views_slideshow.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/Attic/views_slideshow.theme.inc,v
retrieving revision 1.1.2.2.2.6.2.1
diff -u -p -r1.1.2.2.2.6.2.1 views_slideshow.theme.inc
--- views_slideshow.theme.inc	29 Sep 2010 03:07:49 -0000	1.1.2.2.2.6.2.1
+++ views_slideshow.theme.inc	14 Dec 2010 15:10:15 -0000
@@ -13,10 +13,10 @@
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_main_section($id, $hidden_elements, $plugin) {
-  $attributes['id'] = "${plugin}_main_${id}";
-  $attributes['class'] = "${plugin}_main views_slideshow_main";
+function theme_views_slideshow_main_section($variables) {
+  $attributes['id'] = "{$variables['plugin']}_main_{$variables['id']}";
+  $attributes['class'] = array("{$variables['plugin']}_main views", "slideshow_main");
   $attributes = drupal_attributes($attributes);
 
-  return "<div$attributes>$hidden_elements</div>";
+  return "<div$attributes>{$variables['hidden_elements']}</div>";
 }
Index: views_slideshow_plugin_style_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/Attic/views_slideshow_plugin_style_slideshow.inc,v
retrieving revision 1.1.2.1.2.9.2.5
diff -u -p -r1.1.2.1.2.9.2.5 views_slideshow_plugin_style_slideshow.inc
--- views_slideshow_plugin_style_slideshow.inc	5 Oct 2010 05:45:50 -0000	1.1.2.1.2.9.2.5
+++ views_slideshow_plugin_style_slideshow.inc	14 Dec 2010 15:10:15 -0000
@@ -26,7 +26,7 @@ class views_slideshow_plugin_style_slide
     }
 
     // Eveything below here is what's needed for views slideshow.
-    if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'slider', 'ddblock')) && is_array($options[$options['mode']])) {
+    if (isset($options['mode']) && in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'slider', 'ddblock')) && is_array($options[$options['mode']])) {
       foreach ($options[$options['mode']] as $index => $value) {
         $this->options['views_slideshow_' . $options['mode']][$index] = $value;
       }
@@ -47,6 +47,7 @@ class views_slideshow_plugin_style_slide
   // Render the given style.
   function options_form(&$form, &$form_state) {
     module_load_all_includes('views_slideshow.inc');
+    ctools_include('dependent');
     parent::options_form($form, $form_state);
     
     $modules = module_invoke_all('views_slideshow_modes');
@@ -64,8 +65,8 @@ class views_slideshow_plugin_style_slide
         $form[$module . '-prefix'] = array(
           '#type' => 'hidden',
           '#id' => $module . '-options-wrapper',
-          '#prefix' => '<div><div id="' . $module .'-options-wrapper">',
-          '#process' => array('views_process_dependency'),
+          '#prefix' => '<div><div id="' . $module . '-options-wrapper">',
+          '#process' => array('ctools_dependent_process'),
           '#dependency' => array('edit-style-options-mode' => array($module)),
         );
 
@@ -73,19 +74,19 @@ class views_slideshow_plugin_style_slide
           '#type' => 'fieldset',
           '#title' => t('!module options', array('!module' => $modules[$module])),
           '#collapsible' => TRUE,
-          '#attributes' => array('class' => $module),
+          '#attributes' => array('class' => array($module)),
         );
-        $function = $module .'_views_slideshow_options_form';
+        $function = $module . '_views_slideshow_options_form';
         call_user_func_array($function, array(&$form, &$form_state, &$this));
 
         $form[$module . '-suffix']  = array(
-          '#value' => '</div></div>',
+          '#markup' => '</div></div>',
         );
       }
     }
     else {
       $form['enable_module'] = array(
-        '#value' => t('There is no Views Slideshow plugin enabled. Go to the !modules and enable a Views Slideshow plugin module. For example Views Slideshow Singleframe.', array('!modules' => l('Modules Page', 'admin/build/modules'))),
+        '#markup' => t('There is no Views Slideshow plugin enabled. Go to the !modules and enable a Views Slideshow plugin module. For example Views Slideshow Singleframe.', array('!modules' => l(t('Modules Page'), 'admin/modules'))),
       );
     }
   }
@@ -98,7 +99,7 @@ class views_slideshow_plugin_style_slide
     }
   }
   
-  function options_submit($form, &$form_state) {
+  function options_submit(&$form, &$form_state) {
     module_load_all_includes('views_slideshow.inc');
     foreach (module_implements('views_slideshow_options_form_submit') as $module) {
       $function = $module . '_views_slideshow_options_form_submit';
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.info,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views_slideshow_cycle.info
--- contrib/views_slideshow_cycle/views_slideshow_cycle.info	24 Jul 2010 04:25:46 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.info	14 Dec 2010 15:10:15 -0000
@@ -3,4 +3,7 @@ name = Views Slideshow: Cycle
 description = Adds a Rotating slideshow mode to Views Slideshow.
 dependencies[] = views_slideshow
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_slideshow_cycle.module
+files[] = views_slideshow_cycle.views_slideshow.inc
+files[] = theme/views_slideshow_cycle.theme.inc
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.js,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 views_slideshow_cycle.js
--- contrib/views_slideshow_cycle/views_slideshow_cycle.js	29 Sep 2010 03:29:45 -0000	1.1.2.13
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.js	14 Dec 2010 15:10:15 -0000
@@ -5,354 +5,358 @@
  *  A simple jQuery Cycle Div Slideshow Rotator.
  */
 
+(function($) {
+
 /**
  * This will set our initial behavior, by starting up each individual slideshow.
  */
-Drupal.behaviors.viewsSlideshowCycle = function (context) {
-  $('.views_slideshow_cycle_main:not(.viewsSlideshowCycle-processed)', context).addClass('viewsSlideshowCycle-processed').each(function() {
-    var fullId = '#' + $(this).attr('id');
-    var settings = Drupal.settings.viewsSlideshowCycle[fullId];
-    settings.targetId = '#' + $(fullId + " :first").attr('id');
-    settings.paused = false;
-
-    settings.opts = {
-      speed:settings.speed,
-      timeout:settings.timeout,
-      delay:settings.delay,
-      sync:settings.sync,
-      random:settings.random,
-      pagerAnchorBuilder:function(idx, slide) {
-        var classes = 'pager-item pager-num-' + (idx+1);
-        if (idx == 0) {
-          classes += ' first';
-        }
-        if ($(slide).siblings().length == idx) {
-          classes += ' last';
-        }
-
-        if (idx % 2) {
-          classes += ' odd';
-        }
-        else {
-          classes += ' even';
-        }
+Drupal.behaviors.viewsSlideshowCycle = {
+  attach: function(context, settings) {
+    $('.views_slideshow_cycle_main:not(.viewsSlideshowCycle-processed)', context).addClass('viewsSlideshowCycle-processed').each(function() {
+      var fullId = '#' + $(this).attr('id');
+      var settings = Drupal.settings.viewsSlideshowCycle[fullId];
+      settings.targetId = '#' + $(fullId + " :first").attr('id');
+      settings.paused = false;
+
+      settings.opts = {
+        speed:settings.speed,
+        timeout:settings.timeout,
+        delay:settings.delay,
+        sync:settings.sync,
+        random:settings.random,
+        pagerAnchorBuilder:function(idx, slide) {
+          var classes = 'pager-item pager-num-' + (idx+1);
+          if (idx == 0) {
+            classes += ' first';
+          }
+          if ($(slide).siblings().length == idx) {
+            classes += ' last';
+          }
+
+          if (idx % 2) {
+            classes += ' odd';
+          }
+          else {
+            classes += ' even';
+          }
         
-        // Call the theme function for the pager.
-        var theme = 'viewsSlideshowPager' + settings.pager_type;
-        return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : '';
-      },
-      allowPagerClickBubble:(settings.pager_hover),
-      prev:(settings.controls != 0)?'#views_slideshow_cycle_prev_' + settings.vss_id:null,
-      next:(settings.controls != 0)?'#views_slideshow_cycle_next_' + settings.vss_id:null,
-      pager:(settings.pager != 0)?'#views_slideshow_cycle_pager_' + settings.vss_id:null,
-      nowrap:settings.nowrap,
-      after:function(curr, next, opts) {
-        // Used for Slide Counter.
-        if (settings.slide_counter) {
-          $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
-          $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.total').html(opts.slideCount);
-        }
-      },
-      before:function(curr, next, opts) {
-        // Remember last slide.
-        if (settings.remember_slide) {
-          createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days);
-        }
-
-        // Make variable height.
-        if (!settings.fixed_height) {
-          //get the height of the current slide
-          var $ht = $(this).height();
-          //set the container's height to that of the current slide
-          $(this).parent().animate({height: $ht});
-        }
-      },
-      cleartype:(settings.cleartype)? true : false,
-      cleartypeNoBg:(settings.cleartypenobg)? true : false,
-      activePagerClass:'active-slide'
-    }
-    
-    // Set the starting slide if we are supposed to remember the slide
-    if (settings.remember_slide) {
-      var startSlide = readCookie(settings.vss_id);
-      if (startSlide == null) {
-        startSlide = 0;
+          // Call the theme function for the pager.
+          var theme = 'viewsSlideshowPager' + settings.pager_type;
+          return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : '';
+        },
+        allowPagerClickBubble:(settings.pager_hover),
+        prev:(settings.controls != 0)?'#views_slideshow_cycle_prev_' + settings.vss_id:null,
+        next:(settings.controls != 0)?'#views_slideshow_cycle_next_' + settings.vss_id:null,
+        pager:(settings.pager != 0)?'#views_slideshow_cycle_pager_' + settings.vss_id:null,
+        nowrap:settings.nowrap,
+        after:function(curr, next, opts) {
+          // Used for Slide Counter.
+          if (settings.slide_counter) {
+            $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
+            $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.total').html(opts.slideCount);
+          }
+        },
+        before:function(curr, next, opts) {
+          // Remember last slide.
+          if (settings.remember_slide) {
+            createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days);
+          }
+
+          // Make variable height.
+          if (!settings.fixed_height) {
+            //get the height of the current slide
+            var $ht = $(this).height();
+            //set the container's height to that of the current slide
+            $(this).parent().animate({height: $ht});
+          }
+        },
+        cleartype:(settings.cleartype)? true : false,
+        cleartypeNoBg:(settings.cleartypenobg)? true : false,
+        activePagerClass:'active-slide'
+      }
+    
+      // Set the starting slide if we are supposed to remember the slide
+      if (settings.remember_slide) {
+        var startSlide = readCookie(settings.vss_id);
+        if (startSlide == null) {
+          startSlide = 0;
+        }
+        settings.opts.startingSlide =  startSlide;
       }
-      settings.opts.startingSlide =  startSlide;
-    }
 
-    if (settings.pager_hover) {
-      settings.opts.pagerEvent = 'mouseover';
-      settings.opts.pauseOnPagerHover = true;
-    }
+      if (settings.pager_hover) {
+        settings.opts.pagerEvent = 'mouseover';
+        settings.opts.pauseOnPagerHover = true;
+      }
 
-    if (settings.effect == 'none') {
-      settings.opts.speed = 1;
-    }
-    else {
-      settings.opts.fx = settings.effect;
-    }
+      if (settings.effect == 'none') {
+        settings.opts.speed = 1;
+      }
+      else {
+        settings.opts.fx = settings.effect;
+      }
 
-    // Pause on hover.
-    if (settings.pause) {
-      $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).hover(function() {
-        $(settings.targetId).cycle('pause');
-      }, function() {
-        if (!settings.paused) {
-          $(settings.targetId).cycle('resume');
-        }
-      });
-    }
+      // Pause on hover.
+      if (settings.pause) {
+        $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).hover(function() {
+          $(settings.targetId).cycle('pause');
+        }, function() {
+          if (!settings.paused) {
+            $(settings.targetId).cycle('resume');
+          }
+        });
+      }
 
-    // Pause on clicking of the slide.
-    if (settings.pause_on_click) {
-      $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).click(function() { 
-        viewsSlideshowCyclePause(settings);
-      });
-    }
+      // Pause on clicking of the slide.
+      if (settings.pause_on_click) {
+        $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).click(function() { 
+          viewsSlideshowCyclePause(settings);
+        });
+      }
     
-    // Allow pagers to override settings.
-    if (settings.pager != 0) {
-      var pagerAlter = 'viewsSlideshowCyclePager' + settings.pager_type + 'SettingsAlter';
-      if (typeof window[pagerAlter] == 'function') {
-        settings = window[pagerAlter](settings);
+      // Allow pagers to override settings.
+      if (settings.pager != 0) {
+        var pagerAlter = 'viewsSlideshowCyclePager' + settings.pager_type + 'SettingsAlter';
+        if (typeof window[pagerAlter] == 'function') {
+          settings = window[pagerAlter](settings);
+        }
       }
-    }
     
-    // Advanced Settings
-    if (typeof(settings.advanced_fx) !== 'undefined') { settings.opts.fx = settings.advanced_fx; }
+      // Advanced Settings
+      if (typeof(settings.advanced_fx) !== 'undefined') { settings.opts.fx = settings.advanced_fx; }
     
-    if (typeof(settings.advanced_timeout) !== 'undefined') { settings.opts.timeout = settings.advanced_timeout; }
+      if (typeof(settings.advanced_timeout) !== 'undefined') { settings.opts.timeout = settings.advanced_timeout; }
     
-    if (typeof(settings.advanced_timeoutfn) !== 'undefined') {
-      settings.opts.timeoutFn = function(currSlideElement, nextSlideElement, options, forwardFlag) {
-        eval(settings.advanced_timeoutfn);
+      if (typeof(settings.advanced_timeoutfn) !== 'undefined') {
+        settings.opts.timeoutFn = function(currSlideElement, nextSlideElement, options, forwardFlag) {
+          eval(settings.advanced_timeoutfn);
+        }
       }
-    }
     
-    // true to start next transition immediately after current one completes 
-    if (typeof(settings.advanced_continuous) !== 'undefined') { settings.opts.continuous = settings.advanced_continuous; }
+      // true to start next transition immediately after current one completes 
+      if (typeof(settings.advanced_continuous) !== 'undefined') { settings.opts.continuous = settings.advanced_continuous; }
     
-    // speed of the transition (any valid fx speed value)
-    if (typeof(settings.advanced_speed) !== 'undefined') { settings.opts.speed = settings.advanced_speed; }
+      // speed of the transition (any valid fx speed value)
+      if (typeof(settings.advanced_speed) !== 'undefined') { settings.opts.speed = settings.advanced_speed; }
     
-    // speed of the 'in' transition
-    if (typeof(settings.advanced_speedin) !== 'undefined') { settings.opts.speedIn = settings.advanced_speedin; }
+      // speed of the 'in' transition
+      if (typeof(settings.advanced_speedin) !== 'undefined') { settings.opts.speedIn = settings.advanced_speedin; }
     
-    // speed of the 'out' transition
-    if (typeof(settings.advanced_speedout) !== 'undefined') { settings.opts.speedOut = settings.advanced_speedout; }
+      // speed of the 'out' transition
+      if (typeof(settings.advanced_speedout) !== 'undefined') { settings.opts.speedOut = settings.advanced_speedout; }
     
-    // selector for element to use as click trigger for next slide
-    if (typeof(settings.advanced_next) !== 'undefined') { settings.opts.next = settings.advanced_next; }
+      // selector for element to use as click trigger for next slide
+      if (typeof(settings.advanced_next) !== 'undefined') { settings.opts.next = settings.advanced_next; }
     
-    // selector for element to use as click trigger for previous slide
-    if (typeof(settings.advanced_prev) !== 'undefined') { settings.opts.prev = settings.advanced_prev; }
+      // selector for element to use as click trigger for previous slide
+      if (typeof(settings.advanced_prev) !== 'undefined') { settings.opts.prev = settings.advanced_prev; }
     
-    // callback fn for prev/next clicks:   function(isNext, zeroBasedSlideIndex, slideElement) 
-    if (typeof(settings.advanced_prevnextclick) !== 'undefined') {
-      settings.opts.prevNextClick = function(isNext, zeroBasedSlideIndex, slideElement) {
-        eval(settings.advanced_prevnextclick);
+      // callback fn for prev/next clicks:   function(isNext, zeroBasedSlideIndex, slideElement) 
+      if (typeof(settings.advanced_prevnextclick) !== 'undefined') {
+        settings.opts.prevNextClick = function(isNext, zeroBasedSlideIndex, slideElement) {
+          eval(settings.advanced_prevnextclick);
+        }
       }
-    }
     
-    // event which drives the manual transition to the previous or next slide
-    if (typeof(settings.advanced_prevnextevent) !== 'undefined') { settings.opts.prevNextEvent = settings.advanced_prevnextevent; }
+      // event which drives the manual transition to the previous or next slide
+      if (typeof(settings.advanced_prevnextevent) !== 'undefined') { settings.opts.prevNextEvent = settings.advanced_prevnextevent; }
     
-    // selector for element to use as pager container
-    if (typeof(settings.advanced_pager) !== 'undefined') { settings.opts.pager = settings.advanced_pager; }
+      // selector for element to use as pager container
+      if (typeof(settings.advanced_pager) !== 'undefined') { settings.opts.pager = settings.advanced_pager; }
     
-    // callback fn for pager clicks:    function(zeroBasedSlideIndex, slideElement)
-    if (typeof(settings.advanced_pagerclick) !== 'undefined') {
-      settings.opts.pagerClick = function(zeroBasedSlideIndex, slideElement) {
-        eval(settings.advanced_pagerclick);
+      // callback fn for pager clicks:    function(zeroBasedSlideIndex, slideElement)
+      if (typeof(settings.advanced_pagerclick) !== 'undefined') {
+        settings.opts.pagerClick = function(zeroBasedSlideIndex, slideElement) {
+          eval(settings.advanced_pagerclick);
+        }
       }
-    }
     
-    // name of event which drives the pager navigation
-    if (typeof(settings.advanced_pagerevent) !== 'undefined') { settings.opts.pagerEvent = settings.advanced_pagerevent; }
+      // name of event which drives the pager navigation
+      if (typeof(settings.advanced_pagerevent) !== 'undefined') { settings.opts.pagerEvent = settings.advanced_pagerevent; }
     
-    // allows or prevents click event on pager anchors from bubbling
-    if (typeof(settings.advanced_allowpagerclickbubble) !== 'undefined') { settings.opts.allowPagerClickBubble = settings.advanced_allowpagerclickbubble; }
+      // allows or prevents click event on pager anchors from bubbling
+      if (typeof(settings.advanced_allowpagerclickbubble) !== 'undefined') { settings.opts.allowPagerClickBubble = settings.advanced_allowpagerclickbubble; }
     
-     // callback fn for building anchor links:  function(index, DOMelement)
-    if (typeof(settings.advanced_pageranchorbuilder) !== 'undefined') {
-      settings.opts.pagerAnchorBuilder = function(index, DOMelement) {
-        eval(settings.advanced_pageranchorbuilder);
+       // callback fn for building anchor links:  function(index, DOMelement)
+      if (typeof(settings.advanced_pageranchorbuilder) !== 'undefined') {
+        settings.opts.pagerAnchorBuilder = function(index, DOMelement) {
+          eval(settings.advanced_pageranchorbuilder);
+        }
       }
-    }
     
-    // transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag) 
-    if (typeof(settings.advanced_before) !== 'undefined') {
-      settings.opts.before = function(currSlideElement, nextSlideElement, options, forwardFlag) {
-        eval(settings.advanced_before);
+      // transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag) 
+      if (typeof(settings.advanced_before) !== 'undefined') {
+        settings.opts.before = function(currSlideElement, nextSlideElement, options, forwardFlag) {
+          eval(settings.advanced_before);
+        }
       }
-    }
     
-    // transition callback (scope set to element that was shown):  function(currSlideElement, nextSlideElement, options, forwardFlag)
-    if (typeof(settings.advanced_after) !== 'undefined') {
-      settings.opts.after = function(currSlideElement, nextSlideElement, options, forwardFlag) {
-        eval(settings.advanced_after);
+      // transition callback (scope set to element that was shown):  function(currSlideElement, nextSlideElement, options, forwardFlag)
+      if (typeof(settings.advanced_after) !== 'undefined') {
+        settings.opts.after = function(currSlideElement, nextSlideElement, options, forwardFlag) {
+          eval(settings.advanced_after);
+        }
       }
-    }
     
-    // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)
-    if (typeof(settings.advanced_end) !== 'undefined') {
-      settings.opts.end = function(options) {
-        eval(settings.advanced_end);
+      // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)
+      if (typeof(settings.advanced_end) !== 'undefined') {
+        settings.opts.end = function(options) {
+          eval(settings.advanced_end);
+        }
       }
-    }
     
-    // easing method for both in and out transitions
-    if (typeof(settings.advanced_easing) !== 'undefined') { settings.opts.easing = settings.advanced_easing; }
+      // easing method for both in and out transitions
+      if (typeof(settings.advanced_easing) !== 'undefined') { settings.opts.easing = settings.advanced_easing; }
     
-    // easing for "in" transition
-    if (typeof(settings.advanced_easein) !== 'undefined') { settings.opts.easeIn = settings.advanced_easein; }
+      // easing for "in" transition
+      if (typeof(settings.advanced_easein) !== 'undefined') { settings.opts.easeIn = settings.advanced_easein; }
     
-    // easing for "out" transition
-    if (typeof(settings.advanced_easeout) !== 'undefined') { settings.opts.easeOut = settings.advanced_easeout; }
+      // easing for "out" transition
+      if (typeof(settings.advanced_easeout) !== 'undefined') { settings.opts.easeOut = settings.advanced_easeout; }
     
-    // coords for shuffle animation, ex: { top:15, left: 200 }
-    if (typeof(settings.advanced_shuffle) !== 'undefined') { settings.opts.shuffle = settings.advanced_shuffle; }
+      // coords for shuffle animation, ex: { top:15, left: 200 }
+      if (typeof(settings.advanced_shuffle) !== 'undefined') { settings.opts.shuffle = settings.advanced_shuffle; }
     
-    // properties that define how the slide animates in
-    if (typeof(settings.advanced_animin) !== 'undefined') { settings.opts.animIn = settings.advanced_animin; }
+      // properties that define how the slide animates in
+      if (typeof(settings.advanced_animin) !== 'undefined') { settings.opts.animIn = settings.advanced_animin; }
     
-    // properties that define how the slide animates out
-    if (typeof(settings.advanced_animout) !== 'undefined') { settings.opts.animOut = settings.advanced_animout; }
+      // properties that define how the slide animates out
+      if (typeof(settings.advanced_animout) !== 'undefined') { settings.opts.animOut = settings.advanced_animout; }
     
-    // properties that define the initial state of the slide before transitioning in
-    if (typeof(settings.advanced_cssbefore) !== 'undefined') { settings.opts.cssBefore = settings.advanced_cssbefore; }
+      // properties that define the initial state of the slide before transitioning in
+      if (typeof(settings.advanced_cssbefore) !== 'undefined') { settings.opts.cssBefore = settings.advanced_cssbefore; }
     
-    // properties that defined the state of the slide after transitioning out
-    if (typeof(settings.advanced_cssafter) !== 'undefined') { settings.opts.cssAfter = settings.advanced_cssafter; }
+      // properties that defined the state of the slide after transitioning out
+      if (typeof(settings.advanced_cssafter) !== 'undefined') { settings.opts.cssAfter = settings.advanced_cssafter; }
     
-    // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)
-    if (typeof(settings.advanced_fxfn) !== 'undefined') {
-      settings.opts.fxFn = function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) {
-        eval(settings.advanced_fxfn);
+      // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)
+      if (typeof(settings.advanced_fxfn) !== 'undefined') {
+        settings.opts.fxFn = function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) {
+          eval(settings.advanced_fxfn);
+        }
       }
-    }
     
-    // container height
-    if (typeof(settings.advanced_height) !== 'undefined') { settings.opts.height = settings.advanced_height; }
+      // container height
+      if (typeof(settings.advanced_height) !== 'undefined') { settings.opts.height = settings.advanced_height; }
     
-    // zero-based index of the first slide to be displayed
-    if (typeof(settings.advanced_startingslide) !== 'undefined') { settings.opts.startingSlide = settings.advanced_startingslide; }
+      // zero-based index of the first slide to be displayed
+      if (typeof(settings.advanced_startingslide) !== 'undefined') { settings.opts.startingSlide = settings.advanced_startingslide; }
     
-    // true if in/out transitions should occur simultaneously
-    if (typeof(settings.advanced_sync) !== 'undefined') { settings.opts.sync = settings.advanced_sync; }
+      // true if in/out transitions should occur simultaneously
+      if (typeof(settings.advanced_sync) !== 'undefined') { settings.opts.sync = settings.advanced_sync; }
     
-    // true for random, false for sequence (not applicable to shuffle fx)
-    if (typeof(settings.advanced_random) !== 'undefined') { settings.opts.random = settings.advanced_random; }
+      // true for random, false for sequence (not applicable to shuffle fx)
+      if (typeof(settings.advanced_random) !== 'undefined') { settings.opts.random = settings.advanced_random; }
     
-    // force slides to fit container
-    if (typeof(settings.advanced_fit) !== 'undefined') { settings.opts.fit = settings.advanced_fit; }
+      // force slides to fit container
+      if (typeof(settings.advanced_fit) !== 'undefined') { settings.opts.fit = settings.advanced_fit; }
     
-    // resize container to fit largest slide
-    if (typeof(settings.advanced_containerresize) !== 'undefined') { settings.opts.containerResize = settings.advanced_containerresize; }
+      // resize container to fit largest slide
+      if (typeof(settings.advanced_containerresize) !== 'undefined') { settings.opts.containerResize = settings.advanced_containerresize; }
     
-    // true to enable "pause on hover"
-    if (typeof(settings.advanced_pause) !== 'undefined') { settings.opts.pause = settings.advanced_pause; }
+      // true to enable "pause on hover"
+      if (typeof(settings.advanced_pause) !== 'undefined') { settings.opts.pause = settings.advanced_pause; }
     
-    // true to pause when hovering over pager link
-    if (typeof(settings.advanced_pauseonpagerhover) !== 'undefined') { settings.opts.pauseOnPagerHover = settings.advanced_pauseonpagerhover; }
+      // true to pause when hovering over pager link
+      if (typeof(settings.advanced_pauseonpagerhover) !== 'undefined') { settings.opts.pauseOnPagerHover = settings.advanced_pauseonpagerhover; }
     
-    // true to end slideshow after X transitions (where X == slide count)
-    if (typeof(settings.advanced_autostop) !== 'undefined') { settings.opts.autostop = settings.advanced_autostop; }
+      // true to end slideshow after X transitions (where X == slide count)
+      if (typeof(settings.advanced_autostop) !== 'undefined') { settings.opts.autostop = settings.advanced_autostop; }
     
-    // number of transitions (optionally used with autostop to define X)
-    if (typeof(settings.advanced_autostopcount) !== 'undefined') { settings.opts.autostopCount = settings.advanced_autostopcount; }
+      // number of transitions (optionally used with autostop to define X)
+      if (typeof(settings.advanced_autostopcount) !== 'undefined') { settings.opts.autostopCount = settings.advanced_autostopcount; }
     
-    // additional delay (in ms) for first transition (hint: can be negative)
-    if (typeof(settings.advanced_delay) !== 'undefined') { settings.opts.delay = settings.advanced_delay; }
+      // additional delay (in ms) for first transition (hint: can be negative)
+      if (typeof(settings.advanced_delay) !== 'undefined') { settings.opts.delay = settings.advanced_delay; }
     
-    // expression for selecting slides (if something other than all children is required)
-    if (typeof(settings.advanced_slideexpr) !== 'undefined') { settings.opts.slideExpr = settings.advanced_slideexpr; }
+      // expression for selecting slides (if something other than all children is required)
+      if (typeof(settings.advanced_slideexpr) !== 'undefined') { settings.opts.slideExpr = settings.advanced_slideexpr; }
     
-    // true if clearType corrections should be applied (for IE)
-    if (typeof(settings.advanced_cleartype) !== 'undefined') { settings.opts.cleartype = settings.advanced_cleartype; }
+      // true if clearType corrections should be applied (for IE)
+      if (typeof(settings.advanced_cleartype) !== 'undefined') { settings.opts.cleartype = settings.advanced_cleartype; }
     
-    // set to true to disable extra cleartype fixing (leave false to force background color setting on slides)
-    if (typeof(settings.advanced_cleartypenobg) !== 'undefined') { settings.opts.cleartypeNoBg = settings.advanced_cleartypenobg; }
+      // set to true to disable extra cleartype fixing (leave false to force background color setting on slides)
+      if (typeof(settings.advanced_cleartypenobg) !== 'undefined') { settings.opts.cleartypeNoBg = settings.advanced_cleartypenobg; }
     
-    // true to prevent slideshow from wrapping
-    if (typeof(settings.advanced_nowrap) !== 'undefined') { settings.opts.nowrap = settings.advanced_nowrap; }
+      // true to prevent slideshow from wrapping
+      if (typeof(settings.advanced_nowrap) !== 'undefined') { settings.opts.nowrap = settings.advanced_nowrap; }
     
-    // force fast transitions when triggered manually (via pager or prev/next); value == time in ms
-    if (typeof(settings.advanced_fastonevent) !== 'undefined') { settings.opts.fastOnEvent = settings.advanced_fastonevent; }
+      // force fast transitions when triggered manually (via pager or prev/next); value == time in ms
+      if (typeof(settings.advanced_fastonevent) !== 'undefined') { settings.opts.fastOnEvent = settings.advanced_fastonevent; }
     
-    // valid when multiple effects are used; true to make the effect sequence random
-    if (typeof(settings.advanced_randomizeeffects) !== 'undefined') { settings.opts.randomizeEffects = settings.advanced_randomizeeffects; }
+      // valid when multiple effects are used; true to make the effect sequence random
+      if (typeof(settings.advanced_randomizeeffects) !== 'undefined') { settings.opts.randomizeEffects = settings.advanced_randomizeeffects; }
     
-    // causes animations to transition in reverse
-    if (typeof(settings.advanced_rev) !== 'undefined') { settings.opts.rev = settings.advanced_rev; }
+      // causes animations to transition in reverse
+      if (typeof(settings.advanced_rev) !== 'undefined') { settings.opts.rev = settings.advanced_rev; }
     
-    // causes manual transition to stop an active transition instead of being ignored
-    if (typeof(settings.advanced_manualtrump) !== 'undefined') { settings.opts.manualTrump = settings.advanced_manualtrump; }
+      // causes manual transition to stop an active transition instead of being ignored
+      if (typeof(settings.advanced_manualtrump) !== 'undefined') { settings.opts.manualTrump = settings.advanced_manualtrump; }
     
-    // requeue the slideshow if any image slides are not yet loaded
-    if (typeof(settings.advanced_requeueonimagenotloaded) !== 'undefined') { settings.opts.requeueOnImageNotLoaded = settings.advanced_requeueonimagenotloaded; }
+      // requeue the slideshow if any image slides are not yet loaded
+      if (typeof(settings.advanced_requeueonimagenotloaded) !== 'undefined') { settings.opts.requeueOnImageNotLoaded = settings.advanced_requeueonimagenotloaded; }
     
-    // ms delay for requeue
-    if (typeof(settings.advanced_requeuetimeout) !== 'undefined') { settings.opts.requeueTimeout = settings.advanced_requeuetimeout; }
+      // ms delay for requeue
+      if (typeof(settings.advanced_requeuetimeout) !== 'undefined') { settings.opts.requeueTimeout = settings.advanced_requeuetimeout; }
 
-    // class name used for the active pager link
-    if (typeof(settings.advanced_activepagerclass) !== 'undefined') { settings.opts.activePagerClass = settings.advanced_activepagerclass; }
+      // class name used for the active pager link
+      if (typeof(settings.advanced_activepagerclass) !== 'undefined') { settings.opts.activePagerClass = settings.advanced_activepagerclass; }
     
-    // callback fn invoked to update the active pager link (adds/removes activePagerClass style)
-    if (typeof(settings.advanced_updateactivepagerlink) !== 'undefined') { settings.opts.updateActivePagerLink = eval(settings.advanced_updateactivepagerlink); }
+      // callback fn invoked to update the active pager link (adds/removes activePagerClass style)
+      if (typeof(settings.advanced_updateactivepagerlink) !== 'undefined') { settings.opts.updateActivePagerLink = eval(settings.advanced_updateactivepagerlink); }
     
-    $(settings.targetId).cycle(settings.opts);
+      $(settings.targetId).cycle(settings.opts);
 
-    // Start Paused
-    if (settings.start_paused) {
-      viewsSlideshowCyclePause(settings);
-    }
+      // Start Paused
+      if (settings.start_paused) {
+        viewsSlideshowCyclePause(settings);
+      }
     
-    // Pause if hidden.
-    if (settings.pause_when_hidden) {
-      var checkPause = function(settings) {
-        // If the slideshow is visible and it is paused then resume.
-        // otherwise if the slideshow is not visible and it is not paused then
-        // pause it.
-        var visible = viewsSlideshowCycleIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible);
-        if (visible && settings.paused) {
-          viewsSlideshowCycleResume(settings);
+      // Pause if hidden.
+      if (settings.pause_when_hidden) {
+        var checkPause = function(settings) {
+          // If the slideshow is visible and it is paused then resume.
+          // otherwise if the slideshow is not visible and it is not paused then
+          // pause it.
+          var visible = viewsSlideshowCycleIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible);
+          if (visible && settings.paused) {
+            viewsSlideshowCycleResume(settings);
+          }
+          else if (!visible && !settings.paused) {
+            viewsSlideshowCyclePause(settings);
+          }
         }
-        else if (!visible && !settings.paused) {
-          viewsSlideshowCyclePause(settings);
-        }
-      }
      
-      // Check when scrolled.
-      $(window).scroll(function() {
-       checkPause(settings);
-      });
+        // Check when scrolled.
+        $(window).scroll(function() {
+         checkPause(settings);
+        });
       
-      // Check when the window is resized.
-      $(window).resize(function() {
-        checkPause(settings);
-      });
-    }
-
-    // Show image count for people who have js enabled.
-    $('#views_slideshow_cycle_image_count_' + settings.vss_id).show();
+        // Check when the window is resized.
+        $(window).resize(function() {
+          checkPause(settings);
+        });
+      }
 
-    if (settings.controls != 0) {
-      // Show controls for people who have js enabled browsers.
-      $('#views_slideshow_cycle_controls_' + settings.vss_id).show();
+      // Show image count for people who have js enabled.
+      $('#views_slideshow_cycle_image_count_' + settings.vss_id).show();
+
+      if (settings.controls != 0) {
+        // Show controls for people who have js enabled browsers.
+        $('#views_slideshow_cycle_controls_' + settings.vss_id).show();
       
-      $('#views_slideshow_cycle_playpause_' + settings.vss_id).click(function(e) {
-      	if (settings.paused) {
-      	  viewsSlideshowCycleResume(settings);
-      	}
-      	else {
-      	  viewsSlideshowCyclePause(settings);
-      	}
-        e.preventDefault();
-      });
-    }
-  });
+        $('#views_slideshow_cycle_playpause_' + settings.vss_id).click(function(e) {
+        	if (settings.paused) {
+        	  viewsSlideshowCycleResume(settings);
+        	}
+        	else {
+        	  viewsSlideshowCyclePause(settings);
+        	}
+          e.preventDefault();
+        });
+      }
+    });
+  }
 }
 
 // Pause the slideshow 
@@ -581,3 +585,4 @@ function viewsSlideshowCycleIsVisible(el
   }
 }
 
+})(jQuery);
\ No newline at end of file
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.6
diff -u -p -r1.1.2.6 views_slideshow_cycle.module
--- contrib/views_slideshow_cycle/views_slideshow_cycle.module	29 Sep 2010 03:07:49 -0000	1.1.2.6
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.module	14 Dec 2010 15:10:16 -0000
@@ -22,12 +22,12 @@ function views_slideshow_cycle_init() {
 
   // Otherwise, we'll add the version included with this module.
   if (!$js) {
-    drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js');
+    drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js', array('group' => JS_LIBRARY));
   }
 
   $module_path = drupal_get_path('module', 'views_slideshow_cycle');
-  drupal_add_js($module_path . '/views_slideshow_cycle.js', 'module');
-  drupal_add_css($module_path . '/views_slideshow_cycle.css', 'module');
+  drupal_add_js($module_path . '/views_slideshow_cycle.js');
+  drupal_add_css($module_path . '/views_slideshow_cycle.css');
 }
 
 /**
@@ -36,76 +36,76 @@ function views_slideshow_cycle_init() {
 function views_slideshow_cycle_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_cycle' => array(
-      'arguments' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
+      'variables' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
       'template' => 'theme/views-slideshow-cycle',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_controls' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-controls',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_control_previous' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-control-previous',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_control_pause' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-control-pause',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_control_next' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-control-next',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager_numbered' => array(
-      'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()),
+      'variables' => array('view' => NULL, 'attributes_array' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-pager-numbered',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager_thumbnails' => array(
-      'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()),
+      'variables' => array('view' => NULL, 'attributes_array' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-pager-thumbnails',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager_field' => array(
-      'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()),
+      'variables' => array('view' => NULL, 'attributes_array' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-pager-field',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager_field_field' => array(
-      'arguments' => array('view' => NULL, 'field' => NULL, 'count' => NULL),
+      'variables' => array('view' => NULL, 'field' => NULL, 'count' => NULL),
       'template' => 'theme/views-slideshow-cycle-pager-field-field',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_pager_field_item' => array(
-      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
+      'variables' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'template' => 'theme/views-slideshow-cycle-pager-field-item',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_slide_counter' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'template' => 'theme/views-slideshow-cycle-slide-counter',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_main_frame' => array(
-      'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL),
+      'variables' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL),
       'template' => 'theme/views-slideshow-cycle-main-frame',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
-    ),    
+    ),
     'views_slideshow_cycle_main_frame_row' => array(
-      'arguments' => array('items' => NULL, 'vss_id' => NULL, 'count' => NULL),
+      'variables' => array('items' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'template' => 'theme/views-slideshow-cycle-main-frame-row',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
     'views_slideshow_cycle_main_frame_row_item' => array(
-      'arguments' => array('item' => NULL, 'item_count' => NULL),
+      'variables' => array('item' => NULL, 'item_count' => NULL),
       'template' => 'theme/views-slideshow-cycle-main-frame-row-item',
       'file' => 'theme/views_slideshow_cycle.theme.inc',
     ),
@@ -129,7 +129,7 @@ function views_slideshow_cycle_help($pat
 }
 
 /**
- * Implementation of hook_views_cycle_skins().
+ * Implements hook_views_cycle_skins().
  */
 function views_slideshow_cycle_views_slideshow_cycle_skins() {
   $skins['default'] = array(
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.14
diff -u -p -r1.1.2.14 views_slideshow_cycle.views_slideshow.inc
--- contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	5 Oct 2010 05:45:50 -0000	1.1.2.14
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	14 Dec 2010 15:10:16 -0000
@@ -165,10 +165,10 @@ function views_slideshow_cycle_views_sli
 }
 
 function views_slideshow_cycle_views_slideshow_options_form(&$form, &$form_state, &$view) {
-  
+  ctools_include('dependent');
   // Style
   $form['views_slideshow_cycle']['style'] = array(
-    '#value' => '<h2>' . t('Style') . '</h2>',
+    '#markup' => '<h2>' . t('Style') . '</h2>',
   );
   
   // Get a list of all available stylesheet plugins.
@@ -189,7 +189,7 @@ function views_slideshow_cycle_views_sli
   
   // Transition
   $form['views_slideshow_cycle']['transition'] = array(
-    '#value' => '<h2>' . t('Transition') . '</h2>',
+    '#markup' => '<h2>' . t('Transition') . '</h2>',
   );
   
   $effects = array(
@@ -220,14 +220,14 @@ function views_slideshow_cycle_views_sli
     'turnRight' => 'turnRight',
     'uncover' => 'uncover',
     'wipe' => 'wipe',
-    'zoom' => 'zoom' 
+    'zoom' => 'zoom'
   );
   $form['views_slideshow_cycle']['effect'] = array(
     '#type' => 'select',
     '#title' => t('Effect'),
     '#options' => $effects,
     '#default_value' => $view->options['views_slideshow_cycle']['effect'],
-    '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect. ' . l('Follow this link to see examples of each effect.', 'http://jquery.malsup.com/cycle/browser.html', array('attributes' => array('target' => '_blank')))),
+    '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect. ' . l(t('Follow this link to see examples of each effect.'), 'http://jquery.malsup.com/cycle/browser.html', array('attributes' => array('target' => '_blank')))),
   );
    
   // Transition advanced options
@@ -241,7 +241,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Timer delay'),
     '#default_value' => $view->options['views_slideshow_cycle']['timeout'],
     '#description' => t('Amount of time in milliseconds between transitions. Set the value to 0 to not rotate the slideshow automatically.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['speed'] = array(
@@ -249,7 +249,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Speed'),
     '#default_value' => $view->options['views_slideshow_cycle']['speed'],
     '#description' => t('Time in milliseconds that each transition lasts. Numeric only!'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['delay'] = array(
@@ -257,7 +257,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Initial slide delay offset'),
     '#default_value' => $view->options['views_slideshow_cycle']['delay'],
     '#description' => t('Amount of time in milliseconds for the first slide to transition. This number will be added to Timer delay to create the initial delay.  For example if Timer delay is 4000 and Initial delay is 2000 then the first slide will change at 6000ms (6 seconds).  If Initial delay is -2000 then the first slide will change at 2000ms (2 seconds).'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['sync'] = array(
@@ -265,7 +265,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Sync'),
     '#default_value' => $view->options['views_slideshow_cycle']['sync'],
     '#description' => t('The sync option controls whether the slide transitions occur simultaneously. The default is selected which means that the current slide transitions out as the next slide transitions in. By unselecting this option you can get some interesting twists on your transitions.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['random'] = array(
@@ -273,13 +273,13 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Random'),
     '#description' => t('This option controls the order items are displayed. The default setting, unselected, uses the views ordering. Selected will cause the images to display in a random order.'),
     '#default_value' => $view->options['views_slideshow_cycle']['random'],
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)),
   );
   
   // Action
   $form['views_slideshow_cycle']['action'] = array(
-    '#value' => '<h2>' . t('Action') . '</h2>',
+    '#markup' => '<h2>' . t('Action') . '</h2>',
   );
   $form['views_slideshow_cycle']['pause'] = array(
     '#type' => 'checkbox',
@@ -305,7 +305,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Start Slideshow Paused'),
     '#default_value' => $view->options['views_slideshow_cycle']['start_paused'],
     '#description' => t('Start the slideshow in the paused state.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['remember_slide'] = array(
@@ -313,7 +313,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Start On Last Slide Viewed'),
     '#default_value' => $view->options['views_slideshow_cycle']['remember_slide'],
     '#description' => t('When the user leaves a page with a slideshow and comes back start them on the last slide viewed.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['remember_slide_days'] = array(
@@ -322,7 +322,7 @@ function views_slideshow_cycle_views_sli
     '#default_value' => $view->options['views_slideshow_cycle']['remember_slide_days'],
     '#description' => t('The number of days to have the site remember the last slide. Default is 1'),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency_count' => 2,
     '#dependency' => array(
       'edit-style-options-views-slideshow-cycle-action-advanced' => array(1),
@@ -334,7 +334,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Pause When the Slideshow is Not Visible'),
     '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden'],
     '#description' => t('When the slideshow is scrolled out of view or when a window is resized that hides the slideshow, this will pause the slideshow.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['pause_when_hidden_type'] = array(
@@ -348,7 +348,7 @@ function views_slideshow_cycle_views_sli
     ),
     '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden_type'],
     '#description' => t('Choose how to calculate how much of the slide has to be shown. Entire Slide: All the slide has to be shown. Vertical: Set amount of height that has to be shown. Horizontal: Set amount of width that has to be shown. Area: Set total area that has to be shown.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency_count' => 2,
     '#dependency' => array(
       'edit-style-options-views-slideshow-cycle-action-advanced' => array(1),
@@ -361,7 +361,7 @@ function views_slideshow_cycle_views_sli
     '#default_value' => $view->options['views_slideshow_cycle']['amount_allowed_visible'],
     '#description' => t("The amount of the slide that needs to be shown to have it rotate. You can set the value in percentage (ex: 50%) or in pixels (ex: 250). The slidehsow will not rotate until it's height/width/total area, depending on the calculation method you have chosen above, is less than the value you have entered in this field."),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency_count' => 3,
     '#dependency' => array(
       'edit-style-options-views-slideshow-cycle-action-advanced' => array(1),
@@ -378,7 +378,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('End slideshow after last slide'),
     '#default_value' => $view->options['views_slideshow_cycle']['nowrap'],
     '#description' => t('If selected the slideshow will end when it gets to the last slide.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['fixed_height'] = array(
@@ -386,7 +386,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Make the slide window height fit the largest slide'),
     '#default_value' => $view->options['views_slideshow_cycle']['fixed_height'],
     '#description' => t('If unselected then if the slides are different sizes the height of the slide area will change as the slides change.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   $form['views_slideshow_cycle']['items_per_slide'] = array(
@@ -395,13 +395,13 @@ function views_slideshow_cycle_views_sli
     '#default_value' => $view->options['views_slideshow_cycle']['items_per_slide'],
     '#description' => t('The number of items per slide'),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   
   // Pager and Controls
   $form['views_slideshow_cycle']['pager_and_controls'] = array(
-    '#value' => '<h2>' . t('Pager and Controls') . '</h2>',
+    '#markup' => '<h2>' . t('Pager and Controls') . '</h2>',
   );
   $form['views_slideshow_cycle']['pager'] = array(
     '#type' => 'select',
@@ -429,8 +429,8 @@ function views_slideshow_cycle_views_sli
         $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager'] = array('top', 'bottom');
         $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager-type'] = array($pager_key);
         $pager_field['#dependency_count'] = count($pager_field['#dependency']);
-        if (!isset($pager_field['#process']) || !in_array('views_process_dependency', $pager_field['#process'])) {
-          $pager_field['#process'][] = 'views_process_dependency';
+        if (!isset($pager_field['#process']) || !in_array('ctools_dependent_process', $pager_field['#process'])) {
+          $pager_field['#process'][] = 'ctools_dependent_process';
         }
         
         $pager_fields[$pager_field_key] = $pager_field;
@@ -446,7 +446,7 @@ function views_slideshow_cycle_views_sli
     '#options' => $options,
     '#default_value' => $view->options['views_slideshow_cycle']['pager_type'],
     '#description' => t('Style of the pager.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')),
   );
   
@@ -458,7 +458,7 @@ function views_slideshow_cycle_views_sli
     '#title' => t('Activate Slide and Pause on Pager Hover'),
     '#default_value' => $view->options['views_slideshow_cycle']['pager_hover'],
     '#description' => t('Should the slide be activated and paused when hovering over a pager item.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')),
   );
   
@@ -469,7 +469,7 @@ function views_slideshow_cycle_views_sli
     '#options' => $weights,
     '#default_value' => $view->options['views_slideshow_cycle']['pager_weight'],
     '#description' => t('Determines in what order the pager appears.  A lower weight will cause the pager to be above higher weight items.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')),
   );
   
@@ -490,7 +490,7 @@ function views_slideshow_cycle_views_sli
     '#options' => $weights,
     '#default_value' => $view->options['views_slideshow_cycle']['controls_weight'],
     '#description' => t('Determines in what order the controls appear.  A lower weight will cause the controls to be above higher weight items.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-controls' => array('top', 'bottom')),
   );
   
@@ -512,13 +512,13 @@ function views_slideshow_cycle_views_sli
     '#options' => $weights,
     '#default_value' => $view->options['views_slideshow_cycle']['slide_counter_weight'],
     '#description' => t('Determines in what order the slide counter appears.  A lower weight will cause the slide counter to be above higher weight items.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-slide-counter' => array('top', 'bottom')),
   );
   
   // Internet Explorer Tweaks
   $form['views_slideshow_cycle']['ie_tweaks'] = array(
-    '#value' => '<h2>' . t('Internet Explorer Tweaks') . '</h2>',
+    '#markup' => '<h2>' . t('Internet Explorer Tweaks') . '</h2>',
   );
   $form['views_slideshow_cycle']['cleartype'] = array(
     '#type' => 'checkbox',
@@ -538,12 +538,12 @@ function views_slideshow_cycle_views_sli
   
   // Advanced Options
   $form['views_slideshow_cycle']['advanced_options'] = array(
-    '#value' => '<h2>' . t('jQuery Cycle Custom Options') . '</h2>',
+    '#markup' => '<h2>' . t('jQuery Cycle Custom Options') . '</h2>',
   );
   $form['views_slideshow_cycle']['cycle_options'] = array(
     '#type' => 'checkbox',
     '#title' => t('View All jQuery Cycle Options'),
-    '#default_value' => $view->options['views_slideshow_cycle']['cycle_options'], 
+    '#default_value' => $view->options['views_slideshow_cycle']['cycle_options'],
   );
   
   // All the jquery cycle options according to
@@ -609,7 +609,7 @@ function views_slideshow_cycle_views_sli
       '#type' => 'checkbox',
       '#title' => t('Override !name setting', array('!name' => $name)),
       '#default_value' => $view->options['views_slideshow_cycle']['advanced_use_' . $lower_name],
-      '#process' => array('views_process_dependency'),
+      '#process' => array('ctools_dependent_process'),
       '#dependency' => array('edit-style-options-views-slideshow-cycle-cycle-options' => array(1)),
     );
     
@@ -618,7 +618,7 @@ function views_slideshow_cycle_views_sli
       '#title' => t('!lower_name', array('!lower_name' => $lower_name)),
       '#default_value' => $view->options['views_slideshow_cycle']['advanced_' . $lower_name],
       '#description' => $description,  // Don't need to wrap in t() since it's done above.
-      '#process' => array('views_process_dependency'),
+      '#process' => array('ctools_dependent_process'),
       '#dependency_count' => 2,
       '#dependency' => array(
         'edit-style-options-views-slideshow-cycle-cycle-options' => array(1),
@@ -629,7 +629,7 @@ function views_slideshow_cycle_views_sli
 }
 
 /**
- * Implementation of hook_views_slideshow_cycle_pager_settings
+ * Implements hook_views_slideshow_cycle_pager_settings().
  */
 function views_slideshow_cycle_views_slideshow_cycle_pager_settings($view, $option_values, $dependency_prefix) {
   // Settings for Numbered Pager
@@ -674,7 +674,7 @@ function views_slideshow_cycle_views_sli
           '#description' => t("Choose the fields that will appear in the pager."),
           '#prefix' => '<div id="edit-style-options-views-slideshow-cycle-pager-fields-wrapper"><div id="edit-style-options-views-slideshow-cycle-pager-fields">',
           '#process' => array(
-            'expand_checkboxes',
+            'form_process_checkboxes',
           ),
           '#suffix' => '</div></div>',
         ),
@@ -713,7 +713,7 @@ function views_slideshow_cycle_get_skins
   if (empty($skins)) {
     $skins = array();
     foreach (module_implements('views_slideshow_cycle_skins') as $module) {
-      $skin_items = call_user_func($module .'_views_slideshow_cycle_skins');
+      $skin_items = call_user_func($module . '_views_slideshow_cycle_skins');
       if (isset($skin_items) && is_array($skin_items)) {
         foreach (array_keys($skin_items) as $skin) {
           // Ensure that the definition is complete, so we don't need lots
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-controls.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-controls.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,4 +1,4 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $rendered_control_previous; ?>
   <?php print $rendered_control_pause; ?>
   <?php print $rendered_control_next; ?>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-main-frame-row-item.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-main-frame-row-item.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $item; ?>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-main-frame-row.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-main-frame-row.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $rendered_items; ?>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-main-frame.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-main-frame.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $rendered_rows; ?>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-pager-field-item.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-pager-field-item.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $item; ?>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-pager-field.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-pager-field.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php print drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <?php print $rendered_field_items; ?>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-pager-numbered.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 views-slideshow-cycle-pager-numbered.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php	29 Sep 2010 03:07:49 -0000	1.1.2.2
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,4 +1 @@
-<?php
-  $attributes['class'] .= ' views_slideshow_pager_numbered';
-?>
-<div<?php print drupal_attributes($attributes); ?>></div>
+<div<?php print $attributes; ?>></div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-pager-thumbnails.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 views-slideshow-cycle-pager-thumbnails.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php	29 Sep 2010 03:07:49 -0000	1.1.2.2
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,4 +1 @@
-<?php
-  $attributes['class'] .= ' views_slideshow_pager_thumbnails';
-?>
-<div<?php print drupal_attributes($attributes); ?>></div>
+<div<?php print $attributes; ?>></div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle-slide-counter.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle-slide-counter.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -1,3 +1,3 @@
-<div<?php drupal_attributes($attributes); ?>>
+<div<?php print $attributes; ?>>
   <span class="num">1</span> <?php print t('of'); ?> <span class="total">1</span>
 </div>
Index: contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views-slideshow-cycle.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle.tpl.php
--- contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php	27 Sep 2010 05:27:50 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php	14 Dec 2010 15:10:16 -0000
@@ -9,7 +9,7 @@
 
 <div class="skin-<?php print $options['views_slideshow_cycle']['skin']; ?>">
   <?php if (isset($top_widget_rendered)): ?>
-    <div class="views-slideshow-controls-top clear-block">
+    <div class="views-slideshow-controls-top clearfix">
       <?php print $top_widget_rendered; ?>
     </div>
   <?php endif; ?>
@@ -17,7 +17,7 @@
   <?php print $slideshow; ?>
   
   <?php if (isset($bottom_widget_rendered)): ?>
-    <div class="views-slideshow-controls-bottom clear-block">
+    <div class="views-slideshow-controls-bottom clearfix">
       <?php print $bottom_widget_rendered; ?>
     </div>
   <?php endif; ?>
Index: contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/theme/Attic/views_slideshow_cycle.theme.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 views_slideshow_cycle.theme.inc
--- contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc	29 Sep 2010 07:18:41 -0000	1.1.2.3
+++ contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc	14 Dec 2010 15:10:16 -0000
@@ -64,9 +64,9 @@ function template_preprocess_views_slide
   // to the id to make it unique.
   $slideshow_count = 1;
   $current_settings = drupal_add_js();
-  foreach ($current_settings['setting'] AS $current_setting) {
+  foreach ($current_settings['settings']['data'] AS $current_setting) {
     if (isset($current_setting['viewsSlideshowCycle'])) {
-      $current_keys = array_keys($current_setting['viewsSlideshowCycle']);
+      $current_keys = isset($current_setting['viewsSlideshowCycle']) ? array_keys($current_setting['viewsSlideshowCycle']) : array();
       if (stristr($current_keys[0], '#views_slideshow_cycle_main_' . $vss_id)) {
         $slideshow_count++;
       }
@@ -96,17 +96,17 @@ function template_preprocess_views_slide
   // Enqueue any stylesheets set for the skin on this view are added.
   $skin_path = drupal_get_path('module', $skin_info['module']);
   if ($skin_info['path']) {
-    $skin_path .= '/'. $skin_info['path'];
+    $skin_path .= '/' . $skin_info['path'];
   }
   
   if (!empty($skin_info['stylesheets'])) {
     foreach ($skin_info['stylesheets'] as $stylesheet) {
-      drupal_add_css($skin_path .'/'. $stylesheet);
+      drupal_add_css($skin_path . '/' . $stylesheet);
     }
   }
 
-  $hidden_elements = theme('views_slideshow_cycle_main_frame', $view, $rows, $vss_id, $options['mode']);
-  $vars['slideshow'] = theme('views_slideshow_main_section', $vss_id, $hidden_elements, 'views_slideshow_cycle');
+  $hidden_elements = theme('views_slideshow_cycle_main_frame', array('view' => $view, 'rows' => $rows, 'vss_id' => $vss_id, 'mode' => $options['mode']));
+  $vars['slideshow'] = theme('views_slideshow_main_section', array('id' => $vss_id, 'hidden_elements' => $hidden_elements, 'plugin' => 'views_slideshow_cycle'));
   
   $weight = array(
     'top' => array(),
@@ -144,7 +144,7 @@ function template_preprocess_views_slide
       
       $vars[$location . '_widget_rendered'] = '';
       foreach ($data as $type => $order) {
-        $vars[$type] = theme('views_slideshow_cycle_' . $type, $vss_id, $view, $options);
+        $vars[$type] = theme('views_slideshow_cycle_' . $type, array('vss_id' => $vss_id, 'view' => $view, 'options' => $options));
         $vars[$location . '_widget_rendered'] .= $vars[$type];
       }
     }
@@ -159,8 +159,8 @@ function template_preprocess_views_slide
 
 function template_preprocess_views_slideshow_cycle_main_frame(&$vars) {
   // Add the slideshow elements.
-  $vars['attributes']['id'] = "views_slideshow_cycle_teaser_section_" . $vars['vss_id'];
-  $vars['attributes']['class'] = 'views_slideshow_cycle_teaser_section';
+  $vars['attributes_array']['id'] = "views_slideshow_cycle_teaser_section_" . $vars['vss_id'];
+  $vars['attributes_array']['class'] = array('views_slideshow_cycle_teaser_section', 'clearfix');
   
   $styles = '';
   if (isset($vars['view']->display_handler->display->display_options['style_options']['views_slideshow_cycle'])) {
@@ -191,7 +191,7 @@ function template_preprocess_views_slide
   foreach ($vars['rows'] as $count => $item) {
     $items[] = $item;
     if (count($items) == $items_per_slide || $count == (count($rows)-1)) {
-      $rendered_rows .= theme('views_slideshow_cycle_main_frame_row', $items, $vars['vss_id'], $slideshow_count);
+      $rendered_rows .= theme('views_slideshow_cycle_main_frame_row', array('items' => $items, 'vss_id' => $vars['vss_id'], 'count' => $slideshow_count));
       $items = array();
       $slideshow_count++;
     }
@@ -216,12 +216,12 @@ function template_preprocess_views_slide
   }
   $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd';
 
-  $vars['attributes']['class'] = implode(' ', $classes);
-  $vars['attributes']['id'] = "views_slideshow_cycle_div_" . $vars['vss_id'] . "_" . $vars['count'];
+  $vars['attributes_array']['class'] = $classes;
+  $vars['attributes_array']['id'] = "views_slideshow_cycle_div_" . $vars['vss_id'] . "_" . $vars['count'];
 
   $vars['rendered_items'] = '';
   foreach ($vars['items'] as $item_count => $item) {
-    $vars['rendered_items'] .= theme('views_slideshow_cycle_main_frame_row_item', $item, $item_count);
+    $vars['rendered_items'] .= theme('views_slideshow_cycle_main_frame_row_item', array('item' => $item, 'item_count' => $item_count));
   }
 }
 
@@ -236,7 +236,7 @@ function template_preprocess_views_slide
   else {
     $classes[] = 'views-row-odd';
   }
-  $vars['attributes']['class'] = implode(' ', $classes);
+  $vars['attributes_array']['class'] = $classes;
 }
 
 /**
@@ -250,17 +250,17 @@ function template_preprocess_views_slide
     'views_slideshow_controls',
   );
 
-  $vars['attributes']['class'] = implode(' ', $classes);
-  $vars['attributes']['id'] = "views_slideshow_cycle_controls_" . $vars['vss_id'];
-  
-  $vars['rendered_control_previous'] = theme('views_slideshow_cycle_control_previous', $vars['vss_id'], $vars['view'], $vars['options']);
+  $vars['attributes_array']['class'] = $classes;
+  $vars['attributes_array']['id'] = "views_slideshow_cycle_controls_" . $vars['vss_id'];
+
+  $vars['rendered_control_previous'] = theme('views_slideshow_cycle_control_previous', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options']));
 
   $vars['rendered_control_pause'] = '';
   if ($vars['options']['views_slideshow_cycle']['timeout']) {
-    $vars['rendered_control_pause'] = theme('views_slideshow_cycle_control_pause', $vars['vss_id'], $vars['view'], $vars['options']);
+    $vars['rendered_control_pause'] = theme('views_slideshow_cycle_control_pause', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options']));
   }
-  
-  $vars['rendered_control_next'] = theme('views_slideshow_cycle_control_next', $vars['vss_id'], $vars['view'], $vars['options']);
+
+  $vars['rendered_control_next'] = theme('views_slideshow_cycle_control_next', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options']));
 }
 
 /**
@@ -271,7 +271,7 @@ function template_preprocess_views_slide
 function template_preprocess_views_slideshow_cycle_control_previous(&$vars) {
   $vars['rendered_previous_link'] = l(t('Previous'), '#', array(
     'attributes' => array(
-      'class' => 'views_slideshow_cycle_previous views_slideshow_previous',
+      'class' => array('views_slideshow_cycle_previous', 'views_slideshow_previous'),
       'id' => "views_slideshow_cycle_prev_" . $vars['vss_id'],
     ),
     'fragment' => ' ',
@@ -287,7 +287,7 @@ function template_preprocess_views_slide
 function template_preprocess_views_slideshow_cycle_control_pause(&$vars) {
   $vars['rendered_pause_link'] = l(t('Pause'), '', array(
     'attributes' => array(
-      'class' => 'views_slideshow_cycle_pause views_slideshow_pause',
+      'class' => array('views_slideshow_cycle_pause', 'views_slideshow_pause'),
       'id' => "views_slideshow_cycle_playpause_" . $vars['vss_id'],
     ),
     'fragment' => ' ',
@@ -303,7 +303,7 @@ function template_preprocess_views_slide
 function template_preprocess_views_slideshow_cycle_control_next(&$vars) {
   $vars['rendered_next_link'] = l(t('Next'), '#', array(
     'attributes' => array(
-      'class' => 'views_slideshow_cycle_next views_slideshow_next',
+      'class' => array('views_slideshow_cycle_next', 'views_slideshow_next'),
       'id' => "views_slideshow_cycle_next_" . $vars['vss_id'],
     ),
     'fragment' => ' ',
@@ -316,13 +316,15 @@ function template_preprocess_views_slide
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_cycle_pager($vss_id, $view, $options) {
+function theme_views_slideshow_cycle_pager($vars) {
   $output = '';
-
+  $vss_id = $vars['vss_id'];
+  $view = $vars['view'];
+  $options = $vars['options'];
   // Create some attributes
-  $attributes['class'] = 'views_slideshow_cycle_pager';
+  $attributes['class'] = array('views_slideshow_cycle_pager');
   $attributes['id'] = 'views_slideshow_cycle_pager_' . $vss_id;
-  
+
   // Allow other modules change the output
   // Using foreach instead of module_invoke_all because module_invoke_all
   // doesn't support pass by reference.
@@ -335,35 +337,37 @@ function theme_views_slideshow_cycle_pag
 }
 
 /**
- * Implementation of hook_views_slideshow_cycle_pager_theme.
+ * Implements hook_views_slideshow_cycle_pager_theme().
  */
 function views_slideshow_cycle_views_slideshow_cycle_pager_theme(&$output, $vss_id, $view, $options, $attributes) {
   switch ($options['pager_type']) {
     case 'numbered':
-      $output = theme('views_slideshow_cycle_pager_numbered', $view, $attributes, $options);
+      $attributes['class'][] = 'views_slideshow_pager_numbered';
+      $output = theme('views_slideshow_cycle_pager_numbered', array('view' => $view, 'attributes_array' => $attributes, 'options' => $options));
       break;
     
     case 'thumbnails':
-      $output = theme('views_slideshow_cycle_pager_thumbnails', $view, $attributes, $options);
+      $attributes['class'][] = 'views_slideshow_pager_thumbnails';
+      $output = theme('views_slideshow_cycle_pager_thumbnails', array('view' => $view, 'attributes_array' => $attributes, 'options' => $options));
       break;
     
     case 'fields':
-      $output = theme('views_slideshow_cycle_pager_field', $view, $attributes, $options);
+      $output = theme('views_slideshow_cycle_pager_field', array('view' => $view, 'attributes_array' => $attributes, 'options' => $options));
       break;
   }
 }
 
 function template_preprocess_views_slideshow_cycle_pager_field(&$vars) {
-  $vars['attributes']['class'] .= ' views_slideshow_pager_field';
+  $vars['attributes_array']['class'][] = ' views_slideshow_pager_field';
   $vars['rendered_field_items'] = '';
   foreach ($vars['view']->result as $count => $node) {
     $rendered_fields = '';
     foreach ($vars['options']['pager_fields'] as $field => $use) {
       if ($use !== 0 && is_object($vars['view']->field[$field])) {
-        $rendered_fields .= theme('views_slideshow_cycle_pager_field_field', $vars['view'], $field, $count);
+        $rendered_fields .= theme('views_slideshow_cycle_pager_field_field', array('view' => $vars['view'], 'field' => $field, 'count' => $count));
       }
     }
-    $vars['rendered_field_items'] .= theme('views_slideshow_cycle_pager_field_item', $rendered_fields, $vars['vss_id'], $count);
+    $vars['rendered_field_items'] .= theme('views_slideshow_cycle_pager_field_item', array('item' => $rendered_fields, 'vss_id' => $vars['vss_id'], 'count' => $count));
   }
 }
 
@@ -382,8 +386,8 @@ function template_preprocess_views_slide
   }
   $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd';
 
-  $vars['attributes']['class'] = implode(' ', $classes);
-  $vars['attributes']['id'] = 'views_slideshow_cycle_div_pager_item_' . $vars['vss_id'] . '_' . $vars['count'];
+  $vars['attributes_array']['class'] = $classes;
+  $vars['attributes_array']['id'] = 'views_slideshow_cycle_div_pager_item_' . $vars['vss_id'] . '_' . $vars['count'];
 }
 
 /**
@@ -392,6 +396,6 @@ function template_preprocess_views_slide
  * @ingroup themeable
  */
 function template_preprocess_views_slideshow_cycle_slide_counter(&$vars) {
-  $vars['attributes']['class'] = 'views_slideshow_cycle_slide_counter views_slideshow_slide_counter';
-  $vars['attributes']['id'] = "views_slideshow_cycle_slide_counter_" . $vars['vss_id'];
+  $vars['attributes_array']['class'] = array('views_slideshow_cycle_slide_counter', 'views_slideshow_slide_counter');
+  $vars['attributes_array']['id'] = "views_slideshow_cycle_slide_counter_" . $vars['vss_id'];
 }
Index: contrib/views_slideshow_singleframe/views_slideshow.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow.js,v
retrieving revision 1.1.2.1.2.27.2.14
diff -u -p -r1.1.2.1.2.27.2.14 views_slideshow.js
--- contrib/views_slideshow_singleframe/views_slideshow.js	4 Sep 2010 07:14:35 -0000	1.1.2.1.2.27.2.14
+++ contrib/views_slideshow_singleframe/views_slideshow.js	14 Dec 2010 15:10:16 -0000
@@ -5,210 +5,214 @@
  *  A simple jQuery SingleFrame Div Slideshow Rotator.
  */
 
+(function ($) {
+
 /**
  * This will set our initial behavior, by starting up each individual slideshow.
  */
-Drupal.behaviors.viewsSlideshowSingleFrame = function (context) {
-  $('.views_slideshow_singleframe_main:not(.viewsSlideshowSingleFrame-processed)', context).addClass('viewsSlideshowSingleFrame-processed').each(function() {
-    var fullId = '#' + $(this).attr('id');
-    var settings = Drupal.settings.viewsSlideshowSingleFrame[fullId];
-    settings.targetId = '#' + $(fullId + " :first").attr('id');
-    settings.paused = false;
-
-    settings.opts = {
-      speed:settings.speed,
-      timeout:parseInt(settings.timeout),
-      delay:parseInt(settings.delay),
-      sync:settings.sync==1,
-      random:settings.random==1,
-      pause:false,
-      allowPagerClickBubble:(settings.pager_hover==1 || settings.pager_click_to_page),
-      prev:(settings.controls > 0)?'#views_slideshow_singleframe_prev_' + settings.vss_id:null,
-      next:(settings.controls > 0)?'#views_slideshow_singleframe_next_' + settings.vss_id:null,
-      pager:(settings.pager > 0)?'#views_slideshow_singleframe_pager_' + settings.vss_id:null,
-      nowrap:parseInt(settings.nowrap),
-      pagerAnchorBuilder: function(idx, slide) {
-        var classes = 'pager-item pager-num-' + (idx+1);
-        if (idx == 0) {
-          classes += ' first';
-        }
-        if ($(slide).siblings().length == idx) {
-          classes += ' last';
-        }
+Drupal.behaviors.viewsSlideshowSingleFrame = {
+  attach: function(context, settings) {
+    $('.views_slideshow_singleframe_main:not(.viewsSlideshowSingleFrame-processed)', context).addClass('viewsSlideshowSingleFrame-processed').each(function() {
+      var fullId = '#' + $(this).attr('id');
+      var settings = Drupal.settings.viewsSlideshowSingleFrame[fullId];
+      settings.targetId = '#' + $(fullId + " :first").attr('id');
+      settings.paused = false;
+
+      settings.opts = {
+        speed:settings.speed,
+        timeout:parseInt(settings.timeout),
+        delay:parseInt(settings.delay),
+        sync:settings.sync==1,
+        random:settings.random==1,
+        pause:false,
+        allowPagerClickBubble:(settings.pager_hover==1 || settings.pager_click_to_page),
+        prev:(settings.controls > 0)?'#views_slideshow_singleframe_prev_' + settings.vss_id:null,
+        next:(settings.controls > 0)?'#views_slideshow_singleframe_next_' + settings.vss_id:null,
+        pager:(settings.pager > 0)?'#views_slideshow_singleframe_pager_' + settings.vss_id:null,
+        nowrap:parseInt(settings.nowrap),
+        pagerAnchorBuilder: function(idx, slide) {
+          var classes = 'pager-item pager-num-' + (idx+1);
+          if (idx == 0) {
+            classes += ' first';
+          }
+          if ($(slide).siblings().length == idx) {
+            classes += ' last';
+          }
 
-        if (idx % 2) {
-          classes += ' odd';
-        }
-        else {
-          classes += ' even';
-        }
+          if (idx % 2) {
+            classes += ' odd';
+          }
+          else {
+            classes += ' even';
+          }
         
-        var theme = 'viewsSlideshowPager' + settings.pager_type;
-        return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : '';
-      },
-      after:function(curr, next, opts) {
-        // Used for Image Counter.
-        if (settings.image_count) {
-          $('#views_slideshow_singleframe_image_count_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
-          $('#views_slideshow_singleframe_image_count_' + settings.vss_id + ' span.total').html(opts.slideCount);
-        }
-      },
-      before:function(curr, next, opts) {
-        // Remember last slide.
-        if (settings.remember_slide) {
-          createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days);
-        }
+          var theme = 'viewsSlideshowPager' + settings.pager_type;
+          return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : '';
+        },
+        after:function(curr, next, opts) {
+          // Used for Image Counter.
+          if (settings.image_count) {
+            $('#views_slideshow_singleframe_image_count_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
+            $('#views_slideshow_singleframe_image_count_' + settings.vss_id + ' span.total').html(opts.slideCount);
+          }
+        },
+        before:function(curr, next, opts) {
+          // Remember last slide.
+          if (settings.remember_slide) {
+            createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days);
+          }
 
-        // Make variable height.
-        if (settings.fixed_height == 0) {
-          //get the height of the current slide
-          var $ht = $(this).height();
-          //set the container's height to that of the current slide
-          $(this).parent().animate({height: $ht});
-        }
-      },
-      cleartype:(settings.ie.cleartype == 'true')? true : false,
-      cleartypeNoBg:(settings.ie.cleartypenobg == 'true')? true : false
-    }
+          // Make variable height.
+          if (settings.fixed_height == 0) {
+            //get the height of the current slide
+            var $ht = $(this).height();
+            //set the container's height to that of the current slide
+            $(this).parent().animate({height: $ht});
+          }
+        },
+        cleartype:(settings.ie.cleartype == 'true')? true : false,
+        cleartypeNoBg:(settings.ie.cleartypenobg == 'true')? true : false
+      }
     
-    // Set the starting slide if we are supposed to remember the slide
-    if (settings.remember_slide) {
-      var startSlide = readCookie(settings.vss_id);
-      if (startSlide == null) {
-        startSlide = 0;
+      // Set the starting slide if we are supposed to remember the slide
+      if (settings.remember_slide) {
+        var startSlide = readCookie(settings.vss_id);
+        if (startSlide == null) {
+          startSlide = 0;
+        }
+        settings.opts.startingSlide =  startSlide;
       }
-      settings.opts.startingSlide =  startSlide;
-    }
 
-    if (settings.pager_hover == 1) {
-      settings.opts.pagerEvent = 'mouseover';
-      settings.opts.pauseOnPagerHover = true;
-    }
+      if (settings.pager_hover == 1) {
+        settings.opts.pagerEvent = 'mouseover';
+        settings.opts.pauseOnPagerHover = true;
+      }
 
-    if (settings.effect == 'none') {
-      settings.opts.speed = 1;
-    }
-    else {
-      settings.opts.fx = settings.effect;
-    }
+      if (settings.effect == 'none') {
+        settings.opts.speed = 1;
+      }
+      else {
+        settings.opts.fx = settings.effect;
+      }
 
-    // Pause on hover.
-    if (settings.pause == 1) {
-      $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).hover(function() {
-        $(settings.targetId).cycle('pause');
-      }, function() {
-        if (settings.paused == false) {
-          $(settings.targetId).cycle('resume');
-        }
-      });
-    }
+      // Pause on hover.
+      if (settings.pause == 1) {
+        $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).hover(function() {
+          $(settings.targetId).cycle('pause');
+        }, function() {
+          if (settings.paused == false) {
+            $(settings.targetId).cycle('resume');
+          }
+        });
+      }
 
-    // Pause on clicking of the slide.
-    if (settings.pause_on_click == 1) {
-      $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).click(function() { 
-        viewsSlideshowSingleFramePause(settings);
-      });
-    }
+      // Pause on clicking of the slide.
+      if (settings.pause_on_click == 1) {
+        $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).click(function() { 
+          viewsSlideshowSingleFramePause(settings);
+        });
+      }
 
-    // Add additional settings.
-		if (settings.advanced != "\n") {
-      var advanced = settings.advanced.split("\n");
-      for (i=0; i<advanced.length; i++) {
-        var prop = '';
-        var value = '';
-        var property = advanced[i].split(":");
-        for (j=0; j<property.length; j++) {
-          if (j == 0) {
-            prop = property[j];
+      // Add additional settings.
+      if (settings.advanced != "\n") {
+        var advanced = settings.advanced.split("\n");
+        for (i=0; i<advanced.length; i++) {
+          var prop = '';
+          var value = '';
+          var property = advanced[i].split(":");
+          for (j=0; j<property.length; j++) {
+            if (j == 0) {
+              prop = property[j];
+            }
+            else if (j == 1) {
+              value = property[j];
+            }
+            else {
+              value += ":" + property[j];
+            }
           }
-          else if (j == 1) {
-            value = property[j];
+
+          // Need to evaluate so true, false and numerics aren't a string.
+          if (value == 'true' || value == 'false' || IsNumeric(value)) {
+            value = eval(value);
           }
           else {
-            value += ":" + property[j];
+            // Parse strings into functions.
+            var func = value.match(/function\s*\((.*?)\)\s*\{(.*)\}/i);
+            if (func) {
+              value = new Function(func[1].match(/(\w+)/g), func[2]);
+            }
           }
-        }
-
-        // Need to evaluate so true, false and numerics aren't a string.
-        if (value == 'true' || value == 'false' || IsNumeric(value)) {
-          value = eval(value);
-        }
-        else {
-          // Parse strings into functions.
-          var func = value.match(/function\s*\((.*?)\)\s*\{(.*)\}/i);
-          if (func) {
-            value = new Function(func[1].match(/(\w+)/g), func[2]);
-          }
-        }
 	
-        // Call both functions if prop was set previously.
-        if (typeof(value) == "function" && prop in settings.opts) {
-          var callboth = function(before_func, new_func) {
-            return function() {
-              before_func.apply(null, arguments);
-              new_func.apply(null, arguments);
+          // Call both functions if prop was set previously.
+          if (typeof(value) == "function" && prop in settings.opts) {
+            var callboth = function(before_func, new_func) {
+              return function() {
+                before_func.apply(null, arguments);
+                new_func.apply(null, arguments);
+              };
             };
-          };
-          settings.opts[prop] = callboth(settings.opts[prop], value);
-        }
-        else {
-          settings.opts[prop] = value;
+            settings.opts[prop] = callboth(settings.opts[prop], value);
+          }
+          else {
+            settings.opts[prop] = value;
+          }
         }
       }
-    }
     
-    $(settings.targetId).cycle(settings.opts);
+      $(settings.targetId).cycle(settings.opts);
 
-    // Start Paused
-    if (settings.start_paused) {
-      viewsSlideshowSingleFramePause(settings);
-    }
+      // Start Paused
+      if (settings.start_paused) {
+        viewsSlideshowSingleFramePause(settings);
+      }
     
-    // Pause if hidden.
-    if (settings.pause_when_hidden) {
-      var checkPause = function(settings) {
-        // If the slideshow is visible and it is paused then resume.
-        // otherwise if the slideshow is not visible and it is not paused then
-        // pause it.
-        var visible = viewsSlideshowSingleFrameIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible);
-        if (visible && settings.paused) {
-          viewsSlideshowSingleFrameResume(settings);
-        }
-        else if (!visible && !settings.paused) {
-          viewsSlideshowSingleFramePause(settings);
+      // Pause if hidden.
+      if (settings.pause_when_hidden) {
+        var checkPause = function(settings) {
+          // If the slideshow is visible and it is paused then resume.
+          // otherwise if the slideshow is not visible and it is not paused then
+          // pause it.
+          var visible = viewsSlideshowSingleFrameIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible);
+          if (visible && settings.paused) {
+            viewsSlideshowSingleFrameResume(settings);
+          }
+          else if (!visible && !settings.paused) {
+            viewsSlideshowSingleFramePause(settings);
+          }
         }
-      }
      
-      // Check when scrolled.
-      $(window).scroll(function() {
-       checkPause(settings);
-      });
+        // Check when scrolled.
+        $(window).scroll(function() {
+         checkPause(settings);
+        });
       
-      // Check when the window is resized.
-      $(window).resize(function() {
-        checkPause(settings);
-      });
-    }
+        // Check when the window is resized.
+        $(window).resize(function() {
+          checkPause(settings);
+        });
+      }
 
-    // Show image count for people who have js enabled.
-    $('#views_slideshow_singleframe_image_count_' + settings.vss_id).show();
+      // Show image count for people who have js enabled.
+      $('#views_slideshow_singleframe_image_count_' + settings.vss_id).show();
 
-    if (settings.controls > 0) {
-      // Show controls for people who have js enabled browsers.
-      $('#views_slideshow_singleframe_controls_' + settings.vss_id).show();
+      if (settings.controls > 0) {
+        // Show controls for people who have js enabled browsers.
+        $('#views_slideshow_singleframe_controls_' + settings.vss_id).show();
       
-      $('#views_slideshow_singleframe_playpause_' + settings.vss_id).click(function(e) {
-      	if (settings.paused) {
-      	  viewsSlideshowSingleFrameResume(settings);
-      	}
-      	else {
-      	  viewsSlideshowSingleFramePause(settings);
-      	}
-        e.preventDefault();
-      });
-    }
-  });
-}
+        $('#views_slideshow_singleframe_playpause_' + settings.vss_id).click(function(e) {
+        	if (settings.paused) {
+        	  viewsSlideshowSingleFrameResume(settings);
+        	}
+        	else {
+        	  viewsSlideshowSingleFramePause(settings);
+        	}
+          e.preventDefault();
+        });
+      }
+    });
+  }
+};
 
 // Pause the slideshow 
 viewsSlideshowSingleFramePause = function (settings) {
@@ -411,3 +415,4 @@ function viewsSlideshowSingleFrameIsVisi
   }
 }
 
+})(jQuery);
\ No newline at end of file
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.info,v
retrieving revision 1.1.2.1.4.1
diff -u -p -r1.1.2.1.4.1 views_slideshow_singleframe.info
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.info	24 Jul 2010 19:01:25 -0000	1.1.2.1.4.1
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.info	14 Dec 2010 15:10:16 -0000
@@ -3,4 +3,8 @@ name = Views Slideshow: SingleFrame (Leg
 description = Adds a Single Frame slideshow mode to Views Slideshows.
 dependencies[] = views_slideshow
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_slideshow_singleframe.module
+files[] = views_slideshow_singleframe.theme.inc
+files[] = views_slideshow_singleframe.views.inc
+files[] = views_slideshow_singleframe.views_slideshow.inc
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.module,v
retrieving revision 1.1.2.1.2.6.2.1
diff -u -p -r1.1.2.1.2.6.2.1 views_slideshow_singleframe.module
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.module	18 May 2010 05:18:15 -0000	1.1.2.1.2.6.2.1
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.module	14 Dec 2010 15:10:16 -0000
@@ -22,12 +22,12 @@ function views_slideshow_singleframe_ini
 
   // Otherwise, we'll add the version included with this module.
   if (!$js) {
-    drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js');
+    drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js', array('group' => JS_LIBRARY));
   }
 
   $module_path = drupal_get_path('module', 'views_slideshow_singleframe');
-  drupal_add_js($module_path . '/views_slideshow.js', 'module');
-  drupal_add_css($module_path . '/views_slideshow.css', 'module');
+  drupal_add_js($module_path . '/views_slideshow.js');
+  drupal_add_css($module_path . '/views_slideshow.css');
 }
 
 /**
@@ -36,40 +36,40 @@ function views_slideshow_singleframe_ini
 function views_slideshow_singleframe_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_singleframe' => array(
-      'arguments' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
+      'variables' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
       'template' => 'views-slideshow-singleframe',
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_controls' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_previous' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_pause' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_next' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_pager' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_image_count' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_no_display_section' => array(
-      'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
+      'variables' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),    
     'views_slideshow_singleframe_no_display_teaser' => array(
-      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
+      'variables' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
   );
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.17.2.13
diff -u -p -r1.1.2.1.2.17.2.13 views_slideshow_singleframe.views_slideshow.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc	29 Sep 2010 03:07:49 -0000	1.1.2.1.2.17.2.13
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc	14 Dec 2010 15:10:16 -0000
@@ -54,6 +54,7 @@ function views_slideshow_singleframe_vie
 }
 
 function views_slideshow_singleframe_views_slideshow_options_form(&$form, &$form_state, &$view) {
+  ctools_include('dependent');
   $form['views_slideshow_singleframe']['timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('Timer delay'),
@@ -123,7 +124,7 @@ function views_slideshow_singleframe_vie
     ),
     '#default_value' => $view->options['views_slideshow_singleframe']['pause_when_hidden_type'],
     '#description' => t('Choose how to calculate how much of the slide has to be shown. Entire Slide: All the slide has to be shown. Vertical: Set amount of height that has to be shown. Horizontal: Set amount of width that has to be shown. Area: Set total area that has to be shown.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-singleframe-pause-when-hidden' => array(1)),
   );
   $form['views_slideshow_singleframe']['amount_allowed_visible'] = array(
@@ -132,7 +133,7 @@ function views_slideshow_singleframe_vie
     '#default_value' => $view->options['views_slideshow_singleframe']['amount_allowed_visible'],
     '#description' => t("The amount of the slide that needs to be shown to have it rotate. You can set the value in percentage (ex: 50%) or in pixels (ex: 250). The slidehsow will not rotate until it's height/width/total area, depending on the calculation method you have chosen above, is less than the value you have entered in this field."),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency_count' => 2,
     '#dependency' => array(
       'edit-style-options-views-slideshow-singleframe-pause-when-hidden' => array(1),
@@ -155,7 +156,7 @@ function views_slideshow_singleframe_vie
     '#default_value' => $view->options['views_slideshow_singleframe']['remember_slide_days'],
     '#description' => t('The number of days to have the site remember the last slide. Default is 1'),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-singleframe-remember-slide' => array(1)),
   );
   $form['views_slideshow_singleframe']['controls'] = array(
@@ -178,7 +179,7 @@ function views_slideshow_singleframe_vie
     '#options' => array('Numbered' => t('Numbered'), 'Thumbnails' => t('Thumbnails')),
     '#default_value' => $view->options['views_slideshow_singleframe']['pager_type'],
     '#description' => t('What the pager should look like.  Thumbnails grabs the first image in each slideshow item.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-singleframe-pager' => array(1, 2)),
   );
   $form['views_slideshow_singleframe']['pager_hover'] = array(
@@ -187,7 +188,7 @@ function views_slideshow_singleframe_vie
     '#options' => array(1 => t('Yes'), 2 => t('No')),
     '#default_value' => $view->options['views_slideshow_singleframe']['pager_hover'],
     '#description' => t('Should the slide be activated and paused when hovering over a pager item.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-singleframe-pager' => array(1, 2)),
   );
   $form['views_slideshow_singleframe']['pager_click_to_page'] = array(
@@ -195,7 +196,7 @@ function views_slideshow_singleframe_vie
     '#title' => t('Make Pager Linked to Slide Link'),
     '#default_value' => $view->options['views_slideshow_singleframe']['pager_click_to_page'],
     '#description' => t('Should the pager use the main frame link so when it is clicked it goes to the same url that the main frame goes to when clicked.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-singleframe-pager' => array(1, 2)),
   );
   $form['views_slideshow_singleframe']['image_count'] = array(
Index: contrib/views_slideshow_thumbnailhover/views_slideshow.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow.js,v
retrieving revision 1.1.2.2.2.26.2.9
diff -u -p -r1.1.2.2.2.26.2.9 views_slideshow.js
--- contrib/views_slideshow_thumbnailhover/views_slideshow.js	4 Sep 2010 07:14:35 -0000	1.1.2.2.2.26.2.9
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.js	14 Dec 2010 15:10:16 -0000
@@ -5,6 +5,8 @@
  * A simple jQuery ThumbnailHover Div Slideshow Rotator.
  */
 
+(function ($) {
+
 /**
  * This will set our initial behavior, by starting up each individual slideshow.
  */
@@ -397,3 +399,5 @@ function viewsSlideshowThumbnailHoverIsV
     }
   }
 }
+
+})(jQuery);
\ No newline at end of file
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.info,v
retrieving revision 1.1.2.1.4.1
diff -u -p -r1.1.2.1.4.1 views_slideshow_thumbnailhover.info
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.info	24 Jul 2010 19:01:26 -0000	1.1.2.1.4.1
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.info	14 Dec 2010 15:10:16 -0000
@@ -3,4 +3,8 @@ name = Views Slideshow: ThumbnailHover (
 description = Adds a Thumbnail Hover slideshow mode to Views Slideshows.
 dependencies[] = views_slideshow
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_slideshow_thumnailhover.module
+files[] = views_slideshow_thumnailhover.theme.inc
+files[] = views_slideshow_thumnailhover.views.inc
+files[] = views_slideshow_thumbnailhover.views_slideshow.inc
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.module,v
retrieving revision 1.1.2.1.2.6.2.1
diff -u -p -r1.1.2.1.2.6.2.1 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	18 May 2010 05:18:15 -0000	1.1.2.1.2.6.2.1
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	14 Dec 2010 15:10:16 -0000
@@ -42,44 +42,44 @@ function views_slideshow_thumbnailhover_
 function views_slideshow_thumbnailhover_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_thumbnailhover' => array(
-      'arguments' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
+      'variables' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''),
       'template' => 'views-slideshow-thumbnailhover',
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_controls' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_previous' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_pause' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_next' =>array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_image_count' => array(
-      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
+      'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teaser' => array(
-      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
+      'variables' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_no_display_section' => array(
-      'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
+      'variables' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_no_display_teaser' => array(
-      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
+      'variables' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teasers' => array(
-      'arguments' => array('items' => NULL, 'vss_id' => NULL),
+      'variables' => array('items' => NULL, 'vss_id' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
   );
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.19.2.12
diff -u -p -r1.1.2.1.2.19.2.12 views_slideshow_thumbnailhover.views_slideshow.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc	29 Sep 2010 03:07:49 -0000	1.1.2.1.2.19.2.12
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc	14 Dec 2010 15:10:17 -0000
@@ -55,6 +55,7 @@ function views_slideshow_thumbnailhover_
 }
 
 function views_slideshow_thumbnailhover_views_slideshow_options_form(&$form, &$form_state, &$view) {
+  ctools_include('dependent');
   if (module_exists('hoverintent')) {
     $options = array('hover' => t('Hover'));
     $options['hoverIntent'] = t('HoverIntent');
@@ -178,7 +179,7 @@ function views_slideshow_thumbnailhover_
     ),
     '#default_value' => $view->options['views_slideshow_thumbnailhover']['pause_when_hidden_type'],
     '#description' => t('Choose how to calculate how much of the slide has to be shown. Entire Slide: All the slide has to be shown. Vertical: Set amount of height that has to be shown. Horizontal: Set amount of width that has to be shown. Area: Set total area that has to be shown.'),
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-thumbnailhover-pause-when-hidden' => array(1)),
   );
   $form['views_slideshow_thumbnailhover']['amount_allowed_visible'] = array(
@@ -187,7 +188,7 @@ function views_slideshow_thumbnailhover_
     '#default_value' => $view->options['views_slideshow_thumbnailhover']['amount_allowed_visible'],
     '#description' => t("The amount of the slide that needs to be shown to have it rotate. You can set the value in percentage (ex: 50%) or in pixels (ex: 250). The slidehsow will not rotate until it's height/width/total area, depending on the calculation method you have chosen above, is less than the value you have entered in this field."),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency_count' => 2,
     '#dependency' => array(
       'edit-style-options-views-slideshow-thumbnailhover-pause-when-hidden' => array(1),
@@ -210,7 +211,7 @@ function views_slideshow_thumbnailhover_
     '#default_value' => $view->options['views_slideshow_thumbnailhover']['remember_slide_days'],
     '#description' => t('The number of days to have the site remember the last slide. Default is 1'),
     '#size' => 4,
-    '#process' => array('views_process_dependency'),
+    '#process' => array('ctools_dependent_process'),
     '#dependency' => array('edit-style-options-views-slideshow-thumbnailhover-remember-slide' => array(1)),
   );
   $options = array('mouseover' => t('Hover'), 'click' => t('Click'));