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.33
diff -u -p -r1.1.2.1.2.33 views_slideshow.js
--- contrib/views_slideshow_singleframe/views_slideshow.js	10 May 2010 05:35:39 -0000	1.1.2.1.2.33
+++ contrib/views_slideshow_singleframe/views_slideshow.js	15 May 2010 18:05:01 -0000
@@ -23,9 +23,9 @@ Drupal.behaviors.viewsSlideshowSingleFra
       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.id:null,
-      next:(settings.controls > 0)?'#views_slideshow_singleframe_next_' + settings.id:null,
-      pager:(settings.pager > 0)?'#views_slideshow_singleframe_pager_' + settings.id:null,
+      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);
@@ -49,8 +49,8 @@ Drupal.behaviors.viewsSlideshowSingleFra
       after:function(curr, next, opts) {
         // Used for Image Counter.
         if (settings.image_count) {
-          $('#views_slideshow_singleframe_image_count_' + settings.id + ' span.num').html(opts.currSlide + 1);
-          $('#views_slideshow_singleframe_image_count_' + settings.id + ' span.total').html(opts.slideCount);
+          $('#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) {
@@ -94,7 +94,7 @@ Drupal.behaviors.viewsSlideshowSingleFra
 
     // Pause on hover.
     if (settings.pause == 1) {
-      $('#views_slideshow_singleframe_teaser_section_' + settings.id).hover(function() {
+      $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).hover(function() {
         $(settings.targetId).cycle('pause');
       }, function() {
         if (settings.paused == false) {
@@ -105,7 +105,7 @@ Drupal.behaviors.viewsSlideshowSingleFra
 
     // Pause on clicking of the slide.
     if (settings.pause_on_click == 1) {
-      $('#views_slideshow_singleframe_teaser_section_' + settings.id).click(function() { 
+      $('#views_slideshow_singleframe_teaser_section_' + settings.vss_id).click(function() { 
         viewsSlideshowPause(settings);
       });
     }
@@ -165,13 +165,13 @@ Drupal.behaviors.viewsSlideshowSingleFra
     }
 
     // Show image count for people who have js enabled.
-    $('#views_slideshow_singleframe_image_count_' + settings.id).show();
+    $('#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.id).show();
+      $('#views_slideshow_singleframe_controls_' + settings.vss_id).show();
       
-      $('#views_slideshow_singleframe_playpause_' + settings.id).click(function(e) {
+      $('#views_slideshow_singleframe_playpause_' + settings.vss_id).click(function(e) {
       	if (settings.paused) {
       	  viewsSlideshowSingleFrameResume(settings);
       	}
@@ -191,7 +191,7 @@ viewsSlideshowSingleFramePause = functio
 
   $(settings.targetId).cycle('pause');
   if (settings.controls > 0) {
-    $('#views_slideshow_singleframe_playpause_' + settings.id)
+    $('#views_slideshow_singleframe_playpause_' + settings.vss_id)
       .addClass('views_slideshow_singleframe_play')
       .addClass('views_slideshow_play')
       .removeClass('views_slideshow_singleframe_pause')
@@ -205,7 +205,7 @@ viewsSlideshowSingleFramePause = functio
 viewsSlideshowSingleFrameResume = function (settings) {
   $(settings.targetId).cycle('resume');
   if (settings.controls > 0) {
-    $('#views_slideshow_singleframe_playpause_' + settings.id)
+    $('#views_slideshow_singleframe_playpause_' + settings.vss_id)
       .addClass('views_slideshow_singleframe_pause')
       .addClass('views_slideshow_pause')
       .removeClass('views_slideshow_singleframe_play')
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
diff -u -p -r1.1.2.1.2.6 views_slideshow_singleframe.module
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.module	27 Mar 2010 03:06:20 -0000	1.1.2.1.2.6
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.module	15 May 2010 18:05:01 -0000
@@ -41,35 +41,35 @@ function views_slideshow_singleframe_the
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_controls' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_previous' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_pause' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_control_next' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_pager' => array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
     'views_slideshow_singleframe_image_count' => array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => 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, 'id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
+      'arguments' => 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, 'id' => NULL, 'count' => NULL),
+      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_singleframe.theme.inc',
     ),
   );
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.theme.inc,v
retrieving revision 1.1.2.1.2.25
diff -u -p -r1.1.2.1.2.25 views_slideshow_singleframe.theme.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	14 May 2010 03:02:58 -0000	1.1.2.1.2.25
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	15 May 2010 18:05:01 -0000
@@ -11,50 +11,50 @@
  */
 function template_preprocess_views_slideshow_singleframe(&$vars) {
   $options = $vars['options'];
-  $id = $vars['id'];
   $rows = $vars['rows'];
   $view = $vars['view'];
+  $vss_id = $view->name . '-' . $view->current_display;
 
   $settings = array_merge(
     array(
       'num_divs' => sizeof($vars['rows']),
       'id_prefix' => '#views_slideshow_singleframe_main_',
       'div_prefix' => '#views_slideshow_singleframe_div_',
-      'id' => $vars['id'],
-      'view_id' => $view->name . '-' . $view->current_display,
+      'vss_id' => $vss_id,
+      'view_id' => $vss_id,
     ),
     $options['views_slideshow_singleframe']
   );
 
-  drupal_add_js(array('viewsSlideshowSingleFrame' => array('#views_slideshow_singleframe_main_'. $vars['id'] => $settings)), 'setting');
+  drupal_add_js(array('viewsSlideshowSingleFrame' => array('#views_slideshow_singleframe_main_' . $vss_id => $settings)), 'setting');
 
-  $hidden_elements = theme('views_slideshow_singleframe_no_display_section', $view, $rows, $id, $options['mode']);
-  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'views_slideshow_singleframe');
+  $hidden_elements = theme('views_slideshow_singleframe_no_display_section', $view, $rows, $vss_id, $options['mode']);
+  $vars['slideshow'] = theme('views_slideshow_main_section', $vss_id, $hidden_elements, 'views_slideshow_singleframe');
 
   $singleframe = $vars['options']['views_slideshow_singleframe'];
 
   // Only show controls when there is more than one result.
   if ($settings['num_divs'] > 1) {
     if ($singleframe['controls'] == 1) {
-      $vars['controls_top'] = theme('views_slideshow_singleframe_controls', $id, $view, $options);
+      $vars['controls_top'] = theme('views_slideshow_singleframe_controls', $vss_id, $view, $options);
     }
     elseif ($singleframe['controls'] == 2) {
-      $vars['controls_bottom'] = theme('views_slideshow_singleframe_controls', $id, $view, $options);
+      $vars['controls_bottom'] = theme('views_slideshow_singleframe_controls', $vss_id, $view, $options);
     }
   }
 
   if ($singleframe['pager'] == 1) {
-    $vars['pager_top'] = theme('views_slideshow_singleframe_pager', $id, $view, $options);
+    $vars['pager_top'] = theme('views_slideshow_singleframe_pager', $vss_id, $view, $options);
   }
   elseif ($singleframe['pager'] == 2) {
-    $vars['pager_bottom'] = theme('views_slideshow_singleframe_pager', $id, $view, $options);
+    $vars['pager_bottom'] = theme('views_slideshow_singleframe_pager', $vss_id, $view, $options);
   }
   
   if ($singleframe['image_count'] == 1) {
-    $vars['image_count_top'] = theme('views_slideshow_singleframe_image_count', $id, $view, $options);
+    $vars['image_count_top'] = theme('views_slideshow_singleframe_image_count', $vss_id, $view, $options);
   }
   elseif ($singleframe['image_count'] == 2) {
-    $vars['image_count_bottom'] = theme('views_slideshow_singleframe_image_count', $id, $view, $options);
+    $vars['image_count_bottom'] = theme('views_slideshow_singleframe_image_count', $vss_id, $view, $options);
   }
 }
 
@@ -63,15 +63,15 @@ function template_preprocess_views_slide
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_no_display_section($view, $rows, $id, $mode) {
+function theme_views_slideshow_singleframe_no_display_section($view, $rows, $vss_id, $mode) {
   // Add the slideshow elements.
-  $attributes['id'] = "views_slideshow_singleframe_teaser_section_$id";
+  $attributes['id'] = "views_slideshow_singleframe_teaser_section_" . $vss_id;
   $attributes['class'] = 'views_slideshow_singleframe_teaser_section';
   $attributes = drupal_attributes($attributes);
 
   $output = "<div$attributes>";
   foreach ($rows as $count => $item) {
-    $output .= theme('views_slideshow_singleframe_no_display_teaser', $item, $id, $count);
+    $output .= theme('views_slideshow_singleframe_no_display_teaser', $item, $vss_id, $count);
   }
   $output .= "</div>\n";
 
@@ -83,7 +83,7 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_no_display_teaser($item, $id, $count) {
+function theme_views_slideshow_singleframe_no_display_teaser($item, $vss_id, $count) {
   $current = $count + 1;
   $classes = array(
     'views_slideshow_singleframe_slide',
@@ -95,7 +95,7 @@ function theme_views_slideshow_singlefra
   $classes[] = ($count % 2) ? 'views-row-even' : 'views-row-odd';
 
   $attributes['class'] = implode(' ', $classes);
-  $attributes['id'] = "views_slideshow_singleframe_div_${id}_${count}";
+  $attributes['id'] = "views_slideshow_singleframe_div_" . $vss_id . "_" . $count;
   $attributes = drupal_attributes($attributes);
 
   return "<div$attributes>$item</div>\n";
@@ -106,22 +106,22 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_controls($id, $view, $options) {
+function theme_views_slideshow_singleframe_controls($vss_id, $view, $options) {
   $classes = array(
     'views_slideshow_singleframe_controls',
     'views_slideshow_controls',
   );
 
   $attributes['class'] = implode(' ', $classes);
-  $attributes['id'] = "views_slideshow_singleframe_controls_$id";
+  $attributes['id'] = "views_slideshow_singleframe_controls_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   $output = "<div$attributes>";
-  $output .= theme('views_slideshow_singleframe_control_previous', $id, $view, $options);
+  $output .= theme('views_slideshow_singleframe_control_previous', $vss_id, $view, $options);
   if ($options['views_slideshow_singleframe']['timeout']) {
-    $output .= theme('views_slideshow_singleframe_control_pause', $id, $view, $options);
+    $output .= theme('views_slideshow_singleframe_control_pause', $vss_id, $view, $options);
   }
-  $output .= theme('views_slideshow_singleframe_control_next', $id, $view, $options);
+  $output .= theme('views_slideshow_singleframe_control_next', $vss_id, $view, $options);
   $output .= "</div>\n";
   return $output;
 }
@@ -131,11 +131,11 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_control_previous($id, $view, $options) {
+function theme_views_slideshow_singleframe_control_previous($vss_id, $view, $options) {
   return l(t('Previous'), '#', array(
     'attributes' => array(
       'class' => 'views_slideshow_singleframe_previous views_slideshow_previous',
-      'id' => "views_slideshow_singleframe_prev_$id",
+      'id' => "views_slideshow_singleframe_prev_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -147,11 +147,11 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_control_pause($id, $view, $options) {
+function theme_views_slideshow_singleframe_control_pause($vss_id, $view, $options) {
   return l(t('Pause'), '', array(
     'attributes' => array(
       'class' => 'views_slideshow_singleframe_pause views_slideshow_pause',
-      'id' => "views_slideshow_singleframe_playpause_$id",
+      'id' => "views_slideshow_singleframe_playpause_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -163,11 +163,11 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_control_next($id, $view, $options) {
+function theme_views_slideshow_singleframe_control_next($vss_id, $view, $options) {
   return l(t('Next'), '#', array(
     'attributes' => array(
       'class' => 'views_slideshow_singleframe_next views_slideshow_next',
-      'id' => "views_slideshow_singleframe_next_$id",
+      'id' => "views_slideshow_singleframe_next_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -179,11 +179,11 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_pager($id, $view, $options) {
+function theme_views_slideshow_singleframe_pager($vss_id, $view, $options) {
   $pager_type = $options['views_slideshow_singleframe']['pager_type'];
 
   $attributes['class'] = "views_slideshow_singleframe_pager views_slideshow_pager$pager_type";
-  $attributes['id'] = "views_slideshow_singleframe_pager_$id";
+  $attributes['id'] = "views_slideshow_singleframe_pager_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   return "<div$attributes></div>";
@@ -194,9 +194,9 @@ function theme_views_slideshow_singlefra
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_singleframe_image_count($id, $view, $options) {
+function theme_views_slideshow_singleframe_image_count($vss_id, $view, $options) {
   $attributes['class'] = 'views_slideshow_singleframe_image_count views_slideshow_image_count';
-  $attributes['id'] = "views_slideshow_singleframe_image_count_$id";
+  $attributes['id'] = "views_slideshow_singleframe_image_count_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   $counter = '<span class="num">1</span> ' . t('of') . ' <span class="total">1</span>';
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.30
diff -u -p -r1.1.2.2.2.30 views_slideshow.js
--- contrib/views_slideshow_thumbnailhover/views_slideshow.js	10 May 2010 05:35:39 -0000	1.1.2.2.2.30
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.js	15 May 2010 18:05:01 -0000
@@ -23,16 +23,16 @@ Drupal.behaviors.viewsSlideshowThumbnail
       random:settings.random==1,
       pause:false,
       allowPagerClickBubble:(settings.pager_event=='click')? false : true,
-      pager:(settings.pager_event == 'hoverIntent') ? null : '#views_slideshow_breakout_teasers_' + settings.id,
+      pager:(settings.pager_event == 'hoverIntent') ? null : '#views_slideshow_breakout_teasers_' + settings.vss_id,
       nowrap:parseInt(settings.nowrap),
       pagerAnchorBuilder:(settings.pager_event == 'hoverIntent') ? null : function(idx, slide) { 
-        return '#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + idx; 
+        return '#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + idx; 
       },
       after:function(curr, next, opts) {
         // Used for Image Counter.
         if (settings.image_count) {
-          $('#views_slideshow_thumbnailhover_image_count_' + settings.id + ' span.num').html(opts.currSlide + 1);
-          $('#views_slideshow_thumbnailhover_image_count_' + settings.id + ' span.total').html(opts.slideCount);
+          $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
+          $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id + ' span.total').html(opts.slideCount);
         }
       },
       before:function(current, next) {
@@ -51,12 +51,12 @@ Drupal.behaviors.viewsSlideshowThumbnail
         
         var currId = (currId=$(current).attr('id')).substring(currId.lastIndexOf('_')+1)
         var nextId = (nextId=$(next).attr('id')).substring(nextId.lastIndexOf('_')+1)
-        $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + currId).removeClass('activeSlide');
-        $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + nextId).addClass('activeSlide');
+        $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + currId).removeClass('activeSlide');
+        $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + nextId).addClass('activeSlide');
       },
       pagerEvent: (settings.pager_event == 'hoverIntent') ? null : settings.pager_event,
-      prev:(settings.controls > 0)?'#views_slideshow_thumbnailhover_prev_' + settings.id:null,
-      next:(settings.controls > 0)?'#views_slideshow_thumbnailhover_next_' + settings.id:null,
+      prev:(settings.controls > 0)?'#views_slideshow_thumbnailhover_prev_' + settings.vss_id:null,
+      next:(settings.controls > 0)?'#views_slideshow_thumbnailhover_next_' + settings.vss_id:null,
       cleartype:(settings.ie.cleartype == 'true')? true : false,
       cleartypeNoBg:(settings.ie.cleartypenobg == 'true')? true : false
     };
@@ -79,7 +79,7 @@ Drupal.behaviors.viewsSlideshowThumbnail
 
     // Pause on hover.
     if (settings.pause == 1) {
-      $('#views_slideshow_thumbnailhover_teaser_section_' + settings.id).hover(function() {
+      $('#views_slideshow_thumbnailhover_teaser_section_' + settings.vss_id).hover(function() {
         $(settings.targetId).cycle('pause');
       }, function() {
         if (settings.paused == false) {
@@ -90,7 +90,7 @@ Drupal.behaviors.viewsSlideshowThumbnail
 
     // Pause on clicking of the slide.
     if (settings.pause_on_click == 1) {
-      $('#views_slideshow_thumbnailhover_teaser_section_' + settings.id).click(function() { 
+      $('#views_slideshow_thumbnailhover_teaser_section_' + settings.vss_id).click(function() { 
         viewsSlideshowThumbnailHoverPause(settings);
       });
     }
@@ -150,17 +150,17 @@ Drupal.behaviors.viewsSlideshowThumbnail
     }
 
     // Show image count for people who have js enabled.
-    $('#views_slideshow_thumbnailhover_image_count_' + settings.id).show();
+    $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id).show();
     
     if (settings.pager_event == 'hoverIntent') {
-      $('#views_slideshow_thumbnailhover_breakout_teasers_' + settings.id + ' .views_slideshow_thumbnailhover_div_breakout_teaser').each(function(i,obj) {
+      $('#views_slideshow_thumbnailhover_breakout_teasers_' + settings.vss_id + ' .views_slideshow_thumbnailhover_div_breakout_teaser').each(function(i,obj) {
         $(obj).hoverIntent(
           function() {
             $('.views_slideshow_thumbnailhover_div_breakout_teaser').removeClass('activeSlide');
             var id = $(this).attr('id');
             id = parseInt(id.substring(id.lastIndexOf('_')+1));
             $(settings.targetId).cycle(id);
-            $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + id).addClass('activeSlide');
+            $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + id).addClass('activeSlide');
             $(settings.targetId).cycle('stop');
           },
           function() {
@@ -174,9 +174,9 @@ Drupal.behaviors.viewsSlideshowThumbnail
 
     if (settings.controls > 0) {
       // Show controls for people who have js enabled browsers.
-      $('#views_slideshow_thumbnailhover_controls_' + settings.id).show();
+      $('#views_slideshow_thumbnailhover_controls_' + settings.vss_id).show();
       
-      $('#views_slideshow_thumbnailhover_playpause_' + settings.id).click(function(e) {
+      $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).click(function(e) {
         if (settings.paused) {
           viewsSlideshowThumbnailHoverResume(settings);
         }
@@ -196,7 +196,7 @@ viewsSlideshowThumbnailHoverPause = func
 
   $(settings.targetId).cycle('pause');
   if (settings.controls > 0) {
-    $('#views_slideshow_thumbnailhover_playpause_' + settings.id)
+    $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id)
       .addClass('views_slideshow_thumbnailhover_play')
       .addClass('views_slideshow_play')
       .removeClass('views_slideshow_thumbnailhover_pause')
@@ -210,7 +210,7 @@ viewsSlideshowThumbnailHoverPause = func
 viewsSlideshowThumbnailHoverResume = function (settings) {
   $(settings.targetId).cycle('resume');
   if (settings.controls > 0) {
-    $('#views_slideshow_thumbnailhover_playpause_' + settings.id)
+    $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id)
       .addClass('views_slideshow_thumbnailhover_pause')
       .addClass('views_slideshow_pause')
       .removeClass('views_slideshow_thumbnailhover_play')
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
diff -u -p -r1.1.2.1.2.6 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	27 Mar 2010 03:06:20 -0000	1.1.2.1.2.6
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	15 May 2010 18:05:01 -0000
@@ -47,39 +47,39 @@ function views_slideshow_thumbnailhover_
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_controls' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_previous' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_pause' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_next' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_image_count' => array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teaser' => array(
-      'arguments' => array('item' => NULL, 'id' => NULL, 'count' => NULL),
+      'arguments' => 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, 'id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
+      'arguments' => 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, 'id' => NULL, 'count' => NULL),
+      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teasers' => array(
-      'arguments' => array('items' => NULL, 'id' => NULL),
+      'arguments' => array('items' => NULL, 'vss_id' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
   );
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.theme.inc,v
retrieving revision 1.1.2.1.2.34
diff -u -p -r1.1.2.1.2.34 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	14 May 2010 03:07:51 -0000	1.1.2.1.2.34
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	15 May 2010 18:05:01 -0000
@@ -11,9 +11,9 @@
  */
 function template_preprocess_views_slideshow_thumbnailhover(&$vars) {
   $options = $vars['options'];
-  $id = $vars['id'];
   $view = $vars['view'];
   $rows = $vars['rows'];
+  $vss_id = $view->name . '-' . $view->current_display;
 
   $settings = array_merge(
     array(
@@ -21,14 +21,14 @@ function template_preprocess_views_slide
       'teasers_last' => ($options['thumbnailhover']['teasers_last']) ? TRUE : FALSE,
       'id_prefix' => '#views_slideshow_thumbnailhover_main_',
       'div_prefix' => '#views_slideshow_thumbnailhover_div_',
-      'id' => $vars['id'],
-      'view_id' => $vars['view']->name . '-' . $vars['view']->current_display,
+      'vss_id' => $vss_id,
+      'view_id' => $vss_id,
     ),
     $options['views_slideshow_thumbnailhover']
   );
 
   drupal_add_js(array('viewsSlideshowThumbnailHover' => array(
-    "#views_slideshow_thumbnailhover_main_$id" => $settings)), 'setting');
+    "#views_slideshow_thumbnailhover_main_" . $vss_id => $settings)), 'setting');
 
   // Add the hoverIntent plugin.
   if ($settings['pager_event'] == 'hoverIntent') {
@@ -44,33 +44,33 @@ function template_preprocess_views_slide
   }
 
   $teaser = ($options['views_slideshow_thumbnailhover']['hover_breakout'] == 'teaser') ? TRUE : FALSE;
-  $hidden_elements = theme('views_slideshow_thumbnailhover_no_display_section', $view, $rows, $id, $options, $teaser);
-  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'views_slideshow_thumbnailhover');
+  $hidden_elements = theme('views_slideshow_thumbnailhover_no_display_section', $view, $rows, $vss_id, $options, $teaser);
+  $vars['slideshow'] = theme('views_slideshow_main_section', $vss_id, $hidden_elements, 'views_slideshow_thumbnailhover');
 
   $thumbnailhover = $vars['options']['views_slideshow_thumbnailhover'];
 
   // Only show controls when there is more than one result.
   if ($settings['num_divs'] > 1) {
     if ($thumbnailhover['controls'] == 1) {
-      $vars['controls_top'] = theme('views_slideshow_thumbnailhover_controls', $id, $view, $options);
+      $vars['controls_top'] = theme('views_slideshow_thumbnailhover_controls', $vss_id, $view, $options);
     }
     elseif ($thumbnailhover['controls'] == 2) {
-      $vars['controls_bottom'] = theme('views_slideshow_thumbnailhover_controls', $id, $view, $options);
+      $vars['controls_bottom'] = theme('views_slideshow_thumbnailhover_controls', $vss_id, $view, $options);
     }
   }
 
   if (!$thumbnailhover['teasers_last']) {
-    $vars['breakout_top'] = theme('views_slideshow_thumbnailhover_breakout_teasers', $view, $rows, $id, $options);
+    $vars['breakout_top'] = theme('views_slideshow_thumbnailhover_breakout_teasers', $view, $rows, $vss_id, $options);
   }
   else {
-    $vars['breakout_bottom'] = theme('views_slideshow_thumbnailhover_breakout_teasers', $view, $rows, $id, $options);
+    $vars['breakout_bottom'] = theme('views_slideshow_thumbnailhover_breakout_teasers', $view, $rows, $vss_id, $options);
   }
 
   if ($thumbnailhover['image_count'] == 1) {
-    $vars['image_count_top'] = theme('views_slideshow_thumbnailhover_image_count', $id, $view, $options);
+    $vars['image_count_top'] = theme('views_slideshow_thumbnailhover_image_count', $vss_id, $view, $options);
   }
   elseif ($thumbnailhover['image_count'] == 2) {
-    $vars['image_count_bottom'] = theme('views_slideshow_thumbnailhover_image_count', $id, $view, $options);
+    $vars['image_count_bottom'] = theme('views_slideshow_thumbnailhover_image_count', $vss_id, $view, $options);
   }
 }
 
@@ -79,9 +79,9 @@ function template_preprocess_views_slide
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $id, $options, $teaser = TRUE) {
+function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $vss_id, $options, $teaser = TRUE) {
   // Add the slideshow elements.
-  $attributes['id'] = "views_slideshow_thumbnailhover_teaser_section_$id";
+  $attributes['id'] = "views_slideshow_thumbnailhover_teaser_section_" . $vss_id;
   $attributes['class'] = 'views_slideshow_thumbnailhover_teaser_section views_slideshow_teaser_section';
   $attributes = drupal_attributes($attributes);
 
@@ -107,7 +107,7 @@ function theme_views_slideshow_thumbnail
     else {
       $rendered = node_view(node_load($node->nid), $teaser, FALSE, FALSE);
     }
-    $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', $rendered, $id, $count);
+    $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', $rendered, $vss_id, $count);
   }
   $output .= "</div>";
   return $output;
@@ -118,7 +118,7 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $id, $count) {
+function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $vss_id, $count) {
   $current = $count + 1;
 
   $classes = array(
@@ -131,7 +131,7 @@ function theme_views_slideshow_thumbnail
   }
   $classes[] = ($count % 2) ? 'views-row-even' : 'views-row-odd';
 
-  $attributes['id'] = "views_slideshow_thumbnailhover_div_${id}_${count}";
+  $attributes['id'] = "views_slideshow_thumbnailhover_div_" . $vss_id . "_" . $count;
   $attributes['class'] = implode(' ', $classes);
   $attributes = drupal_attributes($attributes);
 
@@ -143,8 +143,8 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_breakout_teasers($view, $items, $id, $options) {
-  $attributes['id'] = "views_slideshow_thumbnailhover_breakout_teasers_$id";
+function theme_views_slideshow_thumbnailhover_breakout_teasers($view, $items, $vss_id, $options) {
+  $attributes['id'] = "views_slideshow_thumbnailhover_breakout_teasers_" . $vss_id;
   $attributes['class'] = 'views_slideshow_thumbnailhover_breakout_teasers clear-block';
   $attributes = drupal_attributes($attributes);
 
@@ -152,7 +152,7 @@ function theme_views_slideshow_thumbnail
   if ('title' == $options['views_slideshow_thumbnailhover']['hover_breakout']) {
     foreach ($view->result as $count => $node) {
       $node = node_load($node->nid); // TODO, this loads too much, but on node row we dont access the fields separately.
-      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $node->title, $id, $count);
+      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $node->title, $vss_id, $count);
     }
   }
   elseif ($view->display_handler->uses_fields()) {
@@ -172,12 +172,12 @@ function theme_views_slideshow_thumbnail
           $rendered_fields .= '</div>';
         }
       }
-      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $rendered_fields, $id, $count);
+      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $rendered_fields, $vss_id, $count);
     }
   }
   else {
     foreach ($items as $count => $item) {
-      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $id, $count);
+      $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $vss_id, $count);
     }
   }
   $output .= "</div>\n";
@@ -190,7 +190,7 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $id, $count) {
+function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $vss_id, $count) {
   $current = $count + 1;
   $classes = array(
     'views_slideshow_thumbnailhover_div_breakout_teaser',
@@ -201,7 +201,7 @@ function theme_views_slideshow_thumbnail
   $classes[] = ($count % 2) ? 'views-row-even' : 'views-row-odd';
 
   $attributes['class'] = implode(' ', $classes);
-  $attributes['id'] = "views_slideshow_thumbnailhover_div_breakout_teaser_${id}_${count}";
+  $attributes['id'] = "views_slideshow_thumbnailhover_div_breakout_teaser_" . $vss_id . "_" . $count;
   $attributes = drupal_attributes($attributes);
 
   return "<div$attributes>$item</div>\n";
@@ -212,7 +212,7 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_controls($id, $view, $options) {
+function theme_views_slideshow_thumbnailhover_controls($vss_id, $view, $options) {
   $classes = array(
     'views_slideshow_thumbnailhover_controls',
     'views_slideshow_controls',
@@ -220,15 +220,15 @@ function theme_views_slideshow_thumbnail
 
   $attributes['class'] = implode(' ', $classes);
 
-  $attributes['id'] = "views_slideshow_thumbnailhover_controls_$id";
+  $attributes['id'] = "views_slideshow_thumbnailhover_controls_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   $output = "<div$attributes>";
-  $output .= theme('views_slideshow_thumbnailhover_control_previous', $id, $view, $options);
+  $output .= theme('views_slideshow_thumbnailhover_control_previous', $vss_id, $view, $options);
   if ($options['views_slideshow_thumbnailhover']['timeout']) {
-    $output .= theme('views_slideshow_thumbnailhover_control_pause', $id, $view, $options);
+    $output .= theme('views_slideshow_thumbnailhover_control_pause', $vss_id, $view, $options);
   }
-  $output .= theme('views_slideshow_thumbnailhover_control_next', $id, $view, $options);
+  $output .= theme('views_slideshow_thumbnailhover_control_next', $vss_id, $view, $options);
   $output .= "</div>\n";
   return $output;
 }
@@ -238,11 +238,11 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_control_previous($id, $view, $options) {
+function theme_views_slideshow_thumbnailhover_control_previous($vss_id, $view, $options) {
   return l(t('Previous'), '', array(
     'attributes' => array(
       'class' => 'views_slideshow_thumbnailhover_previous views_slideshow_previous',
-      'id' => "views_slideshow_thumbnailhover_prev_$id",
+      'id' => "views_slideshow_thumbnailhover_prev_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -254,11 +254,11 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_control_pause($id, $view, $options) {
+function theme_views_slideshow_thumbnailhover_control_pause($vss_id, $view, $options) {
   return l(t('Pause'), '', array(
     'attributes' => array(
       'class' => 'views_slideshow_thumbnailhover_pause views_slideshow_pause',
-      'id' => "views_slideshow_thumbnailhover_playpause_$id",
+      'id' => "views_slideshow_thumbnailhover_playpause_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -270,11 +270,11 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
+function theme_views_slideshow_thumbnailhover_control_next($vss_id, $view, $options) {
   return l(t('Next'), '', array(
     'attributes' => array(
       'class' => 'views_slideshow_thumbnailhover_next views_slideshow_next',
-      'id' => "views_slideshow_thumbnailhover_next_$id",
+      'id' => "views_slideshow_thumbnailhover_next_" . $vss_id,
     ),
     'fragment' => ' ',
     'external' => TRUE,
@@ -286,9 +286,9 @@ function theme_views_slideshow_thumbnail
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_thumbnailhover_image_count($id, $view, $options) {
+function theme_views_slideshow_thumbnailhover_image_count($vss_id, $view, $options) {
   $attributes['class'] = 'views_slideshow_thumbnailhover_image_count views_slideshow_image_count';
-  $attributes['id'] = "views_slideshow_thumbnailhover_image_count_$id";
+  $attributes['id'] = "views_slideshow_thumbnailhover_image_count_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   $counter = '<span class="num">1</span> ' . t('of') .' <span class="total">1</span>';