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.2
diff -u -p -r1.1.2.1.2.2 views-slideshow-singleframe.tpl.php
--- contrib/views_slideshow_singleframe/views-slideshow-singleframe.tpl.php 18 Sep 2009 22:15:49 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_singleframe/views-slideshow-singleframe.tpl.php 20 Sep 2009 00:46:09 -0000
@@ -14,6 +14,9 @@
if ($options['singleframe']['pager'] == 1) {
print theme('views_slideshow_singleframe_pager', $id, $view, $options);
}
+ if ($options['singleframe']['num_of_total'] == 1) {
+ print theme('views_slideshow_singleframe_num_of_total', $id, $view, $options);
+ }
print theme('views_slideshow_main_section', $id, $hidden_elements, 'singleframe');
if ($options['singleframe']['controls'] == 2) {
print theme('views_slideshow_singleframe_controls',$id,$view,$options);
@@ -21,4 +24,7 @@
if ($options['singleframe']['pager'] == 2) {
print theme('views_slideshow_singleframe_pager', $id, $view, $options);
}
+ if ($options['singleframe']['num_of_total'] == 2) {
+ print theme('views_slideshow_singleframe_num_of_total', $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.2.2
diff -u -p -r1.1.2.1.2.2 views_slideshow.css
--- contrib/views_slideshow_singleframe/views_slideshow.css 19 Sep 2009 18:40:59 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_singleframe/views_slideshow.css 20 Sep 2009 00:46:09 -0000
@@ -2,6 +2,7 @@
.views_slideshow_singleframe_no_display,
.views_slideshow_singleframe_hidden,
-.views_slideshow_singleframe_controls {
+.views_slideshow_singleframe_controls,
+.views_slideshow_singleframe_num_of_total {
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.8
diff -u -p -r1.1.2.1.2.8 views_slideshow.js
--- contrib/views_slideshow_singleframe/views_slideshow.js 19 Sep 2009 18:47:45 -0000 1.1.2.1.2.8
+++ contrib/views_slideshow_singleframe/views_slideshow.js 20 Sep 2009 00:46:09 -0000
@@ -24,6 +24,13 @@ Drupal.behaviors.viewsSlideshowSingleFra
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,
+ after:function(curr, next, opts) {
+ // Used for num of total counter.
+ if (settings.num_of_total) {
+ $('#views_slideshow_singleframe_num_of_total_' + settings.id + ' span.num').html(opts.currSlide + 1);
+ $('#views_slideshow_singleframe_num_of_total_' + settings.id + ' span.total').html(opts.slideCount);
+ }
+ },
cleartype:(settings.cleartype),
cleartypeNoBg:(settings.cleartypenobg)
}
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.2
diff -u -p -r1.1.2.1.2.2 views_slideshow_singleframe.module
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.module 28 Aug 2009 05:25:16 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.module 20 Sep 2009 00:46:09 -0000
@@ -36,6 +36,10 @@ function views_slideshow_singleframe_the
'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
'file' => 'views_slideshow_singleframe.theme.inc',
),
+ 'views_slideshow_singleframe_num_of_total' => array(
+ 'arguments' => array('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),
'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.6
diff -u -p -r1.1.2.1.2.6 views_slideshow_singleframe.theme.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 19 Sep 2009 18:44:52 -0000 1.1.2.1.2.6
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 20 Sep 2009 00:46:09 -0000
@@ -118,3 +118,8 @@ function theme_views_slideshow_singlefra
$output = '';
return $output;
}
+
+function theme_views_slideshow_singleframe_num_of_total($id, $view, $options) {
+ $output = ' ' . t('of') .'
';
+ return $output;
+}
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.3
diff -u -p -r1.1.2.1.2.3 views_slideshow_singleframe.views_slideshow.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc 19 Sep 2009 18:47:45 -0000 1.1.2.1.2.3
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc 20 Sep 2009 00:46:09 -0000
@@ -80,6 +80,13 @@ function views_slideshow_singleframe_vie
'#default_value' => (isset($view->options['singleframe']['pager'])) ? $view->options['singleframe']['pager'] : 0,
'#description' => t('Determine if a pager for the slideshow (1|2|3) should appear, and if so whether they should appear before or after the slideshow.'),
);
+ $form['singleframe']['num_of_total'] = array(
+ '#type' => 'select',
+ '#title' => t('Slide Number of Total Counter'),
+ '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
+ '#default_value' => (isset($view->options['singleframe']['num_of_total'])) ? $view->options['singleframe']['num_of_total'] : 0,
+ '#description' => t('Determine if the Slide Number of Total (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'),
+ );
$options = array(
'none' => 'none',
'blindX' => 'blindX',
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.2
diff -u -p -r1.1.2.1.2.2 views-slideshow-thumbnailhover.tpl.php
--- contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php 18 Sep 2009 22:15:49 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_thumbnailhover/views-slideshow-thumbnailhover.tpl.php 20 Sep 2009 00:46:09 -0000
@@ -15,6 +15,10 @@
print theme('views_slideshow_thumbnailhover_controls', $id, $view, $options);
}
+ if ($options['thumbnailhover']['num_of_total'] == 1) {
+ print theme('views_slideshow_thumbnailhover_num_of_total', $id, $view, $options);
+ }
+
$teaser = ($options['thumbnailhover']['hover_breakout'] == 'teaser' ? TRUE : FALSE);
$output = '';
$view_teasers = FALSE;
@@ -35,6 +39,10 @@
if ($options['thumbnailhover']['controls'] == 2) {
print theme('views_slideshow_thumbnailhover_controls',$id,$view,$options);
}
+
+ if ($options['thumbnailhover']['num_of_total'] == 2) {
+ print theme('views_slideshow_thumbnailhover_num_of_total', $id, $view, $options);
+ }
print $output;
?>
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.2
diff -u -p -r1.1.2.1.2.2 views_slideshow.css
--- contrib/views_slideshow_thumbnailhover/views_slideshow.css 19 Sep 2009 18:40:59 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.css 20 Sep 2009 00:46:09 -0000
@@ -2,6 +2,7 @@
.views_slideshow_thumbnailhover_no_display,
.views_slideshow_thumbnailhover_hidden,
-.views_slideshow_thumbnailhover_controls {
+.views_slideshow_thumbnailhover_controls,
+.views_slideshow_thumbnailhover_num_of_total {
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.7
diff -u -p -r1.1.2.2.2.7 views_slideshow.js
--- contrib/views_slideshow_thumbnailhover/views_slideshow.js 19 Sep 2009 18:47:45 -0000 1.1.2.2.2.7
+++ contrib/views_slideshow_thumbnailhover/views_slideshow.js 20 Sep 2009 00:46:09 -0000
@@ -24,6 +24,13 @@ Drupal.behaviors.viewsSlideshowThumbnail
pagerAnchorBuilder:(settings.pager_event == 'hoverIntent') ? null : function(idx, slide) {
return '#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + idx;
},
+ after:function(curr, next, opts) {
+ // Used for num of total counter.
+ if (settings.num_of_total) {
+ $('#views_slideshow_thumbnailhover_num_of_total_' + settings.id + ' span.num').html(opts.currSlide + 1);
+ $('#views_slideshow_thumbnailhover_num_of_total_' + settings.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)
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.2
diff -u -p -r1.1.2.1.2.2 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 28 Aug 2009 05:25:16 -0000 1.1.2.1.2.2
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 20 Sep 2009 00:46:09 -0000
@@ -37,6 +37,10 @@ function views_slideshow_thumbnailhover_
'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
'file' => 'views_slideshow_thumbnailhover.theme.inc',
),
+ 'views_slideshow_thumbnailhover_num_of_total' => array(
+ 'arguments' => array('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),
'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.6
diff -u -p -r1.1.2.1.2.6 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 19 Sep 2009 18:44:52 -0000 1.1.2.1.2.6
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 20 Sep 2009 00:46:10 -0000
@@ -151,3 +151,8 @@ function theme_views_slideshow_thumbnail
function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
return '' . t('Next') . "\n";
}
+
+function theme_views_slideshow_thumbnailhover_num_of_total($id, $view, $options) {
+ $output = ' ' . t('of') .'
';
+ return $output;
+}
\ No newline at end of file
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.4
diff -u -p -r1.1.2.1.2.4 views_slideshow_thumbnailhover.views_slideshow.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc 19 Sep 2009 18:47:45 -0000 1.1.2.1.2.4
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc 20 Sep 2009 00:46:10 -0000
@@ -117,6 +117,13 @@ function views_slideshow_thumbnailhover_
'#default_value' => (isset($view->options['thumbnailhover']['controls'])) ? $view->options['thumbnailhover']['controls'] : 0,
'#description' => t('Determine if controls for the slideshow (start/stop/next/previous) should appear, and if so whether they should appear before or after the slideshow.'),
);
+ $form['thumbnailhover']['num_of_total'] = array(
+ '#type' => 'select',
+ '#title' => t('Slide Number of Total Counter'),
+ '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
+ '#default_value' => (isset($view->options['thumbnailhover']['num_of_total'])) ? $view->options['thumbnailhover']['num_of_total'] : 0,
+ '#description' => t('Determine if the Slide Number of Total (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'),
+ );
$options = array(
'none' => 'none',
'blindX' => 'blindX',