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.2.5 diff -u -p -r1.1.2.1.2.5 views_slideshow.css --- contrib/views_slideshow_singleframe/views_slideshow.css 24 Feb 2010 16:41:52 -0000 1.1.2.1.2.5 +++ contrib/views_slideshow_singleframe/views_slideshow.css 14 Jun 2010 21:56:04 -0000 @@ -2,8 +2,7 @@ .views_slideshow_singleframe_no_display, .views_slideshow_singleframe_hidden, -.views_slideshow_singleframe_controls, -.views_slideshow_singleframe_image_count { +.views_slideshow_singleframe_pause { 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.38 diff -u -p -r1.1.2.1.2.38 views_slideshow.js --- contrib/views_slideshow_singleframe/views_slideshow.js 9 Jun 2010 06:13:36 -0000 1.1.2.1.2.38 +++ contrib/views_slideshow_singleframe/views_slideshow.js 14 Jun 2010 21:56:05 -0000 @@ -164,14 +164,8 @@ Drupal.behaviors.viewsSlideshowSingleFra viewsSlideshowSingleFramePause(settings); } - // 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(); - - $('#views_slideshow_singleframe_playpause_' + settings.vss_id).click(function(e) { + $('#views_slideshow_singleframe_playpause_' + settings.vss_id).show().click(function(e) { if (settings.paused) { viewsSlideshowSingleFrameResume(settings); } 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.27 diff -u -p -r1.1.2.1.2.27 views_slideshow_singleframe.theme.inc --- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 4 Jun 2010 03:52:24 -0000 1.1.2.1.2.27 +++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 14 Jun 2010 21:56:05 -0000 @@ -107,7 +107,7 @@ function theme_views_slideshow_singlefra 'views_slideshow_singleframe_slide', "views_slideshow_slide views-row-$current", ); - if ($count) { + if ($count != $_GET[$vss_id . '-page']) { $classes[] = 'views_slideshow_singleframe_hidden'; } $classes[] = ($count % 2) ? 'views-row-even' : 'views-row-odd'; @@ -150,13 +150,25 @@ function theme_views_slideshow_singlefra * @ingroup themeable */ function theme_views_slideshow_singleframe_control_previous($vss_id, $view, $options) { - return l(t('Previous'), '#', array( + $page = $_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] : 0; + $total = count($view->result); + + $query = $_GET; + if ($page - 1 > 0) { + $query[$vss_id . '-page'] = $page - 1; + } + elseif (!$page) { + $query[$vss_id . '-page'] = $total - 1; + } + else { + unset($query[$vss_id . '-page']); + } + return l(t('Previous'), $_GET['q'], array( 'attributes' => array( 'class' => 'views_slideshow_singleframe_previous views_slideshow_previous', 'id' => "views_slideshow_singleframe_prev_" . $vss_id, ), - 'fragment' => ' ', - 'external' => TRUE, + 'query' => drupal_query_string_encode($query, array('q')), )); } @@ -182,13 +194,22 @@ function theme_views_slideshow_singlefra * @ingroup themeable */ function theme_views_slideshow_singleframe_control_next($vss_id, $view, $options) { - return l(t('Next'), '#', array( + $page = $_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] : 0; + $total = count($view->result); + + $query = $_GET; + if ($page + 1 != $total) { + $query[$vss_id . '-page'] = $page + 1; + } + else { + unset($query[$vss_id . '-page']); + } + return l(t('Next'), $_GET['q'], array( 'attributes' => array( 'class' => 'views_slideshow_singleframe_next views_slideshow_next', 'id' => "views_slideshow_singleframe_next_" . $vss_id, ), - 'fragment' => ' ', - 'external' => TRUE, + 'query' => drupal_query_string_encode($query, array('q')), )); } @@ -217,7 +238,8 @@ function theme_views_slideshow_singlefra $attributes['id'] = "views_slideshow_singleframe_image_count_" . $vss_id; $attributes = drupal_attributes($attributes); - $counter = '1 ' . t('of') . ' 1'; - + $total = count($view->result); + $counter = '' . ($_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] + 1 : 1) . ' ' . t('of') . ' ' . $total . ''; + return "$counter"; } 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.10 diff -u -p -r1.1.2.1.2.10 views-slideshow-thumbnailhover.tpl.php --- contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php 18 Apr 2010 04:45:05 -0000 1.1.2.1.2.10 +++ contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php 14 Jun 2010 21:56:05 -0000 @@ -10,7 +10,7 @@
- +
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.2.3 diff -u -p -r1.1.2.1.2.3 views_slideshow.css --- contrib/views_slideshow_thumbnailhover/views_slideshow.css 26 Sep 2009 22:20:50 -0000 1.1.2.1.2.3 +++ contrib/views_slideshow_thumbnailhover/views_slideshow.css 14 Jun 2010 21:56:05 -0000 @@ -2,7 +2,6 @@ .views_slideshow_thumbnailhover_no_display, .views_slideshow_thumbnailhover_hidden, -.views_slideshow_thumbnailhover_controls, -.views_slideshow_thumbnailhover_image_count { +.views_slideshow_thumbnailhover_pause { display: none; } 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.33 diff -u -p -r1.1.2.2.2.33 views_slideshow.js --- contrib/views_slideshow_thumbnailhover/views_slideshow.js 9 Jun 2010 06:13:36 -0000 1.1.2.2.2.33 +++ contrib/views_slideshow_thumbnailhover/views_slideshow.js 14 Jun 2010 21:56:05 -0000 @@ -149,9 +149,6 @@ Drupal.behaviors.viewsSlideshowThumbnail viewsSlideshowThumbnailHoverPause(settings); } - // Show image count for people who have js enabled. - $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id).show(); - if (settings.pager_event == 'hoverIntent') { $('#views_slideshow_thumbnailhover_breakout_teasers_' + settings.vss_id + ' .views_slideshow_thumbnailhover_div_breakout_teaser').each(function(i,obj) { $(obj).hoverIntent( @@ -173,10 +170,7 @@ Drupal.behaviors.viewsSlideshowThumbnail } if (settings.controls > 0) { - // Show controls for people who have js enabled browsers. - $('#views_slideshow_thumbnailhover_controls_' + settings.vss_id).show(); - - $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).click(function(e) { + $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).show().click(function(e) { if (settings.paused) { viewsSlideshowThumbnailHoverResume(settings); } 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.36 diff -u -p -r1.1.2.1.2.36 views_slideshow_thumbnailhover.theme.inc --- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 4 Jun 2010 03:52:24 -0000 1.1.2.1.2.36 +++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 14 Jun 2010 21:56:05 -0000 @@ -145,7 +145,7 @@ function theme_views_slideshow_thumbnail "views_slideshow_slide views-row-$current", ); - if ($count) { + if ($count != $_GET[$vss_id . '-page']) { $classes[] = 'views_slideshow_thumbnailhover_hidden'; } $classes[] = ($count % 2) ? 'views-row-even' : 'views-row-odd'; @@ -258,13 +258,25 @@ function theme_views_slideshow_thumbnail * @ingroup themeable */ function theme_views_slideshow_thumbnailhover_control_previous($vss_id, $view, $options) { - return l(t('Previous'), '', array( + $page = $_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] : 0; + $total = count($view->result); + + $query = $_GET; + if ($page - 1 > 0) { + $query[$vss_id . '-page'] = $page - 1; + } + elseif (!$page) { + $query[$vss_id . '-page'] = $total - 1; + } + else { + unset($query[$vss_id . '-page']); + } + return l(t('Previous'), $_GET['q'], array( 'attributes' => array( 'class' => 'views_slideshow_thumbnailhover_previous views_slideshow_previous', 'id' => "views_slideshow_thumbnailhover_prev_" . $vss_id, ), - 'fragment' => ' ', - 'external' => TRUE, + 'query' => drupal_query_string_encode($query, array('q')), )); } @@ -290,13 +302,22 @@ function theme_views_slideshow_thumbnail * @ingroup themeable */ function theme_views_slideshow_thumbnailhover_control_next($vss_id, $view, $options) { - return l(t('Next'), '', array( + $page = $_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] : 0; + $total = count($view->result); + + $query = $_GET; + if ($page + 1 != $total) { + $query[$vss_id . '-page'] = $page + 1; + } + else { + unset($query[$vss_id . '-page']); + } + return l(t('Next'), $_GET['q'], array( 'attributes' => array( 'class' => 'views_slideshow_thumbnailhover_next views_slideshow_next', 'id' => "views_slideshow_thumbnailhover_next_" . $vss_id, ), - 'fragment' => ' ', - 'external' => TRUE, + 'query' => drupal_query_string_encode($query, array('q')), )); } @@ -310,7 +331,8 @@ function theme_views_slideshow_thumbnail $attributes['id'] = "views_slideshow_thumbnailhover_image_count_" . $vss_id; $attributes = drupal_attributes($attributes); - $counter = '1 ' . t('of') .' 1'; + $total = count($view->result); + $counter = '' . ($_GET[$vss_id . '-page'] ? $_GET[$vss_id . '-page'] + 1 : 1) . ' ' . t('of') . ' ' . $total . ''; return "$counter"; }