' . "\n";
+ $output = '
' . "\n";
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 .= "
\n\n";
return $output;
@@ -63,7 +63,7 @@ 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) {
+function theme_views_slideshow_singleframe_no_display_teaser($item, $vss_id, $count) {
$class = 'views_slideshow_singleframe_slide';
if ($count) {
$class .= ' views_slideshow_singleframe_hidden';
@@ -75,20 +75,20 @@ function theme_views_slideshow_singlefra
else {
$class .= ' views-row-odd';
}
- $output = '
' . "\n\n";
return $output;
}
/**
* Themed slideshow controls.
*/
-function theme_views_slideshow_singleframe_controls($id, $view, $options) {
- $output = '
' . "\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);
+function theme_views_slideshow_singleframe_controls($vss_id, $view, $options) {
+ $output = '
' . "\n";
+ $output .= theme('views_slideshow_singleframe_control_previous', $vss_id, $view, $options);
+ $output .= theme('views_slideshow_singleframe_control_pause', $vss_id, $view, $options);
+ $output .= theme('views_slideshow_singleframe_control_next', $vss_id, $view, $options);
$output .= "
\n";
return $output;
}
@@ -96,28 +96,28 @@ function theme_views_slideshow_singlefra
/**
* Themed Previous Control
*/
-function theme_views_slideshow_singleframe_control_previous($id, $view, $options) {
- return '
' . t('Previous') . "\n";
+function theme_views_slideshow_singleframe_control_previous($vss_id, $view, $options) {
+ return '
' . t('Previous') . "\n";
}
/**
* Themed Pause Control
*/
-function theme_views_slideshow_singleframe_control_pause($id, $view, $options) {
- return '
' . t('Pause') . "\n";
+function theme_views_slideshow_singleframe_control_pause($vss_id, $view, $options) {
+ return '
' . t('Pause') . "\n";
}
/**
* Themed Next Control
*/
-function theme_views_slideshow_singleframe_control_next($id, $view, $options) {
- return '
' . t('Next') . "\n";
+function theme_views_slideshow_singleframe_control_next($vss_id, $view, $options) {
+ return '
' . t('Next') . "\n";
}
-function theme_views_slideshow_singleframe_pager($id, $view, $options) {
- return '';
+function theme_views_slideshow_singleframe_pager($vss_id, $view, $options) {
+ return '';
}
-function theme_views_slideshow_singleframe_image_count($id, $view, $options) {
- return '
' . t('of') .'
';
+function theme_views_slideshow_singleframe_image_count($vss_id, $view, $options) {
+ return '
' . t('of') .'
';
}
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.11
diff -u -p -r1.1.2.2.2.11 views_slideshow.js
--- contrib/views_slideshow_thumbnailhover/views_slideshow.js 29 Sep 2009 20:48:36 -0000 1.1.2.2.2.11
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.js 13 Oct 2009 03:09:42 -0000
@@ -20,26 +20,26 @@ Drupal.behaviors.viewsSlideshowThumbnail
sync:settings.sync==1,
random:settings.random==1,
pause:settings.pause==1,
- 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,
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:(settings.pager_event == 'hoverIntent') ? function(current,next) {
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');
} : null,
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),
cleartypeNoBg:(settings.ie.cleartypenobg)
};
@@ -76,17 +76,17 @@ Drupal.behaviors.viewsSlideshowThumbnail
$(settings.targetId).cycle(settings.opts);
// 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() {
@@ -100,17 +100,17 @@ 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) {
$(settings.targetId).cycle('resume');
- $('#views_slideshow_thumbnailhover_playpause_' + settings.id).addClass('views_slideshow_thumbnailhover_pause').removeClass('views_slideshow_thumbnailhover_play').text('Pause');
+ $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).addClass('views_slideshow_thumbnailhover_pause').removeClass('views_slideshow_thumbnailhover_play').text('Pause');
settings.paused = false;
}
else {
$(settings.targetId).cycle('pause');
- $('#views_slideshow_thumbnailhover_playpause_' + settings.id).addClass('views_slideshow_thumbnailhover_play').removeClass('views_slideshow_thumbnailhover_pause').text('Resume');
+ $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).addClass('views_slideshow_thumbnailhover_play').removeClass('views_slideshow_thumbnailhover_pause').text('Resume');
settings.paused = true;
}
e.preventDefault();
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.3
diff -u -p -r1.1.2.1.2.3 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 26 Sep 2009 22:20:50 -0000 1.1.2.1.2.3
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 13 Oct 2009 03:09:42 -0000
@@ -22,39 +22,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.8
diff -u -p -r1.1.2.1.2.8 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 26 Sep 2009 22:20:50 -0000 1.1.2.1.2.8
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 13 Oct 2009 03:09:42 -0000
@@ -24,12 +24,12 @@ function template_preprocess_views_slide
'teasers_last' => $teasers_last,
'id_prefix' => '#views_slideshow_thumbnailhover_main_',
'div_prefix' => '#views_slideshow_thumbnailhover_div_',
- 'id' => $vars['id'],
+ 'vss_id' => $vars['vss_id'],
),
$options['thumbnailhover']
);
- drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['id'] => $settings)), 'setting');
+ drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['vss_id'] => $settings)), 'setting');
if ($settings['pager_event'] == 'hoverIntent') {
if (module_exists('jq')) {
if (in_array('hoverIntent', jq_plugins())) {
@@ -46,7 +46,7 @@ function template_preprocess_views_slide
/**
* These are the slideshow elements themselves; not actually displayed, but used to give the html to the main element.
*/
-function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $id, $mode, $teaser = TRUE) {
+function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $vss_id, $mode, $teaser = TRUE) {
// Add support for the jQuery Cycle plugin.
// If we have the jQ module installed, use that to add the Cycle plugin if possible.
// That allows for version control.
@@ -60,9 +60,9 @@ function theme_views_slideshow_thumbnail
if (!$js) {
drupal_add_js(drupal_get_path('module', 'views_slideshow') .'/js/jquery.cycle.all.min.js', 'module');
}
- $output = '
' . "\n";
+ $output = '
' . "\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 .= theme('views_slideshow_thumbnailhover_no_display_teaser', node_view(node_load($node->nid), $teaser, FALSE, FALSE), $vss_id, $count);
}
$output .= "
\n\n";
return $output;
@@ -71,7 +71,7 @@ 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) {
+function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $vss_id, $count) {
$class = 'views_slideshow_thumbnailhover_slide';
if ($count) {
$class = ' views_slideshow_thumbnailhover_hidden';
@@ -83,21 +83,21 @@ function theme_views_slideshow_thumbnail
else {
$class .= ' views-row-odd';
}
- $output = '
' . "\n ";
+ $output = '
' . "\n ";
$output .= $item . "\n";
- $output .= '
' . "\n\n";
+ $output .= '
' . "\n\n";
return $output;
}
/**
* 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 = '
' . "\n";
+function theme_views_slideshow_thumbnailhover_breakout_teasers($items, $vss_id) {
+ $output = '
' . "\n";
$js = "$(document).ready(function() {\n";
foreach ($items as $count => $item) {
- $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $id, $count);
- $js .= theme('views_slideshow_thumbnailhover_breakout_teaser_js', $id, $count);
+ $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $vss_id, $count);
+ $js .= theme('views_slideshow_thumbnailhover_breakout_teaser_js', $vss_id, $count);
}
$js .= "})\n";
drupal_add_js($js, 'inline');
@@ -110,7 +110,7 @@ function theme_views_slideshow_thumbnail
/**
* An individual breakout teaser.
*/
-function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $id, $count) {
+function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $vss_id, $count) {
$class = 'views_slideshow_thumbnailhover_div_breakout_teaser';
if (!$count) {
$class .= ' views_slideshow_thumbnailhover_active_teaser';
@@ -122,9 +122,9 @@ function theme_views_slideshow_thumbnail
else {
$class .= ' views-row-odd';
}
- $output = '
' . "\n ";
+ $output = '
' . "\n ";
$output .= $item . "\n";
- $output .= '
' . "\n\n";
+ $output .= '
' . "\n\n";
return $output;
}
@@ -132,11 +132,11 @@ function theme_views_slideshow_thumbnail
/**
* Themed slideshow controls.
*/
-function theme_views_slideshow_thumbnailhover_controls($id, $view, $options) {
- $output = '
' . "\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);
+function theme_views_slideshow_thumbnailhover_controls($vss_id, $view, $options) {
+ $output = '
' . "\n";
+ $output .= theme('views_slideshow_thumbnailhover_control_previous', $vss_id, $view, $options);
+ $output .= theme('views_slideshow_thumbnailhover_control_pause', $vss_id, $view, $options);
+ $output .= theme('views_slideshow_thumbnailhover_control_next', $vss_id, $view, $options);
$output .= "
\n";
return $output;
}
@@ -144,25 +144,25 @@ function theme_views_slideshow_thumbnail
/**
* Themed Previous Control
*/
-function theme_views_slideshow_thumbnailhover_control_previous($id, $view, $options) {
- return '
' . t('Previous') . "\n";
+function theme_views_slideshow_thumbnailhover_control_previous($vss_id, $view, $options) {
+ return '
' . t('Previous') . "\n";
}
/**
* Themed Pause Control
*/
-function theme_views_slideshow_thumbnailhover_control_pause($id, $view, $options) {
- return '
' . t('Pause') . "\n";
+function theme_views_slideshow_thumbnailhover_control_pause($vss_id, $view, $options) {
+ return '
' . t('Pause') . "\n";
}
/**
* Themed Next Control
*/
-function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
- return '
' . t('Next') . "\n";
+function theme_views_slideshow_thumbnailhover_control_next($vss_id, $view, $options) {
+ return '
' . t('Next') . "\n";
}
-function theme_views_slideshow_thumbnailhover_image_count($id, $view, $options) {
- $output = '
' . t('of') .'
';
+function theme_views_slideshow_thumbnailhover_image_count($vss_id, $view, $options) {
+ $output = '
' . t('of') .'
';
return $output;
}
\ No newline at end of file