Index: views_slideshow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.module,v
retrieving revision 1.11.2.2.2.1
diff -u -p -r1.11.2.2.2.1 views_slideshow.module
--- views_slideshow.module	24 Aug 2009 19:46:54 -0000	1.11.2.2.2.1
+++ views_slideshow.module	17 Sep 2009 23:07:57 -0000
@@ -45,7 +45,7 @@ define('VIEWS_SLIDESHOW_DEFAULT_TEASERS_
 function views_slideshow_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_main_section' => array(
-      'arguments' => array('id' => NULL, 'hidden_elements' => NULL),
+      'arguments' => array('id' => NULL, 'hidden_elements' => NULL, 'plugin' => NULL),
       'file' => 'views_slideshow.theme.inc',
     ),
   );
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.1
diff -u -p -r1.1.2.2.2.1 views_slideshow.theme.inc
--- views_slideshow.theme.inc	24 Aug 2009 19:46:54 -0000	1.1.2.2.2.1
+++ views_slideshow.theme.inc	17 Sep 2009 23:07:57 -0000
@@ -4,9 +4,9 @@
 /**
  *  This displays the main element, where the current slide is shown.
  */
-function theme_views_slideshow_main_section($id, $hidden_elements) {
-  $output = "\n\n" . '<div id="views_slideshow_main_' . $id . '" class="views_slideshow_main">' . "\n  ";
+function theme_views_slideshow_main_section($id, $hidden_elements, $plugin) {
+  $output = "\n\n" . '<div id="views_slideshow_' . $plugin . '_main_' . $id . '" class="views_slideshow_' . $plugin . '_main">' . "\n  ";
   $output .= $hidden_elements;
-  $output .= '</div><!--close views_slideshow_main_' . $id . "-->\n\n";
+  $output .= '</div><!--close views_slideshow_' . $plugin . '_main_' . $id . "-->\n\n";
   return $output;
 }
Index: contrib/views_slideshow_singleframe/views-slideshow-singleframe.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views-slideshow-singleframe.tpl.php,v
retrieving revision 1.1.2.1.2.1
diff -u -p -r1.1.2.1.2.1 views-slideshow-singleframe.tpl.php
--- contrib/views_slideshow_singleframe/views-slideshow-singleframe.tpl.php	24 Aug 2009 19:46:54 -0000	1.1.2.1.2.1
+++ contrib/views_slideshow_singleframe/views-slideshow-singleframe.tpl.php	17 Sep 2009 23:07:58 -0000
@@ -14,7 +14,7 @@
   if ($options['singleframe']['pager'] == 1) {
     print theme('views_slideshow_singleframe_pager', $id, $view, $options);
   }
-  print theme('views_slideshow_main_section', $id, $hidden_elements);
+  print theme('views_slideshow_main_section', $id, $hidden_elements, 'singleframe');
   if ($options['singleframe']['controls'] == 2) {
     print theme('views_slideshow_singleframe_controls',$id,$view,$options);
   }
Index: contrib/views_slideshow_singleframe/views_slideshow.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views_slideshow.css
--- contrib/views_slideshow_singleframe/views_slideshow.css	16 Apr 2009 02:04:52 -0000	1.1.2.1
+++ contrib/views_slideshow_singleframe/views_slideshow.css	17 Sep 2009 23:07:58 -0000
@@ -1,6 +1,6 @@
 /* $Id: views_slideshow.css,v 1.1.2.1 2009/04/16 02:04:52 aaron Exp $ */
 
-.views_slideshow_no_display,
-.views_slideshow_hidden {
+.views_slideshow_singleframe_no_display,
+.views_slideshow_singleframe_hidden {
   display: none;
 }
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.5
diff -u -p -r1.1.2.1.2.5 views_slideshow.js
--- contrib/views_slideshow_singleframe/views_slideshow.js	16 Sep 2009 05:22:14 -0000	1.1.2.1.2.5
+++ contrib/views_slideshow_singleframe/views_slideshow.js	17 Sep 2009 23:07:58 -0000
@@ -9,7 +9,7 @@
  *  This will set our initial behavior, by starting up each individual slideshow.
  */
 Drupal.behaviors.viewsSlideshowSingleFrame = function (context) {
-  $('.views_slideshow_main:not(.viewsSlideshowSingleFrame-processed)', context).addClass('viewsSlideshowSingleFrame-processed').each(function() {
+  $('.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');
@@ -20,9 +20,9 @@ Drupal.behaviors.viewsSlideshowSingleFra
       sync:settings.sync==1,
       random:settings.random==1,
       pause:settings.pause==1,
-      prev:(settings.controls > 0)?'#views_slideshow_prev_' + settings.id:null,
-      next:(settings.controls > 0)?'#views_slideshow_next_' + settings.id:null,
-      pager:(settings.pager > 0)?'#views_slideshow_pager_' + settings.id:null,
+      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,
       cleartype:(settings.cleartype),
       cleartypeNoBg:(settings.cleartypenobg)
     }
@@ -37,15 +37,15 @@ Drupal.behaviors.viewsSlideshowSingleFra
     $(settings.targetId).cycle(settings.opts);
     
     if (settings.controls > 0) {
-      $('#views_slideshow_playpause_' + settings.id).click(function(e) {
+      $('#views_slideshow_singleframe_playpause_' + settings.id).click(function(e) {
       	if (settings.paused) {
       	  $(settings.targetId).cycle('resume');
-      	  $('#views_slideshow_playpause_' + settings.id).addClass('views_slideshow_pause').removeClass('views_slideshow_play').text('Pause');
+      	  $('#views_slideshow_singleframe_playpause_' + settings.id).addClass('views_slideshow_singleframe_pause').removeClass('views_slideshow_singleframe_play').text('Pause');
       	  settings.paused = false;
       	}
       	else {
       	  $(settings.targetId).cycle('pause');
-      	  $('#views_slideshow_playpause_' + settings.id).addClass('views_slideshow_play').removeClass('views_slideshow_pause').text('Resume');
+      	  $('#views_slideshow_singleframe_playpause_' + settings.id).addClass('views_slideshow_singleframe_play').removeClass('views_slideshow_singleframe_pause').text('Resume');
       	  settings.paused = true;
       	}
         e.preventDefault();
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.4
diff -u -p -r1.1.2.1.2.4 views_slideshow_singleframe.theme.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	30 Aug 2009 05:10:38 -0000	1.1.2.1.2.4
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	17 Sep 2009 23:07:58 -0000
@@ -21,14 +21,14 @@ function template_preprocess_views_slide
     array(
       'num_divs' => $num_divs,
       'hoverFunction' => $hover,
-      'id_prefix' => '#views_slideshow_main_',
-      'div_prefix' => '#views_slideshow_div_',
+      'id_prefix' => '#views_slideshow_singleframe_main_',
+      'div_prefix' => '#views_slideshow_singleframe_div_',
       'id' => $vars['id'],
     ),
     $options['singleframe']
   );
 
-  drupal_add_js(array('viewsSlideshowSingleFrame' => array('#views_slideshow_main_'. $vars['id'] => $settings)), 'setting');
+  drupal_add_js(array('viewsSlideshowSingleFrame' => array('#views_slideshow_singleframe_main_'. $vars['id'] => $settings)), 'setting');
 
 }
 
@@ -51,12 +51,12 @@ function theme_views_slideshow_singlefra
     drupal_add_js(drupal_get_path('module', 'views_slideshow') .'/js/jquery.cycle.all.min.js', 'module');
   }
   
-  $output = '<div id="views_slideshow_teaser_section_' . $id . '" class="views_slideshow_teaser_section">' . "\n";
+  $output = '<div id="views_slideshow_singleframe_teaser_section_' . $id . '" class="views_slideshow_singleframe_teaser_section">' . "\n";
 
   foreach ($rows as $count => $item) {
     $output .= theme('views_slideshow_singleframe_no_display_teaser', $item, $id, $count);
   }
-  $output .= "</div><!--close views_slideshow_no_display-->\n\n";
+  $output .= "</div><!--close views_slideshow_singleframe_no_display-->\n\n";
   return $output;
 }
 
@@ -64,10 +64,10 @@ function theme_views_slideshow_singlefra
  *  The html that will be placed into the element in its turn during its frame.
  */
 function theme_views_slideshow_singleframe_no_display_teaser($item, $id, $count) {
-  $class = 'class="views_slideshow_slide' . ($count ? ' views_slideshow_hidden"' : '"');
-  $output = '  <div id="views_slideshow_div_' . $id . '_' . $count . '" '. $class .'>' . "\n  ";
+  $class = 'class="views_slideshow_singleframe_slide' . ($count ? ' views_slideshow_singleframe_hidden"' : '"');
+  $output = '  <div id="views_slideshow_singleframe_div_' . $id . '_' . $count . '" '. $class .'>' . "\n  ";
   $output .= $item . "\n";
-  $output .= '  </div><!--close views_slideshow_div_' . $id . '_' . $count . '-->' . "\n\n";
+  $output .= '  </div><!--close views_slideshow_singleframe_div_' . $id . '_' . $count . '-->' . "\n\n";
   return $output;
 }
 
@@ -75,7 +75,7 @@ function theme_views_slideshow_singlefra
  * Themed slideshow controls.
  */
 function theme_views_slideshow_singleframe_controls($id, $view, $options) {
-  $output = '<div class="views_slideshow_controls" id="views_slideshow_controls_' . $id . '">' . "\n";
+  $output = '<div class="views_slideshow_singleframe_controls" id="views_slideshow_singleframe_controls_' . $id . '">' . "\n";
   $output .= theme('views_slideshow_singleframe_control_previous', $id, $view, $options);
   $output .= theme('views_slideshow_singleframe_control_pause', $id, $view, $options);
   $output .= theme('views_slideshow_singleframe_control_next', $id, $view, $options);
@@ -87,24 +87,24 @@ function theme_views_slideshow_singlefra
  * Themed Previous Control
  */
 function theme_views_slideshow_singleframe_control_previous($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_prev_' . $id . '" class="views_slideshow_previous">' . t('Previous') . "</a>\n";
+  return '<a href="#" id="views_slideshow_singleframe_prev_' . $id . '" class="views_slideshow_singleframe_previous">' . t('Previous') . "</a>\n";
 }
 
 /**
  * Themed Pause Control
  */
 function theme_views_slideshow_singleframe_control_pause($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_playpause_' . $id . '" class="views_slideshow_pause">' . t('Pause') . "</a>\n";
+  return '<a href="#" id="views_slideshow_singleframe_playpause_' . $id . '" class="views_slideshow_singleframe_pause">' . t('Pause') . "</a>\n";
 }
 
 /**
  * Themed Next Control
  */
 function theme_views_slideshow_singleframe_control_next($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_next_' . $id . '" class="views_slideshow_next">' . t('Next') . "</a>\n";
+  return '<a href="#" id="views_slideshow_singleframe_next_' . $id . '" class="views_slideshow_singleframe_next">' . t('Next') . "</a>\n";
 }
 
 function theme_views_slideshow_singleframe_pager($id, $view, $options) {
-  $output = '<div class="views_slideshow_pager" id="views_slideshow_pager_' . $id . '"></div>';
+  $output = '<div class="views_slideshow_singleframe_pager" id="views_slideshow_singleframe_pager_' . $id . '"></div>';
   return $output;
 }
Index: contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views-slideshow-thumbnailhover.tpl.php,v
retrieving revision 1.1.2.1.2.1
diff -u -p -r1.1.2.1.2.1 views-slideshow-thumbnailhover.tpl.php
--- contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php	24 Aug 2009 19:46:54 -0000	1.1.2.1.2.1
+++ contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php	17 Sep 2009 23:07:58 -0000
@@ -27,7 +27,7 @@
 
   // These are hidden elements, used to cycle through the main div
   $hidden_elements = theme('views_slideshow_thumbnailhover_no_display_section', $view, $rows, $id, $options['mode'], $teaser);
-  $output .= theme('views_slideshow_main_section', $id, $hidden_elements);
+  $output .= theme('views_slideshow_main_section', $id, $hidden_elements, 'thumbnailhover');
 
   if ($view_teasers && $options['thumbnailhover']['teasers_last']) {
     $output .= $view_teasers;
Index: contrib/views_slideshow_thumbnailhover/views_slideshow.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views_slideshow.css
--- contrib/views_slideshow_thumbnailhover/views_slideshow.css	20 Apr 2009 22:51:08 -0000	1.1.2.1
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.css	17 Sep 2009 23:07:58 -0000
@@ -1,6 +1,6 @@
 /* $Id: views_slideshow.css,v 1.1.2.1 2009/04/20 22:51:08 aaron Exp $ */
 
-.views_slideshow_no_display,
-.views_slideshow_hidden {
+.views_slideshow_thumbnailhover_no_display,
+.views_slideshow_thumbnailhover_hidden {
   display: none;
 }
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.4
diff -u -p -r1.1.2.1.2.4 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	30 Aug 2009 05:10:38 -0000	1.1.2.1.2.4
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	17 Sep 2009 23:07:58 -0000
@@ -22,14 +22,14 @@ function template_preprocess_views_slide
     array(
       'num_divs' => $num_divs,
       'teasers_last' => $teasers_last,
-      'id_prefix' => '#views_slideshow_main_',
-      'div_prefix' => '#views_slideshow_div_',
+      'id_prefix' => '#views_slideshow_thumbnailhover_main_',
+      'div_prefix' => '#views_slideshow_thumbnailhover_div_',
       'id' => $vars['id'],
     ),
     $options['thumbnailhover']
   );
 
-  drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_main_'. $vars['id'] => $settings)), 'setting');
+  drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['id'] => $settings)), 'setting');
   if ($settings['pager_event'] == 'hoverIntent') {
     if (module_exists('jq')) {
       if (in_array('hoverIntent', jq_plugins())) {
@@ -60,11 +60,11 @@ function theme_views_slideshow_thumbnail
   if (!$js) {
     drupal_add_js(drupal_get_path('module', 'views_slideshow') .'/js/jquery.cycle.all.min.js', 'module');
   }
-  $output = '<div id="views_slideshow_teaser_section_' . $id . '" class="views_slideshow_teaser_section">' . "\n";
+  $output = '<div id="views_slideshow_thumbnailhover_teaser_section_' . $id . '" class="views_slideshow_thumbnailhover_teaser_section">' . "\n";
   foreach ($view->result as $count => $node) {
     $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', node_view(node_load($node->nid), $teaser, FALSE, FALSE), $id, $count);
   }
-  $output .= "</div><!--close views_slideshow_no_display-->\n\n";
+  $output .= "</div><!--close views_slideshow_thumbnailhover_no_display-->\n\n";
   return $output;
 }
 
@@ -72,10 +72,10 @@ function theme_views_slideshow_thumbnail
  *  The html that will be placed into the element in its turn during its frame.
  */
 function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $id, $count) {
-  $class = 'class="views_slideshow_slide' . ($count ? ' views_slideshow_hidden"' : '"');
-  $output = '  <div id="views_slideshow_div_' . $id . '_' . $count . '" '. $class .'>' . "\n  ";
+  $class = 'class="views_slideshow_thumbnailhover_slide' . ($count ? ' views_slideshow_thumbnailhover_hidden"' : '"');
+  $output = '  <div id="views_slideshow_thumbnailhover_div_' . $id . '_' . $count . '" '. $class .'>' . "\n  ";
   $output .= $item . "\n";
-  $output .= '  </div><!--close views_slideshow_div_' . $id . '_' . $count . '-->' . "\n\n";
+  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_' . $id . '_' . $count . '-->' . "\n\n";
   return $output;
 }
 
@@ -83,7 +83,7 @@ function theme_views_slideshow_thumbnail
  *  These are teasers that may be pointed at with a mouse to change the element directly.
  */
 function theme_views_slideshow_thumbnailhover_breakout_teasers($items, $id) {
-  $output = '<div id="views_slideshow_breakout_teasers_' . $id . '" class="views_slideshow_breakout_teasers clear-block">' . "\n";
+  $output = '<div id="views_slideshow_thumbnailhover_breakout_teasers_' . $id . '" class="views_slideshow_thumbnailhover_breakout_teasers clear-block">' . "\n";
   $js = "$(document).ready(function() {\n";
   foreach ($items as $count => $item) {
     $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $id, $count);
@@ -92,7 +92,7 @@ function theme_views_slideshow_thumbnail
   $js .= "})\n";
   drupal_add_js($js, 'inline');
 
-  $output .= "</div><!--close views_slideshow_breakout_teasers-->\n\n";
+  $output .= "</div><!--close views_slideshow_thumbnailhover_breakout_teasers-->\n\n";
 
   return $output;
 }
@@ -101,10 +101,10 @@ function theme_views_slideshow_thumbnail
  *  An individual breakout teaser.
  */
 function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $id, $count) {
-  $class = $count ? '' : ' views_slideshow_active_teaser';
-  $output = '  <div id="views_slideshow_div_breakout_teaser_' . $id . '_' . $count . '" class="views_slideshow_div_breakout_teaser' . $class . '">' . "\n  ";
+  $class = $count ? '' : ' views_slideshow_thumbnailhover_active_teaser';
+  $output = '  <div id="views_slideshow_thumbnailhover_div_breakout_teaser_' . $id . '_' . $count . '" class="views_slideshow_thumbnailhover_div_breakout_teaser' . $class . '">' . "\n  ";
   $output .= $item . "\n";
-  $output .= '  </div><!--close views_slideshow_div_breakout_teaser_' . $id . '_' . $count . '-->' . "\n\n";
+  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_breakout_teaser_' . $id . '_' . $count . '-->' . "\n\n";
   return $output;
 }
 
@@ -113,7 +113,7 @@ function theme_views_slideshow_thumbnail
  * Themed slideshow controls.
  */
 function theme_views_slideshow_thumbnailhover_controls($id, $view, $options) {
-  $output = '<div class="views_slideshow_controls" id="views_slideshow_controls_' . $id . '">' . "\n";
+  $output = '<div class="views_slideshow_thumbnailhover_controls" id="views_slideshow_thumbnailhover_controls_' . $id . '">' . "\n";
   $output .= theme('views_slideshow_thumbnailhover_control_previous', $id, $view, $options);
   $output .= theme('views_slideshow_thumbnailhover_control_pause', $id, $view, $options);
   $output .= theme('views_slideshow_thumbnailhover_control_next', $id, $view, $options);
@@ -125,19 +125,19 @@ function theme_views_slideshow_thumbnail
  * Themed Previous Control
  */
 function theme_views_slideshow_thumbnailhover_control_previous($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_prev_' . $id . '" class="views_slideshow_previous">' . t('Previous') . "</a>\n";
+  return '<a href="#" id="views_slideshow_thumbnailhover_prev_' . $id . '" class="views_slideshow_thumbnailhover_previous">' . t('Previous') . "</a>\n";
 }
 
 /**
  * Themed Pause Control
  */
 function theme_views_slideshow_thumbnailhover_control_pause($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_playpause_' . $id . '" class="views_slideshow_pause">' . t('Pause') . "</a>\n";
+  return '<a href="#" id="views_slideshow_thumbnailhover_playpause_' . $id . '" class="views_slideshow_thumbnailhover_pause">' . t('Pause') . "</a>\n";
 }
 
 /**
  * Themed Next Control
  */
 function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_next_' . $id . '" class="views_slideshow_next">' . t('Next') . "</a>\n";
+  return '<a href="#" id="views_slideshow_thumbnailhover_next_' . $id . '" class="views_slideshow_thumbnailhover_next">' . t('Next') . "</a>\n";
 }
