diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-controls.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,4 **** ! > --- 1,4 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row-item.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,3 **** ! > --- 1,3 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame-row.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,3 **** ! > --- 1,3 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-main-frame.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,3 **** ! > --- 1,3 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-field.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-field.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-field.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-field.tpl.php 2010-11-25 19:39:30.193710667 +0200 *************** *** 1,10 **** !
field[$field]->label()) { ?> ! !
style_plugin->rendered_fields[$count][$field]; ?>
--- 1,10 ---- !
field[$field]->label()) { ?> ! !
style_plugin->rendered_fields[$count][$field]; ?>
diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field-item.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,3 **** ! > --- 1,3 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-field.tpl.php 2010-11-25 12:42:10.403710669 +0200 *************** *** 1,3 **** ! > --- 1,3 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php 2010-09-29 06:07:49.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-numbered.tpl.php 2010-11-25 12:42:10.407044002 +0200 *************** *** 1,4 **** ! ! > --- 1 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php 2010-09-29 06:07:49.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-pager-thumbnails.tpl.php 2010-11-25 12:42:10.407044002 +0200 *************** *** 1,4 **** ! ! > --- 1 ---- ! > diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle-slide-counter.tpl.php 2010-11-25 12:42:10.407044002 +0200 *************** *** 1,3 **** ! > 1 1 --- 1,3 ---- ! > 1 1 diff -cr ./contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc *** ./contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc 2010-09-29 10:18:41.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc 2010-11-25 19:41:56.070377333 +0200 *************** *** 25,31 **** $value = str_replace("\n", ' ', $value); } $value = trim($value); ! if (is_numeric($value)) { $value = (int)$value; } --- 25,31 ---- $value = str_replace("\n", ' ', $value); } $value = trim($value); ! if (is_numeric($value)) { $value = (int)$value; } *************** *** 36,45 **** $value = FALSE; } } ! $new_settings[$key] = $value; } ! // Remove any unused advanced settings. foreach ($settings as $key => $value) { if (substr($key, 0, 13) == 'advanced_use_' && !$value) { --- 36,45 ---- $value = FALSE; } } ! $new_settings[$key] = $value; } ! // Remove any unused advanced settings. foreach ($settings as $key => $value) { if (substr($key, 0, 13) == 'advanced_use_' && !$value) { *************** *** 64,72 **** // to the id to make it unique. $slideshow_count = 1; $current_settings = drupal_add_js(); ! foreach ($current_settings['setting'] AS $current_setting) { if (isset($current_setting['viewsSlideshowCycle'])) { ! $current_keys = array_keys($current_setting['viewsSlideshowCycle']); if (stristr($current_keys[0], '#views_slideshow_cycle_main_' . $vss_id)) { $slideshow_count++; } --- 64,72 ---- // to the id to make it unique. $slideshow_count = 1; $current_settings = drupal_add_js(); ! foreach ($current_settings['settings']['data'] AS $current_setting) { if (isset($current_setting['viewsSlideshowCycle'])) { ! $current_keys = isset($current_setting['viewsSlideshowCycle']) ? array_keys($current_setting['viewsSlideshowCycle']) : array(); if (stristr($current_keys[0], '#views_slideshow_cycle_main_' . $vss_id)) { $slideshow_count++; } *************** *** 75,85 **** if ($slideshow_count > 1) { $vss_id .= '-' . $slideshow_count; ! $settings['vss_id'] = $vss_id; } ! drupal_add_js(array('viewsSlideshowCycle' => array('#views_slideshow_cycle_main_' . $vss_id => $settings)), 'setting'); ! // Add the hoverIntent plugin. if (isset($settings['advanced_pagerevent']) && $settings['advanced_pagerevent'] == 'hoverIntent') { if (module_exists('jq')) { --- 75,85 ---- if ($slideshow_count > 1) { $vss_id .= '-' . $slideshow_count; ! $settings['vss_id'] = $vss_id; } ! drupal_add_js(array('viewsSlideshowCycle' => array('#views_slideshow_cycle_main_' . $vss_id => $settings)), 'setting'); ! // Add the hoverIntent plugin. if (isset($settings['advanced_pagerevent']) && $settings['advanced_pagerevent'] == 'hoverIntent') { if (module_exists('jq')) { *************** *** 96,120 **** // Enqueue any stylesheets set for the skin on this view are added. $skin_path = drupal_get_path('module', $skin_info['module']); if ($skin_info['path']) { ! $skin_path .= '/'. $skin_info['path']; } ! if (!empty($skin_info['stylesheets'])) { foreach ($skin_info['stylesheets'] as $stylesheet) { ! drupal_add_css($skin_path .'/'. $stylesheet); } } ! $hidden_elements = theme('views_slideshow_cycle_main_frame', $view, $rows, $vss_id, $options['mode']); ! $vars['slideshow'] = theme('views_slideshow_main_section', $vss_id, $hidden_elements, 'views_slideshow_cycle'); ! $weight = array( 'top' => array(), 'bottom' => array(), ); ! // Put our pager in the right location. ! $vars['pager_location'] = (isset($skin_info['pager_location'])) ? $skin_info['pager_location'] : $settings['pager']; $vars['pager'] = ''; if ($vars['pager_location']) { $weight[$vars['pager_location']]['pager'] = (isset($skin_info['pager_weight'])) ? $skin_info['pager_weight'] : $settings['pager_weight']; --- 96,120 ---- // Enqueue any stylesheets set for the skin on this view are added. $skin_path = drupal_get_path('module', $skin_info['module']); if ($skin_info['path']) { ! $skin_path .= '/' . $skin_info['path']; } ! if (!empty($skin_info['stylesheets'])) { foreach ($skin_info['stylesheets'] as $stylesheet) { ! drupal_add_css($skin_path . '/' . $stylesheet); } } ! $hidden_elements = theme('views_slideshow_cycle_main_frame', array('view' => $view, 'rows' => $rows, 'vss_id' => $vss_id, 'mode' => $options['mode'])); ! $vars['slideshow'] = theme('views_slideshow_main_section', array('id' => $vss_id, 'hidden_elements' => $hidden_elements, 'plugin' => 'views_slideshow_cycle')); ! $weight = array( 'top' => array(), 'bottom' => array(), ); ! // Put our pager in the right location. ! $vars['pager_location'] = (isset($skin_info['pager_location'])) ? $skin_info['pager_location'] : $settings['pager']; $vars['pager'] = ''; if ($vars['pager_location']) { $weight[$vars['pager_location']]['pager'] = (isset($skin_info['pager_weight'])) ? $skin_info['pager_weight'] : $settings['pager_weight']; *************** *** 128,150 **** if ($vars['controls_location']) { $weight[$vars['controls_location']]['controls'] = (isset($skin_info['controls_weight'])) ? $skin_info['controls_weight'] : $settings['controls_weight']; } ! // Put our slide counter in the right location. ! $vars['slide_counter_location'] = (isset($skin_info['slide_counter_location'])) ? $skin_info['slide_counter_location'] : $settings['slide_counter']; $vars['slide_counter'] = ''; if ($vars['slide_counter_location']) { $weight[$vars['slide_counter_location']]['slide_counter'] = (isset($skin_info['slide_counter_weight'])) ? $skin_info['slide_counter_weight'] : $settings['slide_counter_weight']; } ! // Build our widgets foreach ($weight as $location => $data) { // Build our top widgets if (!empty($data)) { asort($data); ! $vars[$location . '_widget_rendered'] = ''; foreach ($data as $type => $order) { ! $vars[$type] = theme('views_slideshow_cycle_' . $type, $vss_id, $view, $options); $vars[$location . '_widget_rendered'] .= $vars[$type]; } } --- 128,150 ---- if ($vars['controls_location']) { $weight[$vars['controls_location']]['controls'] = (isset($skin_info['controls_weight'])) ? $skin_info['controls_weight'] : $settings['controls_weight']; } ! // Put our slide counter in the right location. ! $vars['slide_counter_location'] = (isset($skin_info['slide_counter_location'])) ? $skin_info['slide_counter_location'] : $settings['slide_counter']; $vars['slide_counter'] = ''; if ($vars['slide_counter_location']) { $weight[$vars['slide_counter_location']]['slide_counter'] = (isset($skin_info['slide_counter_weight'])) ? $skin_info['slide_counter_weight'] : $settings['slide_counter_weight']; } ! // Build our widgets foreach ($weight as $location => $data) { // Build our top widgets if (!empty($data)) { asort($data); ! $vars[$location . '_widget_rendered'] = ''; foreach ($data as $type => $order) { ! $vars[$type] = theme('views_slideshow_cycle_' . $type, array('vss_id' => $vss_id, 'view' => $view, 'options' => $options)); $vars[$location . '_widget_rendered'] .= $vars[$type]; } } *************** *** 159,177 **** function template_preprocess_views_slideshow_cycle_main_frame(&$vars) { // Add the slideshow elements. ! $vars['attributes']['id'] = "views_slideshow_cycle_teaser_section_" . $vars['vss_id']; ! $vars['attributes']['class'] = 'views_slideshow_cycle_teaser_section'; ! $styles = ''; if (isset($vars['view']->display_handler->display->display_options['style_options']['views_slideshow_cycle'])) { $styles = $vars['view']->display_handler->display->display_options['style_options']['views_slideshow_cycle']; } ! $styles_default = ''; if (isset($vars['view']->display['default']->display_options['style_options']['views_slideshow_cycle'])) { $styles_default = $vars['view']->display['default']->display_options['style_options']['views_slideshow_cycle']; } ! // Retrive the number of items per frame if (isset($styles['items_per_slide']) && $styles['items_per_slide'] > 0) { $items_per_slide = $styles['items_per_slide']; --- 159,177 ---- function template_preprocess_views_slideshow_cycle_main_frame(&$vars) { // Add the slideshow elements. ! $vars['attributes_array']['id'] = "views_slideshow_cycle_teaser_section_" . $vars['vss_id']; ! $vars['attributes_array']['class'] = array('views_slideshow_cycle_teaser_section', 'clearfix'); ! $styles = ''; if (isset($vars['view']->display_handler->display->display_options['style_options']['views_slideshow_cycle'])) { $styles = $vars['view']->display_handler->display->display_options['style_options']['views_slideshow_cycle']; } ! $styles_default = ''; if (isset($vars['view']->display['default']->display_options['style_options']['views_slideshow_cycle'])) { $styles_default = $vars['view']->display['default']->display_options['style_options']['views_slideshow_cycle']; } ! // Retrive the number of items per frame if (isset($styles['items_per_slide']) && $styles['items_per_slide'] > 0) { $items_per_slide = $styles['items_per_slide']; *************** *** 182,202 **** else { $items_per_slide = 1; } ! $vars['items_per_slide'] = $items_per_slide; ! $items = array(); $slideshow_count = 0; $rendered_rows = ''; foreach ($vars['rows'] as $count => $item) { $items[] = $item; if (count($items) == $items_per_slide || $count == (count($rows)-1)) { ! $rendered_rows .= theme('views_slideshow_cycle_main_frame_row', $items, $vars['vss_id'], $slideshow_count); $items = array(); $slideshow_count++; } } ! $vars['rendered_rows'] = $rendered_rows; } --- 182,202 ---- else { $items_per_slide = 1; } ! $vars['items_per_slide'] = $items_per_slide; ! $items = array(); $slideshow_count = 0; $rendered_rows = ''; foreach ($vars['rows'] as $count => $item) { $items[] = $item; if (count($items) == $items_per_slide || $count == (count($rows)-1)) { ! $rendered_rows .= theme('views_slideshow_cycle_main_frame_row', array('items' => $items, 'vss_id' => $vars['vss_id'], 'count' => $slideshow_count)); $items = array(); $slideshow_count++; } } ! $vars['rendered_rows'] = $rendered_rows; } *************** *** 216,227 **** } $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd'; ! $vars['attributes']['class'] = implode(' ', $classes); ! $vars['attributes']['id'] = "views_slideshow_cycle_div_" . $vars['vss_id'] . "_" . $vars['count']; $vars['rendered_items'] = ''; foreach ($vars['items'] as $item_count => $item) { ! $vars['rendered_items'] .= theme('views_slideshow_cycle_main_frame_row_item', $item, $item_count); } } --- 216,227 ---- } $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd'; ! $vars['attributes_array']['class'] = $classes; ! $vars['attributes_array']['id'] = "views_slideshow_cycle_div_" . $vars['vss_id'] . "_" . $vars['count']; $vars['rendered_items'] = ''; foreach ($vars['items'] as $item_count => $item) { ! $vars['rendered_items'] .= theme('views_slideshow_cycle_main_frame_row_item', array('item' => $item, 'item_count' => $item_count)); } } *************** *** 236,242 **** else { $classes[] = 'views-row-odd'; } ! $vars['attributes']['class'] = implode(' ', $classes); } /** --- 236,242 ---- else { $classes[] = 'views-row-odd'; } ! $vars['attributes_array']['class'] = $classes; } /** *************** *** 250,266 **** 'views_slideshow_controls', ); ! $vars['attributes']['class'] = implode(' ', $classes); ! $vars['attributes']['id'] = "views_slideshow_cycle_controls_" . $vars['vss_id']; ! ! $vars['rendered_control_previous'] = theme('views_slideshow_cycle_control_previous', $vars['vss_id'], $vars['view'], $vars['options']); $vars['rendered_control_pause'] = ''; if ($vars['options']['views_slideshow_cycle']['timeout']) { ! $vars['rendered_control_pause'] = theme('views_slideshow_cycle_control_pause', $vars['vss_id'], $vars['view'], $vars['options']); } ! ! $vars['rendered_control_next'] = theme('views_slideshow_cycle_control_next', $vars['vss_id'], $vars['view'], $vars['options']); } /** --- 250,266 ---- 'views_slideshow_controls', ); ! $vars['attributes_array']['class'] = $classes; ! $vars['attributes_array']['id'] = "views_slideshow_cycle_controls_" . $vars['vss_id']; ! ! $vars['rendered_control_previous'] = theme('views_slideshow_cycle_control_previous', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options'])); $vars['rendered_control_pause'] = ''; if ($vars['options']['views_slideshow_cycle']['timeout']) { ! $vars['rendered_control_pause'] = theme('views_slideshow_cycle_control_pause', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options'])); } ! ! $vars['rendered_control_next'] = theme('views_slideshow_cycle_control_next', array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'options' => $vars['options'])); } /** *************** *** 271,277 **** function template_preprocess_views_slideshow_cycle_control_previous(&$vars) { $vars['rendered_previous_link'] = l(t('Previous'), '#', array( 'attributes' => array( ! 'class' => 'views_slideshow_cycle_previous views_slideshow_previous', 'id' => "views_slideshow_cycle_prev_" . $vars['vss_id'], ), 'fragment' => ' ', --- 271,277 ---- function template_preprocess_views_slideshow_cycle_control_previous(&$vars) { $vars['rendered_previous_link'] = l(t('Previous'), '#', array( 'attributes' => array( ! 'class' => array('views_slideshow_cycle_previous', 'views_slideshow_previous'), 'id' => "views_slideshow_cycle_prev_" . $vars['vss_id'], ), 'fragment' => ' ', *************** *** 287,293 **** function template_preprocess_views_slideshow_cycle_control_pause(&$vars) { $vars['rendered_pause_link'] = l(t('Pause'), '', array( 'attributes' => array( ! 'class' => 'views_slideshow_cycle_pause views_slideshow_pause', 'id' => "views_slideshow_cycle_playpause_" . $vars['vss_id'], ), 'fragment' => ' ', --- 287,293 ---- function template_preprocess_views_slideshow_cycle_control_pause(&$vars) { $vars['rendered_pause_link'] = l(t('Pause'), '', array( 'attributes' => array( ! 'class' => array('views_slideshow_cycle_pause', 'views_slideshow_pause'), 'id' => "views_slideshow_cycle_playpause_" . $vars['vss_id'], ), 'fragment' => ' ', *************** *** 303,309 **** function template_preprocess_views_slideshow_cycle_control_next(&$vars) { $vars['rendered_next_link'] = l(t('Next'), '#', array( 'attributes' => array( ! 'class' => 'views_slideshow_cycle_next views_slideshow_next', 'id' => "views_slideshow_cycle_next_" . $vars['vss_id'], ), 'fragment' => ' ', --- 303,309 ---- function template_preprocess_views_slideshow_cycle_control_next(&$vars) { $vars['rendered_next_link'] = l(t('Next'), '#', array( 'attributes' => array( ! 'class' => array('views_slideshow_cycle_next', 'views_slideshow_next'), 'id' => "views_slideshow_cycle_next_" . $vars['vss_id'], ), 'fragment' => ' ', *************** *** 316,328 **** * * @ingroup themeable */ ! function theme_views_slideshow_cycle_pager($vss_id, $view, $options) { $output = ''; ! // Create some attributes ! $attributes['class'] = 'views_slideshow_cycle_pager'; $attributes['id'] = 'views_slideshow_cycle_pager_' . $vss_id; ! // Allow other modules change the output // Using foreach instead of module_invoke_all because module_invoke_all // doesn't support pass by reference. --- 316,330 ---- * * @ingroup themeable */ ! function theme_views_slideshow_cycle_pager($vars) { $output = ''; ! $vss_id = $vars['vss_id']; ! $view = $vars['view']; ! $options = $vars['options']; // Create some attributes ! $attributes['class'] = array('views_slideshow_cycle_pager'); $attributes['id'] = 'views_slideshow_cycle_pager_' . $vss_id; ! // Allow other modules change the output // Using foreach instead of module_invoke_all because module_invoke_all // doesn't support pass by reference. *************** *** 335,369 **** } /** ! * Implementation of hook_views_slideshow_cycle_pager_theme. */ function views_slideshow_cycle_views_slideshow_cycle_pager_theme(&$output, $vss_id, $view, $options, $attributes) { switch ($options['pager_type']) { case 'numbered': ! $output = theme('views_slideshow_cycle_pager_numbered', $view, $attributes, $options); break; ! case 'thumbnails': ! $output = theme('views_slideshow_cycle_pager_thumbnails', $view, $attributes, $options); break; ! case 'fields': ! $output = theme('views_slideshow_cycle_pager_field', $view, $attributes, $options); break; } } function template_preprocess_views_slideshow_cycle_pager_field(&$vars) { ! $vars['attributes']['class'] .= ' views_slideshow_pager_field'; $vars['rendered_field_items'] = ''; foreach ($vars['view']->result as $count => $node) { $rendered_fields = ''; foreach ($vars['options']['pager_fields'] as $field => $use) { if ($use !== 0 && is_object($vars['view']->field[$field])) { ! $rendered_fields .= theme('views_slideshow_cycle_pager_field_field', $vars['view'], $field, $count); } } ! $vars['rendered_field_items'] .= theme('views_slideshow_cycle_pager_field_item', $rendered_fields, $vars['vss_id'], $count); } } --- 337,375 ---- } /** ! * Implements hook_views_slideshow_cycle_pager_theme(). */ function views_slideshow_cycle_views_slideshow_cycle_pager_theme(&$output, $vss_id, $view, $options, $attributes) { + switch ($options['pager_type']) { case 'numbered': ! $attributes['class'][] = 'views_slideshow_pager_numbered'; ! $output = theme('views_slideshow_cycle_pager_numbered', array('view' => $view, 'attributes_array' => $attributes, 'options' => $options)); break; ! case 'thumbnails': ! $attributes['class'][] = 'views_slideshow_pager_thumbnails'; ! $output = theme('views_slideshow_cycle_pager_thumbnails', array('view' => $view, 'attributes_array' => $attributes, 'options' => $options)); break; ! case 'fields': ! $output = theme('views_slideshow_cycle_pager_field', array('vss_id' => $vss_id, 'view' => $view, 'attributes_array' => $attributes, 'options' => $options)); break; } + } function template_preprocess_views_slideshow_cycle_pager_field(&$vars) { ! $vars['attributes_array']['class'][] = ' views_slideshow_pager_field'; $vars['rendered_field_items'] = ''; foreach ($vars['view']->result as $count => $node) { $rendered_fields = ''; foreach ($vars['options']['pager_fields'] as $field => $use) { if ($use !== 0 && is_object($vars['view']->field[$field])) { ! $rendered_fields .= theme('views_slideshow_cycle_pager_field_field', array('view' => $vars['view'], 'field' => $field, 'count' => $count)); } } ! $vars['rendered_field_items'] .= theme('views_slideshow_cycle_pager_field_item', array('item' => $rendered_fields, 'vss_id' => $vars['vss_id'], 'count' => $count)); } } *************** *** 374,379 **** --- 380,386 ---- */ function template_preprocess_views_slideshow_cycle_pager_field_item(&$vars) { $current = $vars['count'] + 1; + $count = $vars['count']; $classes = array( 'views_slideshow_cycle_div_pager_item', ); *************** *** 382,389 **** } $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd'; ! $vars['attributes']['class'] = implode(' ', $classes); ! $vars['attributes']['id'] = 'views_slideshow_cycle_div_pager_item_' . $vars['vss_id'] . '_' . $vars['count']; } /** --- 389,396 ---- } $classes[] = ($vars['count'] % 2) ? 'views-row-even' : 'views-row-odd'; ! $vars['attributes_array']['class'] = $classes; ! $vars['attributes_array']['id'] = 'views_slideshow_cycle_div_pager_item_' . $vars['vss_id'] . '_' . $vars['count']; } /** *************** *** 392,397 **** * @ingroup themeable */ function template_preprocess_views_slideshow_cycle_slide_counter(&$vars) { ! $vars['attributes']['class'] = 'views_slideshow_cycle_slide_counter views_slideshow_slide_counter'; ! $vars['attributes']['id'] = "views_slideshow_cycle_slide_counter_" . $vars['vss_id']; } --- 399,404 ---- * @ingroup themeable */ function template_preprocess_views_slideshow_cycle_slide_counter(&$vars) { ! $vars['attributes_array']['class'] = array('views_slideshow_cycle_slide_counter', 'views_slideshow_slide_counter'); ! $vars['attributes_array']['id'] = "views_slideshow_cycle_slide_counter_" . $vars['vss_id']; } diff -cr ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php *** ./contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php 2010-09-27 08:27:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/theme/views-slideshow-cycle.tpl.php 2010-11-25 12:42:10.407044002 +0200 *************** *** 9,15 ****
!
--- 9,15 ----
!
*************** *** 17,23 **** !
--- 17,23 ---- !
diff -cr ./contrib/views_slideshow_cycle/views_slideshow_cycle.info ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.info *** ./contrib/views_slideshow_cycle/views_slideshow_cycle.info 2010-11-12 14:28:47.000000000 +0200 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.info 2010-11-25 12:44:23.883710670 +0200 *************** *** 3,13 **** description = Adds a Rotating slideshow mode to Views Slideshow. dependencies[] = views_slideshow package = Views ! core = 6.x ; Information added by drupal.org packaging script on 2010-11-12 ! version = "6.x-3.x-dev" ! core = "6.x" project = "views_slideshow" datestamp = "1289564927" --- 3,16 ---- description = Adds a Rotating slideshow mode to Views Slideshow. dependencies[] = views_slideshow package = Views ! core = 7.x ! files[] = views_slideshow_cycle.module ! files[] = views_slideshow_cycle.views_slideshow.inc ! files[] = theme/views_slideshow_cycle.theme.inc ; Information added by drupal.org packaging script on 2010-11-12 ! version = "7.x-3.x-dev" ! core = "7.x" project = "views_slideshow" datestamp = "1289564927" diff -cr ./contrib/views_slideshow_cycle/views_slideshow_cycle.js ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.js *** ./contrib/views_slideshow_cycle/views_slideshow_cycle.js 2010-09-29 06:29:45.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.js 2010-11-25 12:42:10.400377335 +0200 *************** *** 4,365 **** * @file * A simple jQuery Cycle Div Slideshow Rotator. */ ! /** * This will set our initial behavior, by starting up each individual slideshow. */ ! Drupal.behaviors.viewsSlideshowCycle = function (context) { ! $('.views_slideshow_cycle_main:not(.viewsSlideshowCycle-processed)', context).addClass('viewsSlideshowCycle-processed').each(function() { ! var fullId = '#' + $(this).attr('id'); ! var settings = Drupal.settings.viewsSlideshowCycle[fullId]; ! settings.targetId = '#' + $(fullId + " :first").attr('id'); ! settings.paused = false; ! ! settings.opts = { ! speed:settings.speed, ! timeout:settings.timeout, ! delay:settings.delay, ! sync:settings.sync, ! random:settings.random, ! pagerAnchorBuilder:function(idx, slide) { ! var classes = 'pager-item pager-num-' + (idx+1); ! if (idx == 0) { ! classes += ' first'; ! } ! if ($(slide).siblings().length == idx) { ! classes += ' last'; ! } ! ! if (idx % 2) { ! classes += ' odd'; ! } ! else { ! classes += ' even'; ! } ! ! // Call the theme function for the pager. ! var theme = 'viewsSlideshowPager' + settings.pager_type; ! return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : ''; ! }, ! allowPagerClickBubble:(settings.pager_hover), ! prev:(settings.controls != 0)?'#views_slideshow_cycle_prev_' + settings.vss_id:null, ! next:(settings.controls != 0)?'#views_slideshow_cycle_next_' + settings.vss_id:null, ! pager:(settings.pager != 0)?'#views_slideshow_cycle_pager_' + settings.vss_id:null, ! nowrap:settings.nowrap, ! after:function(curr, next, opts) { ! // Used for Slide Counter. ! if (settings.slide_counter) { ! $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.num').html(opts.currSlide + 1); ! $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.total').html(opts.slideCount); ! } ! }, ! before:function(curr, next, opts) { ! // Remember last slide. ! if (settings.remember_slide) { ! createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days); ! } ! ! // Make variable height. ! if (!settings.fixed_height) { ! //get the height of the current slide ! var $ht = $(this).height(); ! //set the container's height to that of the current slide ! $(this).parent().animate({height: $ht}); ! } ! }, ! cleartype:(settings.cleartype)? true : false, ! cleartypeNoBg:(settings.cleartypenobg)? true : false, ! activePagerClass:'active-slide' ! } ! ! // Set the starting slide if we are supposed to remember the slide ! if (settings.remember_slide) { ! var startSlide = readCookie(settings.vss_id); ! if (startSlide == null) { ! startSlide = 0; } - settings.opts.startingSlide = startSlide; - } ! if (settings.pager_hover) { ! settings.opts.pagerEvent = 'mouseover'; ! settings.opts.pauseOnPagerHover = true; ! } ! if (settings.effect == 'none') { ! settings.opts.speed = 1; ! } ! else { ! settings.opts.fx = settings.effect; ! } ! // Pause on hover. ! if (settings.pause) { ! $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).hover(function() { ! $(settings.targetId).cycle('pause'); ! }, function() { ! if (!settings.paused) { ! $(settings.targetId).cycle('resume'); ! } ! }); ! } ! // Pause on clicking of the slide. ! if (settings.pause_on_click) { ! $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).click(function() { ! viewsSlideshowCyclePause(settings); ! }); ! } ! ! // Allow pagers to override settings. ! if (settings.pager != 0) { ! var pagerAlter = 'viewsSlideshowCyclePager' + settings.pager_type + 'SettingsAlter'; ! if (typeof window[pagerAlter] == 'function') { ! settings = window[pagerAlter](settings); } ! } ! ! // Advanced Settings ! if (typeof(settings.advanced_fx) !== 'undefined') { settings.opts.fx = settings.advanced_fx; } ! ! if (typeof(settings.advanced_timeout) !== 'undefined') { settings.opts.timeout = settings.advanced_timeout; } ! ! if (typeof(settings.advanced_timeoutfn) !== 'undefined') { ! settings.opts.timeoutFn = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_timeoutfn); } ! } ! ! // true to start next transition immediately after current one completes ! if (typeof(settings.advanced_continuous) !== 'undefined') { settings.opts.continuous = settings.advanced_continuous; } ! ! // speed of the transition (any valid fx speed value) ! if (typeof(settings.advanced_speed) !== 'undefined') { settings.opts.speed = settings.advanced_speed; } ! ! // speed of the 'in' transition ! if (typeof(settings.advanced_speedin) !== 'undefined') { settings.opts.speedIn = settings.advanced_speedin; } ! ! // speed of the 'out' transition ! if (typeof(settings.advanced_speedout) !== 'undefined') { settings.opts.speedOut = settings.advanced_speedout; } ! ! // selector for element to use as click trigger for next slide ! if (typeof(settings.advanced_next) !== 'undefined') { settings.opts.next = settings.advanced_next; } ! ! // selector for element to use as click trigger for previous slide ! if (typeof(settings.advanced_prev) !== 'undefined') { settings.opts.prev = settings.advanced_prev; } ! ! // callback fn for prev/next clicks: function(isNext, zeroBasedSlideIndex, slideElement) ! if (typeof(settings.advanced_prevnextclick) !== 'undefined') { ! settings.opts.prevNextClick = function(isNext, zeroBasedSlideIndex, slideElement) { ! eval(settings.advanced_prevnextclick); } ! } ! ! // event which drives the manual transition to the previous or next slide ! if (typeof(settings.advanced_prevnextevent) !== 'undefined') { settings.opts.prevNextEvent = settings.advanced_prevnextevent; } ! ! // selector for element to use as pager container ! if (typeof(settings.advanced_pager) !== 'undefined') { settings.opts.pager = settings.advanced_pager; } ! ! // callback fn for pager clicks: function(zeroBasedSlideIndex, slideElement) ! if (typeof(settings.advanced_pagerclick) !== 'undefined') { ! settings.opts.pagerClick = function(zeroBasedSlideIndex, slideElement) { ! eval(settings.advanced_pagerclick); } ! } ! ! // name of event which drives the pager navigation ! if (typeof(settings.advanced_pagerevent) !== 'undefined') { settings.opts.pagerEvent = settings.advanced_pagerevent; } ! ! // allows or prevents click event on pager anchors from bubbling ! if (typeof(settings.advanced_allowpagerclickbubble) !== 'undefined') { settings.opts.allowPagerClickBubble = settings.advanced_allowpagerclickbubble; } ! ! // callback fn for building anchor links: function(index, DOMelement) ! if (typeof(settings.advanced_pageranchorbuilder) !== 'undefined') { ! settings.opts.pagerAnchorBuilder = function(index, DOMelement) { ! eval(settings.advanced_pageranchorbuilder); } ! } ! ! // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) ! if (typeof(settings.advanced_before) !== 'undefined') { ! settings.opts.before = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_before); } ! } ! ! // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) ! if (typeof(settings.advanced_after) !== 'undefined') { ! settings.opts.after = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_after); } ! } ! ! // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) ! if (typeof(settings.advanced_end) !== 'undefined') { ! settings.opts.end = function(options) { ! eval(settings.advanced_end); } ! } ! ! // easing method for both in and out transitions ! if (typeof(settings.advanced_easing) !== 'undefined') { settings.opts.easing = settings.advanced_easing; } ! ! // easing for "in" transition ! if (typeof(settings.advanced_easein) !== 'undefined') { settings.opts.easeIn = settings.advanced_easein; } ! ! // easing for "out" transition ! if (typeof(settings.advanced_easeout) !== 'undefined') { settings.opts.easeOut = settings.advanced_easeout; } ! ! // coords for shuffle animation, ex: { top:15, left: 200 } ! if (typeof(settings.advanced_shuffle) !== 'undefined') { settings.opts.shuffle = settings.advanced_shuffle; } ! ! // properties that define how the slide animates in ! if (typeof(settings.advanced_animin) !== 'undefined') { settings.opts.animIn = settings.advanced_animin; } ! ! // properties that define how the slide animates out ! if (typeof(settings.advanced_animout) !== 'undefined') { settings.opts.animOut = settings.advanced_animout; } ! ! // properties that define the initial state of the slide before transitioning in ! if (typeof(settings.advanced_cssbefore) !== 'undefined') { settings.opts.cssBefore = settings.advanced_cssbefore; } ! ! // properties that defined the state of the slide after transitioning out ! if (typeof(settings.advanced_cssafter) !== 'undefined') { settings.opts.cssAfter = settings.advanced_cssafter; } ! ! // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) ! if (typeof(settings.advanced_fxfn) !== 'undefined') { ! settings.opts.fxFn = function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) { ! eval(settings.advanced_fxfn); } ! } ! ! // container height ! if (typeof(settings.advanced_height) !== 'undefined') { settings.opts.height = settings.advanced_height; } ! ! // zero-based index of the first slide to be displayed ! if (typeof(settings.advanced_startingslide) !== 'undefined') { settings.opts.startingSlide = settings.advanced_startingslide; } ! ! // true if in/out transitions should occur simultaneously ! if (typeof(settings.advanced_sync) !== 'undefined') { settings.opts.sync = settings.advanced_sync; } ! ! // true for random, false for sequence (not applicable to shuffle fx) ! if (typeof(settings.advanced_random) !== 'undefined') { settings.opts.random = settings.advanced_random; } ! ! // force slides to fit container ! if (typeof(settings.advanced_fit) !== 'undefined') { settings.opts.fit = settings.advanced_fit; } ! ! // resize container to fit largest slide ! if (typeof(settings.advanced_containerresize) !== 'undefined') { settings.opts.containerResize = settings.advanced_containerresize; } ! ! // true to enable "pause on hover" ! if (typeof(settings.advanced_pause) !== 'undefined') { settings.opts.pause = settings.advanced_pause; } ! ! // true to pause when hovering over pager link ! if (typeof(settings.advanced_pauseonpagerhover) !== 'undefined') { settings.opts.pauseOnPagerHover = settings.advanced_pauseonpagerhover; } ! ! // true to end slideshow after X transitions (where X == slide count) ! if (typeof(settings.advanced_autostop) !== 'undefined') { settings.opts.autostop = settings.advanced_autostop; } ! ! // number of transitions (optionally used with autostop to define X) ! if (typeof(settings.advanced_autostopcount) !== 'undefined') { settings.opts.autostopCount = settings.advanced_autostopcount; } ! ! // additional delay (in ms) for first transition (hint: can be negative) ! if (typeof(settings.advanced_delay) !== 'undefined') { settings.opts.delay = settings.advanced_delay; } ! ! // expression for selecting slides (if something other than all children is required) ! if (typeof(settings.advanced_slideexpr) !== 'undefined') { settings.opts.slideExpr = settings.advanced_slideexpr; } ! ! // true if clearType corrections should be applied (for IE) ! if (typeof(settings.advanced_cleartype) !== 'undefined') { settings.opts.cleartype = settings.advanced_cleartype; } ! ! // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) ! if (typeof(settings.advanced_cleartypenobg) !== 'undefined') { settings.opts.cleartypeNoBg = settings.advanced_cleartypenobg; } ! ! // true to prevent slideshow from wrapping ! if (typeof(settings.advanced_nowrap) !== 'undefined') { settings.opts.nowrap = settings.advanced_nowrap; } ! ! // force fast transitions when triggered manually (via pager or prev/next); value == time in ms ! if (typeof(settings.advanced_fastonevent) !== 'undefined') { settings.opts.fastOnEvent = settings.advanced_fastonevent; } ! ! // valid when multiple effects are used; true to make the effect sequence random ! if (typeof(settings.advanced_randomizeeffects) !== 'undefined') { settings.opts.randomizeEffects = settings.advanced_randomizeeffects; } ! ! // causes animations to transition in reverse ! if (typeof(settings.advanced_rev) !== 'undefined') { settings.opts.rev = settings.advanced_rev; } ! ! // causes manual transition to stop an active transition instead of being ignored ! if (typeof(settings.advanced_manualtrump) !== 'undefined') { settings.opts.manualTrump = settings.advanced_manualtrump; } ! ! // requeue the slideshow if any image slides are not yet loaded ! if (typeof(settings.advanced_requeueonimagenotloaded) !== 'undefined') { settings.opts.requeueOnImageNotLoaded = settings.advanced_requeueonimagenotloaded; } ! ! // ms delay for requeue ! if (typeof(settings.advanced_requeuetimeout) !== 'undefined') { settings.opts.requeueTimeout = settings.advanced_requeuetimeout; } ! ! // class name used for the active pager link ! if (typeof(settings.advanced_activepagerclass) !== 'undefined') { settings.opts.activePagerClass = settings.advanced_activepagerclass; } ! ! // callback fn invoked to update the active pager link (adds/removes activePagerClass style) ! if (typeof(settings.advanced_updateactivepagerlink) !== 'undefined') { settings.opts.updateActivePagerLink = eval(settings.advanced_updateactivepagerlink); } ! ! $(settings.targetId).cycle(settings.opts); ! ! // Start Paused ! if (settings.start_paused) { ! viewsSlideshowCyclePause(settings); ! } ! ! // Pause if hidden. ! if (settings.pause_when_hidden) { ! var checkPause = function(settings) { ! // If the slideshow is visible and it is paused then resume. ! // otherwise if the slideshow is not visible and it is not paused then ! // pause it. ! var visible = viewsSlideshowCycleIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible); ! if (visible && settings.paused) { ! viewsSlideshowCycleResume(settings); } ! else if (!visible && !settings.paused) { ! viewsSlideshowCyclePause(settings); } } - - // Check when scrolled. - $(window).scroll(function() { - checkPause(settings); - }); - - // Check when the window is resized. - $(window).resize(function() { - checkPause(settings); - }); - } ! // Show image count for people who have js enabled. ! $('#views_slideshow_cycle_image_count_' + settings.vss_id).show(); ! if (settings.controls != 0) { ! // Show controls for people who have js enabled browsers. ! $('#views_slideshow_cycle_controls_' + settings.vss_id).show(); ! ! $('#views_slideshow_cycle_playpause_' + settings.vss_id).click(function(e) { ! if (settings.paused) { ! viewsSlideshowCycleResume(settings); ! } ! else { ! viewsSlideshowCyclePause(settings); ! } ! e.preventDefault(); ! }); ! } ! }); } ! // Pause the slideshow viewsSlideshowCyclePause = function (settings) { // Make Resume translatable var resume = Drupal.t('Resume'); ! $(settings.targetId).cycle('pause'); if (settings.controls != 0) { $('#views_slideshow_cycle_playpause_' + settings.vss_id) --- 4,367 ---- * @file * A simple jQuery Cycle Div Slideshow Rotator. */ ! (function($) { /** * This will set our initial behavior, by starting up each individual slideshow. */ ! Drupal.behaviors.viewsSlideshowCycle = { ! attach: function (context) { ! $('.views_slideshow_cycle_main:not(.viewsSlideshowCycle-processed)', context).addClass('viewsSlideshowCycle-processed').each(function() { ! var fullId = '#' + $(this).attr('id'); ! var settings = Drupal.settings.viewsSlideshowCycle[fullId]; ! settings.targetId = '#' + $(fullId + " :first").attr('id'); ! settings.paused = false; ! ! settings.opts = { ! speed:settings.speed, ! timeout:settings.timeout, ! delay:settings.delay, ! sync:settings.sync, ! random:settings.random, ! pagerAnchorBuilder:function(idx, slide) { ! var classes = 'pager-item pager-num-' + (idx+1); ! if (idx == 0) { ! classes += ' first'; ! } ! if ($(slide).siblings().length == idx) { ! classes += ' last'; ! } ! ! if (idx % 2) { ! classes += ' odd'; ! } ! else { ! classes += ' even'; ! } ! ! // Call the theme function for the pager. ! var theme = 'viewsSlideshowPager' + settings.pager_type; ! return Drupal.theme.prototype[theme] ? Drupal.theme(theme, classes, idx, slide, settings) : ''; ! }, ! allowPagerClickBubble:(settings.pager_hover), ! prev:(settings.controls != 0)?'#views_slideshow_cycle_prev_' + settings.vss_id:null, ! next:(settings.controls != 0)?'#views_slideshow_cycle_next_' + settings.vss_id:null, ! pager:(settings.pager != 0)?'#views_slideshow_cycle_pager_' + settings.vss_id:null, ! nowrap:settings.nowrap, ! after:function(curr, next, opts) { ! // Used for Slide Counter. ! if (settings.slide_counter) { ! $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.num').html(opts.currSlide + 1); ! $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.total').html(opts.slideCount); ! } ! }, ! before:function(curr, next, opts) { ! // Remember last slide. ! if (settings.remember_slide) { ! createCookie(settings.vss_id, opts.currSlide + 1, settings.remember_slide_days); ! } ! ! // Make variable height. ! if (!settings.fixed_height) { ! //get the height of the current slide ! var $ht = $(this).height(); ! //set the container's height to that of the current slide ! $(this).parent().animate({height: $ht}); ! } ! }, ! cleartype:(settings.cleartype)? true : false, ! cleartypeNoBg:(settings.cleartypenobg)? true : false, ! activePagerClass:'active-slide' ! } ! ! // Set the starting slide if we are supposed to remember the slide ! if (settings.remember_slide) { ! var startSlide = readCookie(settings.vss_id); ! if (startSlide == null) { ! startSlide = 0; ! } ! settings.opts.startingSlide = startSlide; } ! if (settings.pager_hover) { ! settings.opts.pagerEvent = 'mouseover'; ! settings.opts.pauseOnPagerHover = true; ! } ! if (settings.effect == 'none') { ! settings.opts.speed = 1; ! } ! else { ! settings.opts.fx = settings.effect; ! } ! // Pause on hover. ! if (settings.pause) { ! $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).hover(function() { ! $(settings.targetId).cycle('pause'); ! }, function() { ! if (!settings.paused) { ! $(settings.targetId).cycle('resume'); ! } ! }); ! } ! // Pause on clicking of the slide. ! if (settings.pause_on_click) { ! $('#views_slideshow_cycle_teaser_section_' + settings.vss_id).click(function() { ! viewsSlideshowCyclePause(settings); ! }); } ! ! // Allow pagers to override settings. ! if (settings.pager != 0) { ! var pagerAlter = 'viewsSlideshowCyclePager' + settings.pager_type + 'SettingsAlter'; ! if (typeof window[pagerAlter] == 'function') { ! settings = window[pagerAlter](settings); ! } } ! ! // Advanced Settings ! if (typeof(settings.advanced_fx) !== 'undefined') { settings.opts.fx = settings.advanced_fx; } ! ! if (typeof(settings.advanced_timeout) !== 'undefined') { settings.opts.timeout = settings.advanced_timeout; } ! ! if (typeof(settings.advanced_timeoutfn) !== 'undefined') { ! settings.opts.timeoutFn = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_timeoutfn); ! } } ! ! // true to start next transition immediately after current one completes ! if (typeof(settings.advanced_continuous) !== 'undefined') { settings.opts.continuous = settings.advanced_continuous; } ! ! // speed of the transition (any valid fx speed value) ! if (typeof(settings.advanced_speed) !== 'undefined') { settings.opts.speed = settings.advanced_speed; } ! ! // speed of the 'in' transition ! if (typeof(settings.advanced_speedin) !== 'undefined') { settings.opts.speedIn = settings.advanced_speedin; } ! ! // speed of the 'out' transition ! if (typeof(settings.advanced_speedout) !== 'undefined') { settings.opts.speedOut = settings.advanced_speedout; } ! ! // selector for element to use as click trigger for next slide ! if (typeof(settings.advanced_next) !== 'undefined') { settings.opts.next = settings.advanced_next; } ! ! // selector for element to use as click trigger for previous slide ! if (typeof(settings.advanced_prev) !== 'undefined') { settings.opts.prev = settings.advanced_prev; } ! ! // callback fn for prev/next clicks: function(isNext, zeroBasedSlideIndex, slideElement) ! if (typeof(settings.advanced_prevnextclick) !== 'undefined') { ! settings.opts.prevNextClick = function(isNext, zeroBasedSlideIndex, slideElement) { ! eval(settings.advanced_prevnextclick); ! } } ! ! // event which drives the manual transition to the previous or next slide ! if (typeof(settings.advanced_prevnextevent) !== 'undefined') { settings.opts.prevNextEvent = settings.advanced_prevnextevent; } ! ! // selector for element to use as pager container ! if (typeof(settings.advanced_pager) !== 'undefined') { settings.opts.pager = settings.advanced_pager; } ! ! // callback fn for pager clicks: function(zeroBasedSlideIndex, slideElement) ! if (typeof(settings.advanced_pagerclick) !== 'undefined') { ! settings.opts.pagerClick = function(zeroBasedSlideIndex, slideElement) { ! eval(settings.advanced_pagerclick); ! } } ! ! // name of event which drives the pager navigation ! if (typeof(settings.advanced_pagerevent) !== 'undefined') { settings.opts.pagerEvent = settings.advanced_pagerevent; } ! ! // allows or prevents click event on pager anchors from bubbling ! if (typeof(settings.advanced_allowpagerclickbubble) !== 'undefined') { settings.opts.allowPagerClickBubble = settings.advanced_allowpagerclickbubble; } ! ! // callback fn for building anchor links: function(index, DOMelement) ! if (typeof(settings.advanced_pageranchorbuilder) !== 'undefined') { ! settings.opts.pagerAnchorBuilder = function(index, DOMelement) { ! eval(settings.advanced_pageranchorbuilder); ! } } ! ! // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) ! if (typeof(settings.advanced_before) !== 'undefined') { ! settings.opts.before = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_before); ! } } ! ! // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) ! if (typeof(settings.advanced_after) !== 'undefined') { ! settings.opts.after = function(currSlideElement, nextSlideElement, options, forwardFlag) { ! eval(settings.advanced_after); ! } } ! ! // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) ! if (typeof(settings.advanced_end) !== 'undefined') { ! settings.opts.end = function(options) { ! eval(settings.advanced_end); ! } } ! ! // easing method for both in and out transitions ! if (typeof(settings.advanced_easing) !== 'undefined') { settings.opts.easing = settings.advanced_easing; } ! ! // easing for "in" transition ! if (typeof(settings.advanced_easein) !== 'undefined') { settings.opts.easeIn = settings.advanced_easein; } ! ! // easing for "out" transition ! if (typeof(settings.advanced_easeout) !== 'undefined') { settings.opts.easeOut = settings.advanced_easeout; } ! ! // coords for shuffle animation, ex: { top:15, left: 200 } ! if (typeof(settings.advanced_shuffle) !== 'undefined') { settings.opts.shuffle = settings.advanced_shuffle; } ! ! // properties that define how the slide animates in ! if (typeof(settings.advanced_animin) !== 'undefined') { settings.opts.animIn = settings.advanced_animin; } ! ! // properties that define how the slide animates out ! if (typeof(settings.advanced_animout) !== 'undefined') { settings.opts.animOut = settings.advanced_animout; } ! ! // properties that define the initial state of the slide before transitioning in ! if (typeof(settings.advanced_cssbefore) !== 'undefined') { settings.opts.cssBefore = settings.advanced_cssbefore; } ! ! // properties that defined the state of the slide after transitioning out ! if (typeof(settings.advanced_cssafter) !== 'undefined') { settings.opts.cssAfter = settings.advanced_cssafter; } ! ! // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) ! if (typeof(settings.advanced_fxfn) !== 'undefined') { ! settings.opts.fxFn = function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) { ! eval(settings.advanced_fxfn); } ! } ! ! // container height ! if (typeof(settings.advanced_height) !== 'undefined') { settings.opts.height = settings.advanced_height; } ! ! // zero-based index of the first slide to be displayed ! if (typeof(settings.advanced_startingslide) !== 'undefined') { settings.opts.startingSlide = settings.advanced_startingslide; } ! ! // true if in/out transitions should occur simultaneously ! if (typeof(settings.advanced_sync) !== 'undefined') { settings.opts.sync = settings.advanced_sync; } ! ! // true for random, false for sequence (not applicable to shuffle fx) ! if (typeof(settings.advanced_random) !== 'undefined') { settings.opts.random = settings.advanced_random; } ! ! // force slides to fit container ! if (typeof(settings.advanced_fit) !== 'undefined') { settings.opts.fit = settings.advanced_fit; } ! ! // resize container to fit largest slide ! if (typeof(settings.advanced_containerresize) !== 'undefined') { settings.opts.containerResize = settings.advanced_containerresize; } ! ! // true to enable "pause on hover" ! if (typeof(settings.advanced_pause) !== 'undefined') { settings.opts.pause = settings.advanced_pause; } ! ! // true to pause when hovering over pager link ! if (typeof(settings.advanced_pauseonpagerhover) !== 'undefined') { settings.opts.pauseOnPagerHover = settings.advanced_pauseonpagerhover; } ! ! // true to end slideshow after X transitions (where X == slide count) ! if (typeof(settings.advanced_autostop) !== 'undefined') { settings.opts.autostop = settings.advanced_autostop; } ! ! // number of transitions (optionally used with autostop to define X) ! if (typeof(settings.advanced_autostopcount) !== 'undefined') { settings.opts.autostopCount = settings.advanced_autostopcount; } ! ! // additional delay (in ms) for first transition (hint: can be negative) ! if (typeof(settings.advanced_delay) !== 'undefined') { settings.opts.delay = settings.advanced_delay; } ! ! // expression for selecting slides (if something other than all children is required) ! if (typeof(settings.advanced_slideexpr) !== 'undefined') { settings.opts.slideExpr = settings.advanced_slideexpr; } ! ! // true if clearType corrections should be applied (for IE) ! if (typeof(settings.advanced_cleartype) !== 'undefined') { settings.opts.cleartype = settings.advanced_cleartype; } ! ! // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) ! if (typeof(settings.advanced_cleartypenobg) !== 'undefined') { settings.opts.cleartypeNoBg = settings.advanced_cleartypenobg; } ! ! // true to prevent slideshow from wrapping ! if (typeof(settings.advanced_nowrap) !== 'undefined') { settings.opts.nowrap = settings.advanced_nowrap; } ! ! // force fast transitions when triggered manually (via pager or prev/next); value == time in ms ! if (typeof(settings.advanced_fastonevent) !== 'undefined') { settings.opts.fastOnEvent = settings.advanced_fastonevent; } ! ! // valid when multiple effects are used; true to make the effect sequence random ! if (typeof(settings.advanced_randomizeeffects) !== 'undefined') { settings.opts.randomizeEffects = settings.advanced_randomizeeffects; } ! ! // causes animations to transition in reverse ! if (typeof(settings.advanced_rev) !== 'undefined') { settings.opts.rev = settings.advanced_rev; } ! ! // causes manual transition to stop an active transition instead of being ignored ! if (typeof(settings.advanced_manualtrump) !== 'undefined') { settings.opts.manualTrump = settings.advanced_manualtrump; } ! ! // requeue the slideshow if any image slides are not yet loaded ! if (typeof(settings.advanced_requeueonimagenotloaded) !== 'undefined') { settings.opts.requeueOnImageNotLoaded = settings.advanced_requeueonimagenotloaded; } ! ! // ms delay for requeue ! if (typeof(settings.advanced_requeuetimeout) !== 'undefined') { settings.opts.requeueTimeout = settings.advanced_requeuetimeout; } ! ! // class name used for the active pager link ! if (typeof(settings.advanced_activepagerclass) !== 'undefined') { settings.opts.activePagerClass = settings.advanced_activepagerclass; } ! ! // callback fn invoked to update the active pager link (adds/removes activePagerClass style) ! if (typeof(settings.advanced_updateactivepagerlink) !== 'undefined') { settings.opts.updateActivePagerLink = eval(settings.advanced_updateactivepagerlink); } ! ! $(settings.targetId).cycle(settings.opts); ! ! // Start Paused ! if (settings.start_paused) { ! viewsSlideshowCyclePause(settings); ! } ! ! // Pause if hidden. ! if (settings.pause_when_hidden) { ! var checkPause = function(settings) { ! // If the slideshow is visible and it is paused then resume. ! // otherwise if the slideshow is not visible and it is not paused then ! // pause it. ! var visible = viewsSlideshowCycleIsVisible(settings.targetId, settings.pause_when_hidden_type, settings.amount_allowed_visible); ! if (visible && settings.paused) { ! viewsSlideshowCycleResume(settings); ! } ! else if (!visible && !settings.paused) { ! viewsSlideshowCyclePause(settings); ! } } + + // Check when scrolled. + $(window).scroll(function() { + checkPause(settings); + }); + + // Check when the window is resized. + $(window).resize(function() { + checkPause(settings); + }); } ! // Show image count for people who have js enabled. ! $('#views_slideshow_cycle_image_count_' + settings.vss_id).show(); ! if (settings.controls != 0) { ! // Show controls for people who have js enabled browsers. ! $('#views_slideshow_cycle_controls_' + settings.vss_id).show(); ! ! $('#views_slideshow_cycle_playpause_' + settings.vss_id).click(function(e) { ! if (settings.paused) { ! viewsSlideshowCycleResume(settings); ! } ! else { ! viewsSlideshowCyclePause(settings); ! } ! e.preventDefault(); ! }); ! } ! }); ! } } ! // Pause the slideshow viewsSlideshowCyclePause = function (settings) { // Make Resume translatable var resume = Drupal.t('Resume'); ! $(settings.targetId).cycle('pause'); if (settings.controls != 0) { $('#views_slideshow_cycle_playpause_' + settings.vss_id) *************** *** 376,382 **** viewsSlideshowCycleResume = function (settings) { // Make Pause translatable var pause = Drupal.t('Pause'); ! $(settings.targetId).cycle('resume'); if (settings.controls != 0) { $('#views_slideshow_cycle_playpause_' + settings.vss_id) --- 378,384 ---- viewsSlideshowCycleResume = function (settings) { // Make Pause translatable var pause = Drupal.t('Pause'); ! $(settings.targetId).cycle('resume'); if (settings.controls != 0) { $('#views_slideshow_cycle_playpause_' + settings.vss_id) *************** *** 437,444 **** var IsNumber=true; var Char; ! for (var i=0; i < sText.length && IsNumber == true; i++) { ! Char = sText.charAt(i); if (ValidChars.indexOf(Char) == -1) { IsNumber = false; } --- 439,446 ---- var IsNumber=true; var Char; ! for (var i=0; i < sText.length && IsNumber == true; i++) { ! Char = sText.charAt(i); if (ValidChars.indexOf(Char) == -1) { IsNumber = false; } *************** *** 502,514 **** var elemWidth = $(elem).width(); var elemRight = elemLeft + elemWidth; var elemArea = elemHeight * elemWidth; ! // Calculate what's hiding in the slide. var missingLeft = 0; var missingRight = 0; var missingTop = 0; var missingBottom = 0; ! // Find out how much of the slide is missing from the left. if (elemLeft < docViewLeft) { missingLeft = docViewLeft - elemLeft; --- 504,516 ---- var elemWidth = $(elem).width(); var elemRight = elemLeft + elemWidth; var elemArea = elemHeight * elemWidth; ! // Calculate what's hiding in the slide. var missingLeft = 0; var missingRight = 0; var missingTop = 0; var missingBottom = 0; ! // Find out how much of the slide is missing from the left. if (elemLeft < docViewLeft) { missingLeft = docViewLeft - elemLeft; *************** *** 518,524 **** if (elemRight > docViewRight) { missingRight = elemRight - docViewRight; } ! // Find out how much of the slide is missing from the top. if (elemTop < docViewTop) { missingTop = docViewTop - elemTop; --- 520,526 ---- if (elemRight > docViewRight) { missingRight = elemRight - docViewRight; } ! // Find out how much of the slide is missing from the top. if (elemTop < docViewTop) { missingTop = docViewTop - elemTop; *************** *** 528,534 **** if (elemBottom > docViewBottom) { missingBottom = elemBottom - docViewBottom; } ! // If there is no amountVisible defined then check to see if the whole slide // is visible. if (type == 'full') { --- 530,536 ---- if (elemBottom > docViewBottom) { missingBottom = elemBottom - docViewBottom; } ! // If there is no amountVisible defined then check to see if the whole slide // is visible. if (type == 'full') { *************** *** 539,545 **** } else if(type == 'vertical') { var verticalShowing = elemHeight - missingTop - missingBottom; ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the --- 541,547 ---- } else if(type == 'vertical') { var verticalShowing = elemHeight - missingTop - missingBottom; ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the *************** *** 553,559 **** } else if(type == 'horizontal') { var horizontalShowing = elemWidth - missingLeft - missingRight; ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the --- 555,561 ---- } else if(type == 'horizontal') { var horizontalShowing = elemWidth - missingLeft - missingRight; ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the *************** *** 567,573 **** } else if(type == 'area') { var areaShowing = (elemWidth - missingLeft - missingRight) * (elemHeight - missingTop - missingBottom); ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the --- 569,575 ---- } else if(type == 'area') { var areaShowing = (elemWidth - missingLeft - missingRight) * (elemHeight - missingTop - missingBottom); ! // If user specified a percentage then find out if the current shown percent // is larger than the allowed percent. // Otherwise check to see if the amount of px shown is larger than the *************** *** 581,583 **** --- 583,586 ---- } } + })(jQuery) \ В конце файла нет новой строки diff -cr ./contrib/views_slideshow_cycle/views_slideshow_cycle.module ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.module *** ./contrib/views_slideshow_cycle/views_slideshow_cycle.module 2010-09-29 06:07:49.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.module 2010-11-25 17:48:49.477044000 +0200 *************** *** 22,33 **** // Otherwise, we'll add the version included with this module. if (!$js) { ! drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js'); } $module_path = drupal_get_path('module', 'views_slideshow_cycle'); ! drupal_add_js($module_path . '/views_slideshow_cycle.js', 'module'); ! drupal_add_css($module_path . '/views_slideshow_cycle.css', 'module'); } /** --- 22,33 ---- // Otherwise, we'll add the version included with this module. if (!$js) { ! drupal_add_js(drupal_get_path('module', 'views_slideshow') . '/js/jquery.cycle.all.min.js', array('group' => JS_LIBRARY)); } $module_path = drupal_get_path('module', 'views_slideshow_cycle'); ! drupal_add_js($module_path . '/views_slideshow_cycle.js'); ! drupal_add_css($module_path . '/views_slideshow_cycle.css'); } /** *************** *** 36,111 **** function views_slideshow_cycle_theme($existing, $type, $theme, $path) { return array( 'views_slideshow_cycle' => array( ! 'arguments' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''), 'template' => 'theme/views-slideshow-cycle', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_controls' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-controls', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_previous' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-previous', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_pause' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-pause', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_next' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-next', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_numbered' => array( ! 'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-numbered', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_thumbnails' => array( ! 'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-thumbnails', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field' => array( ! 'arguments' => array('view' => NULL, 'attributes' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-field', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field_field' => array( ! 'arguments' => array('view' => NULL, 'field' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-pager-field-field', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field_item' => array( ! 'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-pager-field-item', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_slide_counter' => array( ! 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-slide-counter', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_main_frame' => array( ! 'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame', 'file' => 'theme/views_slideshow_cycle.theme.inc', ! ), 'views_slideshow_cycle_main_frame_row' => array( ! 'arguments' => array('items' => NULL, 'vss_id' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame-row', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_main_frame_row_item' => array( ! 'arguments' => array('item' => NULL, 'item_count' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame-row-item', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), --- 36,111 ---- function views_slideshow_cycle_theme($existing, $type, $theme, $path) { return array( 'views_slideshow_cycle' => array( ! 'variables' => array('view' => NULL, 'options' => array(), 'rows' => array(), 'title' => ''), 'template' => 'theme/views-slideshow-cycle', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_controls' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-controls', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_previous' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-previous', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_pause' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-pause', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_control_next' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-control-next', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_numbered' => array( ! 'variables' => array('view' => NULL, 'attributes_array' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-numbered', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_thumbnails' => array( ! 'variables' => array('view' => NULL, 'attributes_array' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-thumbnails', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field' => array( ! 'variables' => array('vss_id' => NULL, 'attributes_array' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-pager-field', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field_field' => array( ! 'variables' => array('view' => NULL, 'field' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-pager-field-field', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_pager_field_item' => array( ! 'variables' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-pager-field-item', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_slide_counter' => array( ! 'variables' => array('vss_id' => '', 'view' => NULL, 'options' => array()), 'template' => 'theme/views-slideshow-cycle-slide-counter', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_main_frame' => array( ! 'variables' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame', 'file' => 'theme/views_slideshow_cycle.theme.inc', ! ), 'views_slideshow_cycle_main_frame_row' => array( ! 'variables' => array('items' => NULL, 'vss_id' => NULL, 'count' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame-row', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_main_frame_row_item' => array( ! 'variables' => array('item' => NULL, 'item_count' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame-row-item', 'file' => 'theme/views_slideshow_cycle.theme.inc', ), *************** *** 129,135 **** } /** ! * Implementation of hook_views_cycle_skins(). */ function views_slideshow_cycle_views_slideshow_cycle_skins() { $skins['default'] = array( --- 129,135 ---- } /** ! * Implements hook_views_cycle_skins(). */ function views_slideshow_cycle_views_slideshow_cycle_skins() { $skins['default'] = array( diff -cr ./contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc *** ./contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc 2010-10-05 08:45:50.000000000 +0300 --- ../views_slideshow_d7/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc 2010-11-25 12:42:10.403710669 +0200 *************** *** 24,30 **** 'delay' => array('default' => 0), 'sync' => array('default' => 1), 'random' => array('default' => 0), ! // Action 'pause' => array('default' => 1), 'pause_on_click' => array('default' => 0), --- 24,30 ---- 'delay' => array('default' => 0), 'sync' => array('default' => 1), 'random' => array('default' => 0), ! // Action 'pause' => array('default' => 1), 'pause_on_click' => array('default' => 0), *************** *** 165,176 **** } function views_slideshow_cycle_views_slideshow_options_form(&$form, &$form_state, &$view) { ! // Style $form['views_slideshow_cycle']['style'] = array( '#value' => '

' . t('Style') . '

', ); ! // Get a list of all available stylesheet plugins. $skin_info = views_slideshow_cycle_get_skins(); foreach ($skin_info as $skin => $info) { --- 165,176 ---- } function views_slideshow_cycle_views_slideshow_options_form(&$form, &$form_state, &$view) { ! ctools_include('dependent'); // Style $form['views_slideshow_cycle']['style'] = array( '#value' => '

' . t('Style') . '

', ); ! // Get a list of all available stylesheet plugins. $skin_info = views_slideshow_cycle_get_skins(); foreach ($skin_info as $skin => $info) { *************** *** 186,197 **** '#default_value' => $view->options['views_slideshow_cycle']['skin'], '#description' => t('Select the skin to use for this display. Skins allow for easily swappable layouts of things like next/prev links and thumbnails. Note that not all skins support thumbnails, so mis-matching skins and thumbnails may lead to unpredictable results.'), ); ! // Transition $form['views_slideshow_cycle']['transition'] = array( '#value' => '

' . t('Transition') . '

', ); ! $effects = array( 'none' => 'none', 'blindX' => 'blindX', --- 186,197 ---- '#default_value' => $view->options['views_slideshow_cycle']['skin'], '#description' => t('Select the skin to use for this display. Skins allow for easily swappable layouts of things like next/prev links and thumbnails. Note that not all skins support thumbnails, so mis-matching skins and thumbnails may lead to unpredictable results.'), ); ! // Transition $form['views_slideshow_cycle']['transition'] = array( '#value' => '

' . t('Transition') . '

', ); ! $effects = array( 'none' => 'none', 'blindX' => 'blindX', *************** *** 220,247 **** 'turnRight' => 'turnRight', 'uncover' => 'uncover', 'wipe' => 'wipe', ! 'zoom' => 'zoom' ); $form['views_slideshow_cycle']['effect'] = array( '#type' => 'select', '#title' => t('Effect'), '#options' => $effects, '#default_value' => $view->options['views_slideshow_cycle']['effect'], ! '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect. ' . l('Follow this link to see examples of each effect.', 'http://jquery.malsup.com/cycle/browser.html', array('attributes' => array('target' => '_blank')))), ); ! // Transition advanced options $form['views_slideshow_cycle']['transition_advanced'] = array( '#type' => 'checkbox', '#title' => t('View Transition Advanced Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['transition_advanced'], ); $form['views_slideshow_cycle']['timeout'] = array( '#type' => 'textfield', '#title' => t('Timer delay'), '#default_value' => $view->options['views_slideshow_cycle']['timeout'], '#description' => t('Amount of time in milliseconds between transitions. Set the value to 0 to not rotate the slideshow automatically.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['speed'] = array( --- 220,247 ---- 'turnRight' => 'turnRight', 'uncover' => 'uncover', 'wipe' => 'wipe', ! 'zoom' => 'zoom' ); $form['views_slideshow_cycle']['effect'] = array( '#type' => 'select', '#title' => t('Effect'), '#options' => $effects, '#default_value' => $view->options['views_slideshow_cycle']['effect'], ! '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect. ' . l(t('Follow this link to see examples of each effect.'), 'http://jquery.malsup.com/cycle/browser.html', array('attributes' => array('target' => '_blank')))), ); ! // Transition advanced options $form['views_slideshow_cycle']['transition_advanced'] = array( '#type' => 'checkbox', '#title' => t('View Transition Advanced Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['transition_advanced'], ); $form['views_slideshow_cycle']['timeout'] = array( '#type' => 'textfield', '#title' => t('Timer delay'), '#default_value' => $view->options['views_slideshow_cycle']['timeout'], '#description' => t('Amount of time in milliseconds between transitions. Set the value to 0 to not rotate the slideshow automatically.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['speed'] = array( *************** *** 249,255 **** '#title' => t('Speed'), '#default_value' => $view->options['views_slideshow_cycle']['speed'], '#description' => t('Time in milliseconds that each transition lasts. Numeric only!'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['delay'] = array( --- 249,255 ---- '#title' => t('Speed'), '#default_value' => $view->options['views_slideshow_cycle']['speed'], '#description' => t('Time in milliseconds that each transition lasts. Numeric only!'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['delay'] = array( *************** *** 257,263 **** '#title' => t('Initial slide delay offset'), '#default_value' => $view->options['views_slideshow_cycle']['delay'], '#description' => t('Amount of time in milliseconds for the first slide to transition. This number will be added to Timer delay to create the initial delay. For example if Timer delay is 4000 and Initial delay is 2000 then the first slide will change at 6000ms (6 seconds). If Initial delay is -2000 then the first slide will change at 2000ms (2 seconds).'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['sync'] = array( --- 257,263 ---- '#title' => t('Initial slide delay offset'), '#default_value' => $view->options['views_slideshow_cycle']['delay'], '#description' => t('Amount of time in milliseconds for the first slide to transition. This number will be added to Timer delay to create the initial delay. For example if Timer delay is 4000 and Initial delay is 2000 then the first slide will change at 6000ms (6 seconds). If Initial delay is -2000 then the first slide will change at 2000ms (2 seconds).'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['sync'] = array( *************** *** 265,271 **** '#title' => t('Sync'), '#default_value' => $view->options['views_slideshow_cycle']['sync'], '#description' => t('The sync option controls whether the slide transitions occur simultaneously. The default is selected which means that the current slide transitions out as the next slide transitions in. By unselecting this option you can get some interesting twists on your transitions.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['random'] = array( --- 265,271 ---- '#title' => t('Sync'), '#default_value' => $view->options['views_slideshow_cycle']['sync'], '#description' => t('The sync option controls whether the slide transitions occur simultaneously. The default is selected which means that the current slide transitions out as the next slide transitions in. By unselecting this option you can get some interesting twists on your transitions.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); $form['views_slideshow_cycle']['random'] = array( *************** *** 273,282 **** '#title' => t('Random'), '#description' => t('This option controls the order items are displayed. The default setting, unselected, uses the views ordering. Selected will cause the images to display in a random order.'), '#default_value' => $view->options['views_slideshow_cycle']['random'], ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); ! // Action $form['views_slideshow_cycle']['action'] = array( '#value' => '

' . t('Action') . '

', --- 273,282 ---- '#title' => t('Random'), '#description' => t('This option controls the order items are displayed. The default setting, unselected, uses the views ordering. Selected will cause the images to display in a random order.'), '#default_value' => $view->options['views_slideshow_cycle']['random'], ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-transition-advanced' => array(1)), ); ! // Action $form['views_slideshow_cycle']['action'] = array( '#value' => '

' . t('Action') . '

', *************** *** 293,311 **** '#default_value' => $view->options['views_slideshow_cycle']['pause_on_click'], '#description' => t('Pause when the slide is clicked.'), ); ! // Action Advanced Options $form['views_slideshow_cycle']['action_advanced'] = array( '#type' => 'checkbox', '#title' => t('View Action Advanced Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['action_advanced'], ); $form['views_slideshow_cycle']['start_paused'] = array( '#type' => 'checkbox', '#title' => t('Start Slideshow Paused'), '#default_value' => $view->options['views_slideshow_cycle']['start_paused'], '#description' => t('Start the slideshow in the paused state.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['remember_slide'] = array( --- 293,311 ---- '#default_value' => $view->options['views_slideshow_cycle']['pause_on_click'], '#description' => t('Pause when the slide is clicked.'), ); ! // Action Advanced Options $form['views_slideshow_cycle']['action_advanced'] = array( '#type' => 'checkbox', '#title' => t('View Action Advanced Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['action_advanced'], ); $form['views_slideshow_cycle']['start_paused'] = array( '#type' => 'checkbox', '#title' => t('Start Slideshow Paused'), '#default_value' => $view->options['views_slideshow_cycle']['start_paused'], '#description' => t('Start the slideshow in the paused state.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['remember_slide'] = array( *************** *** 313,319 **** '#title' => t('Start On Last Slide Viewed'), '#default_value' => $view->options['views_slideshow_cycle']['remember_slide'], '#description' => t('When the user leaves a page with a slideshow and comes back start them on the last slide viewed.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['remember_slide_days'] = array( --- 313,319 ---- '#title' => t('Start On Last Slide Viewed'), '#default_value' => $view->options['views_slideshow_cycle']['remember_slide'], '#description' => t('When the user leaves a page with a slideshow and comes back start them on the last slide viewed.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['remember_slide_days'] = array( *************** *** 322,328 **** '#default_value' => $view->options['views_slideshow_cycle']['remember_slide_days'], '#description' => t('The number of days to have the site remember the last slide. Default is 1'), '#size' => 4, ! '#process' => array('views_process_dependency'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), --- 322,328 ---- '#default_value' => $view->options['views_slideshow_cycle']['remember_slide_days'], '#description' => t('The number of days to have the site remember the last slide. Default is 1'), '#size' => 4, ! '#process' => array('ctools_dependent_process'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), *************** *** 334,340 **** '#title' => t('Pause When the Slideshow is Not Visible'), '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden'], '#description' => t('When the slideshow is scrolled out of view or when a window is resized that hides the slideshow, this will pause the slideshow.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['pause_when_hidden_type'] = array( --- 334,340 ---- '#title' => t('Pause When the Slideshow is Not Visible'), '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden'], '#description' => t('When the slideshow is scrolled out of view or when a window is resized that hides the slideshow, this will pause the slideshow.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['pause_when_hidden_type'] = array( *************** *** 348,354 **** ), '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden_type'], '#description' => t('Choose how to calculate how much of the slide has to be shown. Entire Slide: All the slide has to be shown. Vertical: Set amount of height that has to be shown. Horizontal: Set amount of width that has to be shown. Area: Set total area that has to be shown.'), ! '#process' => array('views_process_dependency'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), --- 348,354 ---- ), '#default_value' => $view->options['views_slideshow_cycle']['pause_when_hidden_type'], '#description' => t('Choose how to calculate how much of the slide has to be shown. Entire Slide: All the slide has to be shown. Vertical: Set amount of height that has to be shown. Horizontal: Set amount of width that has to be shown. Area: Set total area that has to be shown.'), ! '#process' => array('ctools_dependent_process'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), *************** *** 361,367 **** '#default_value' => $view->options['views_slideshow_cycle']['amount_allowed_visible'], '#description' => t("The amount of the slide that needs to be shown to have it rotate. You can set the value in percentage (ex: 50%) or in pixels (ex: 250). The slidehsow will not rotate until it's height/width/total area, depending on the calculation method you have chosen above, is less than the value you have entered in this field."), '#size' => 4, ! '#process' => array('views_process_dependency'), '#dependency_count' => 3, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), --- 361,367 ---- '#default_value' => $view->options['views_slideshow_cycle']['amount_allowed_visible'], '#description' => t("The amount of the slide that needs to be shown to have it rotate. You can set the value in percentage (ex: 50%) or in pixels (ex: 250). The slidehsow will not rotate until it's height/width/total area, depending on the calculation method you have chosen above, is less than the value you have entered in this field."), '#size' => 4, ! '#process' => array('ctools_dependent_process'), '#dependency_count' => 3, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-action-advanced' => array(1), *************** *** 378,384 **** '#title' => t('End slideshow after last slide'), '#default_value' => $view->options['views_slideshow_cycle']['nowrap'], '#description' => t('If selected the slideshow will end when it gets to the last slide.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['fixed_height'] = array( --- 378,384 ---- '#title' => t('End slideshow after last slide'), '#default_value' => $view->options['views_slideshow_cycle']['nowrap'], '#description' => t('If selected the slideshow will end when it gets to the last slide.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['fixed_height'] = array( *************** *** 386,392 **** '#title' => t('Make the slide window height fit the largest slide'), '#default_value' => $view->options['views_slideshow_cycle']['fixed_height'], '#description' => t('If unselected then if the slides are different sizes the height of the slide area will change as the slides change.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['items_per_slide'] = array( --- 386,392 ---- '#title' => t('Make the slide window height fit the largest slide'), '#default_value' => $view->options['views_slideshow_cycle']['fixed_height'], '#description' => t('If unselected then if the slides are different sizes the height of the slide area will change as the slides change.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); $form['views_slideshow_cycle']['items_per_slide'] = array( *************** *** 395,404 **** '#default_value' => $view->options['views_slideshow_cycle']['items_per_slide'], '#description' => t('The number of items per slide'), '#size' => 4, ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); ! // Pager and Controls $form['views_slideshow_cycle']['pager_and_controls'] = array( '#value' => '

' . t('Pager and Controls') . '

', --- 395,404 ---- '#default_value' => $view->options['views_slideshow_cycle']['items_per_slide'], '#description' => t('The number of items per slide'), '#size' => 4, ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)), ); ! // Pager and Controls $form['views_slideshow_cycle']['pager_and_controls'] = array( '#value' => '

' . t('Pager and Controls') . '

', *************** *** 414,424 **** '#default_value' => $view->options['views_slideshow_cycle']['pager'], '#description' => t('Determine if a pager should appear and if so whether they should appear before or after the slideshow.'), ); ! // Get all the pager info from other modules. // hook_views_slideshow_pager_settings($view, $option_values, $dependency_prefix) $pagers = module_invoke_all('views_slideshow_cycle_pager_settings', $view, $view->options['views_slideshow_cycle'], 'edit-style-options-views-slideshow-cycle-pager'); ! // Prep the pager options and the fields $options = array(); $pager_fields = array(); --- 414,424 ---- '#default_value' => $view->options['views_slideshow_cycle']['pager'], '#description' => t('Determine if a pager should appear and if so whether they should appear before or after the slideshow.'), ); ! // Get all the pager info from other modules. // hook_views_slideshow_pager_settings($view, $option_values, $dependency_prefix) $pagers = module_invoke_all('views_slideshow_cycle_pager_settings', $view, $view->options['views_slideshow_cycle'], 'edit-style-options-views-slideshow-cycle-pager'); ! // Prep the pager options and the fields $options = array(); $pager_fields = array(); *************** *** 429,443 **** $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager'] = array('top', 'bottom'); $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager-type'] = array($pager_key); $pager_field['#dependency_count'] = count($pager_field['#dependency']); ! if (!isset($pager_field['#process']) || !in_array('views_process_dependency', $pager_field['#process'])) { ! $pager_field['#process'][] = 'views_process_dependency'; } ! $pager_fields[$pager_field_key] = $pager_field; } } } ! // Sort the options alphabetically. asort($options); $form['views_slideshow_cycle']['pager_type'] = array( --- 429,443 ---- $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager'] = array('top', 'bottom'); $pager_field['#dependency']['edit-style-options-views-slideshow-cycle-pager-type'] = array($pager_key); $pager_field['#dependency_count'] = count($pager_field['#dependency']); ! if (!isset($pager_field['#process']) || !in_array('ctools_dependent_process', $pager_field['#process'])) { ! $pager_field['#process'][] = 'ctools_dependent_process'; } ! $pager_fields[$pager_field_key] = $pager_field; } } } ! // Sort the options alphabetically. asort($options); $form['views_slideshow_cycle']['pager_type'] = array( *************** *** 446,467 **** '#options' => $options, '#default_value' => $view->options['views_slideshow_cycle']['pager_type'], '#description' => t('Style of the pager.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! // Add user defined pager fields to the form. $form['views_slideshow_cycle'] = array_merge($form['views_slideshow_cycle'], $pager_fields); ! $form['views_slideshow_cycle']['pager_hover'] = array( '#type' => 'checkbox', '#title' => t('Activate Slide and Pause on Pager Hover'), '#default_value' => $view->options['views_slideshow_cycle']['pager_hover'], '#description' => t('Should the slide be activated and paused when hovering over a pager item.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! $weights = array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5); $form['views_slideshow_cycle']['pager_weight'] = array( '#type' => 'select', --- 446,467 ---- '#options' => $options, '#default_value' => $view->options['views_slideshow_cycle']['pager_type'], '#description' => t('Style of the pager.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! // Add user defined pager fields to the form. $form['views_slideshow_cycle'] = array_merge($form['views_slideshow_cycle'], $pager_fields); ! $form['views_slideshow_cycle']['pager_hover'] = array( '#type' => 'checkbox', '#title' => t('Activate Slide and Pause on Pager Hover'), '#default_value' => $view->options['views_slideshow_cycle']['pager_hover'], '#description' => t('Should the slide be activated and paused when hovering over a pager item.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! $weights = array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5); $form['views_slideshow_cycle']['pager_weight'] = array( '#type' => 'select', *************** *** 469,478 **** '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['pager_weight'], '#description' => t('Determines in what order the pager appears. A lower weight will cause the pager to be above higher weight items.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! $form['views_slideshow_cycle']['controls'] = array( '#type' => 'select', '#title' => t('Controls'), --- 469,478 ---- '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['pager_weight'], '#description' => t('Determines in what order the pager appears. A lower weight will cause the pager to be above higher weight items.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array('top', 'bottom')), ); ! $form['views_slideshow_cycle']['controls'] = array( '#type' => 'select', '#title' => t('Controls'), *************** *** 490,499 **** '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['controls_weight'], '#description' => t('Determines in what order the controls appear. A lower weight will cause the controls to be above higher weight items.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-controls' => array('top', 'bottom')), ); ! $form['views_slideshow_cycle']['slide_counter'] = array( '#type' => 'select', '#title' => t('Slide Counter'), --- 490,499 ---- '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['controls_weight'], '#description' => t('Determines in what order the controls appear. A lower weight will cause the controls to be above higher weight items.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-controls' => array('top', 'bottom')), ); ! $form['views_slideshow_cycle']['slide_counter'] = array( '#type' => 'select', '#title' => t('Slide Counter'), *************** *** 505,521 **** '#default_value' => $view->options['views_slideshow_cycle']['slide_counter'], '#description' => t('Determine if the Slide Counter (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'), ); ! $form['views_slideshow_cycle']['slide_counter_weight'] = array( '#type' => 'select', '#title' => t('Weight of the Slide Counter'), '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['slide_counter_weight'], '#description' => t('Determines in what order the slide counter appears. A lower weight will cause the slide counter to be above higher weight items.'), ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-slide-counter' => array('top', 'bottom')), ); ! // Internet Explorer Tweaks $form['views_slideshow_cycle']['ie_tweaks'] = array( '#value' => '

' . t('Internet Explorer Tweaks') . '

', --- 505,521 ---- '#default_value' => $view->options['views_slideshow_cycle']['slide_counter'], '#description' => t('Determine if the Slide Counter (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'), ); ! $form['views_slideshow_cycle']['slide_counter_weight'] = array( '#type' => 'select', '#title' => t('Weight of the Slide Counter'), '#options' => $weights, '#default_value' => $view->options['views_slideshow_cycle']['slide_counter_weight'], '#description' => t('Determines in what order the slide counter appears. A lower weight will cause the slide counter to be above higher weight items.'), ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-slide-counter' => array('top', 'bottom')), ); ! // Internet Explorer Tweaks $form['views_slideshow_cycle']['ie_tweaks'] = array( '#value' => '

' . t('Internet Explorer Tweaks') . '

', *************** *** 532,541 **** '#default_value' => $view->options['views_slideshow_cycle']['cleartypenobg'], '#description' => t('Select to disable extra cleartype fixing. Unselect to force background color setting on slides)'), ); ! ! ! ! // Advanced Options $form['views_slideshow_cycle']['advanced_options'] = array( '#value' => '

' . t('jQuery Cycle Custom Options') . '

', --- 532,541 ---- '#default_value' => $view->options['views_slideshow_cycle']['cleartypenobg'], '#description' => t('Select to disable extra cleartype fixing. Unselect to force background color setting on slides)'), ); ! ! ! ! // Advanced Options $form['views_slideshow_cycle']['advanced_options'] = array( '#value' => '

' . t('jQuery Cycle Custom Options') . '

', *************** *** 543,551 **** $form['views_slideshow_cycle']['cycle_options'] = array( '#type' => 'checkbox', '#title' => t('View All jQuery Cycle Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['cycle_options'], ); ! // All the jquery cycle options according to // http://malsup.com/jquery/cycle/options.html $cycle_options = array( --- 543,551 ---- $form['views_slideshow_cycle']['cycle_options'] = array( '#type' => 'checkbox', '#title' => t('View All jQuery Cycle Options'), ! '#default_value' => $view->options['views_slideshow_cycle']['cycle_options'], ); ! // All the jquery cycle options according to // http://malsup.com/jquery/cycle/options.html $cycle_options = array( *************** *** 601,607 **** 'timeoutFn' => t('callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) Do not enter the function in this box. Only enter what you would have entered within the function.'), 'updateActivePagerLink' => t('callback fn invoked to update the active pager link (adds/removes activePagerClass style)'), ); ! foreach ($cycle_options as $name => $description) { $lower_name = strtolower($name); // fx --- 601,607 ---- 'timeoutFn' => t('callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) Do not enter the function in this box. Only enter what you would have entered within the function.'), 'updateActivePagerLink' => t('callback fn invoked to update the active pager link (adds/removes activePagerClass style)'), ); ! foreach ($cycle_options as $name => $description) { $lower_name = strtolower($name); // fx *************** *** 609,624 **** '#type' => 'checkbox', '#title' => t('Override !name setting', array('!name' => $name)), '#default_value' => $view->options['views_slideshow_cycle']['advanced_use_' . $lower_name], ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-views-slideshow-cycle-cycle-options' => array(1)), ); ! $form['views_slideshow_cycle']['advanced_' . $lower_name] = array( '#type' => 'textarea', '#title' => t('!lower_name', array('!lower_name' => $lower_name)), '#default_value' => $view->options['views_slideshow_cycle']['advanced_' . $lower_name], '#description' => $description, // Don't need to wrap in t() since it's done above. ! '#process' => array('views_process_dependency'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-cycle-options' => array(1), --- 609,624 ---- '#type' => 'checkbox', '#title' => t('Override !name setting', array('!name' => $name)), '#default_value' => $view->options['views_slideshow_cycle']['advanced_use_' . $lower_name], ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-views-slideshow-cycle-cycle-options' => array(1)), ); ! $form['views_slideshow_cycle']['advanced_' . $lower_name] = array( '#type' => 'textarea', '#title' => t('!lower_name', array('!lower_name' => $lower_name)), '#default_value' => $view->options['views_slideshow_cycle']['advanced_' . $lower_name], '#description' => $description, // Don't need to wrap in t() since it's done above. ! '#process' => array('ctools_dependent_process'), '#dependency_count' => 2, '#dependency' => array( 'edit-style-options-views-slideshow-cycle-cycle-options' => array(1), *************** *** 629,635 **** } /** ! * Implementation of hook_views_slideshow_cycle_pager_settings */ function views_slideshow_cycle_views_slideshow_cycle_pager_settings($view, $option_values, $dependency_prefix) { // Settings for Numbered Pager --- 629,635 ---- } /** ! * Implements hook_views_slideshow_cycle_pager_settings(). */ function views_slideshow_cycle_views_slideshow_cycle_pager_settings($view, $option_values, $dependency_prefix) { // Settings for Numbered Pager *************** *** 644,650 **** ), ), ); ! // Settings for Thumbnails pager. $return_value['thumbnails'] = array( 'title' => t('Thumbnails'), --- 644,650 ---- ), ), ); ! // Settings for Thumbnails pager. $return_value['thumbnails'] = array( 'title' => t('Thumbnails'), *************** *** 657,663 **** ), ), ); ! if ($view->row_plugin->uses_fields()) { $options = array(); foreach ($view->display->handler->get_handlers('field') as $field => $handler) { --- 657,663 ---- ), ), ); ! if ($view->row_plugin->uses_fields()) { $options = array(); foreach ($view->display->handler->get_handlers('field') as $field => $handler) { *************** *** 674,687 **** '#description' => t("Choose the fields that will appear in the pager."), '#prefix' => '
', '#process' => array( ! 'expand_checkboxes', ), '#suffix' => '
', ), ), ); } ! return $return_value; } --- 674,687 ---- '#description' => t("Choose the fields that will appear in the pager."), '#prefix' => '
', '#process' => array( ! 'form_process_checkboxes', ), '#suffix' => '
', ), ), ); } ! return $return_value; } *************** *** 713,719 **** if (empty($skins)) { $skins = array(); foreach (module_implements('views_slideshow_cycle_skins') as $module) { ! $skin_items = call_user_func($module .'_views_slideshow_cycle_skins'); if (isset($skin_items) && is_array($skin_items)) { foreach (array_keys($skin_items) as $skin) { // Ensure that the definition is complete, so we don't need lots --- 713,719 ---- if (empty($skins)) { $skins = array(); foreach (module_implements('views_slideshow_cycle_skins') as $module) { ! $skin_items = call_user_func($module . '_views_slideshow_cycle_skins'); if (isset($skin_items) && is_array($skin_items)) { foreach (array_keys($skin_items) as $skin) { // Ensure that the definition is complete, so we don't need lots Только в ./contrib: views_slideshow_singleframe Только в ./contrib: views_slideshow_thumbnailhover Только в .: views_slideshow_d7_0.patch diff -cr ./views_slideshow.info ../views_slideshow_d7/views_slideshow.info *** ./views_slideshow.info 2010-11-12 14:28:47.000000000 +0200 --- ../views_slideshow_d7/views_slideshow.info 2010-11-25 12:42:32.393710668 +0200 *************** *** 3,13 **** description = Provides a View style that displays rows as a jQuery slideshow. dependencies[] = views package = Views ! core = 6.x ; Information added by drupal.org packaging script on 2010-11-12 ! version = "6.x-3.x-dev" ! core = "6.x" project = "views_slideshow" datestamp = "1289564927" --- 3,17 ---- description = Provides a View style that displays rows as a jQuery slideshow. dependencies[] = views package = Views ! core = 7.x ! files[] = views_slideshow.module ! files[] = views_slideshow.theme.inc ! files[] = views_slideshow.views.inc ! files[] = views_slideshow_plugin_style_slideshow.inc ; Information added by drupal.org packaging script on 2010-11-12 ! version = "7.x-3.x-dev" ! core = "7.x" project = "views_slideshow" datestamp = "1289564927" diff -cr ./views_slideshow.module ../views_slideshow_d7/views_slideshow.module *** ./views_slideshow.module 2010-04-21 01:04:17.000000000 +0300 --- ../views_slideshow_d7/views_slideshow.module 2010-11-25 12:42:10.370377335 +0200 *************** *** 7,18 **** */ /** ! * Implement hook_theme(). */ function views_slideshow_theme($existing, $type, $theme, $path) { return array( 'views_slideshow_main_section' => array( ! 'arguments' => array('id' => NULL, 'hidden_elements' => NULL, 'plugin' => NULL), 'file' => 'views_slideshow.theme.inc', ), ); --- 7,18 ---- */ /** ! * Implements hook_theme(). */ function views_slideshow_theme($existing, $type, $theme, $path) { return array( 'views_slideshow_main_section' => array( ! 'variables' => array('id' => NULL, 'hidden_elements' => NULL, 'plugin' => NULL), 'file' => 'views_slideshow.theme.inc', ), ); *************** *** 51,55 **** if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'ddblock', 'slider'))) { $options['mode'] = 'views_slideshow_' . $options['mode']; } ! $vars['slideshow'] = theme($options['mode'], $vars['view'], $options, $vars['rows'], $vars['title']); } --- 51,55 ---- if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'ddblock', 'slider'))) { $options['mode'] = 'views_slideshow_' . $options['mode']; } ! $vars['slideshow'] = theme($options['mode'], array('view' => $vars['view'], 'options' => $options, 'rows' => $vars['rows'], 'title' => $vars['title'])); } diff -cr ./views_slideshow_plugin_style_slideshow.inc ../views_slideshow_d7/views_slideshow_plugin_style_slideshow.inc *** ./views_slideshow_plugin_style_slideshow.inc 2010-10-05 08:45:50.000000000 +0300 --- ../views_slideshow_d7/views_slideshow_plugin_style_slideshow.inc 2010-11-25 12:42:10.400377335 +0200 *************** *** 26,32 **** } // Eveything below here is what's needed for views slideshow. ! if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'slider', 'ddblock')) && is_array($options[$options['mode']])) { foreach ($options[$options['mode']] as $index => $value) { $this->options['views_slideshow_' . $options['mode']][$index] = $value; } --- 26,32 ---- } // Eveything below here is what's needed for views slideshow. ! if (isset($options['mode']) && in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'slider', 'ddblock')) && is_array($options[$options['mode']])) { foreach ($options[$options['mode']] as $index => $value) { $this->options['views_slideshow_' . $options['mode']][$index] = $value; } *************** *** 47,54 **** // Render the given style. function options_form(&$form, &$form_state) { module_load_all_includes('views_slideshow.inc'); parent::options_form($form, $form_state); ! $modules = module_invoke_all('views_slideshow_modes'); if ($modules) { --- 47,55 ---- // Render the given style. function options_form(&$form, &$form_state) { module_load_all_includes('views_slideshow.inc'); + ctools_include('dependent'); parent::options_form($form, $form_state); ! $modules = module_invoke_all('views_slideshow_modes'); if ($modules) { *************** *** 64,71 **** $form[$module . '-prefix'] = array( '#type' => 'hidden', '#id' => $module . '-options-wrapper', ! '#prefix' => '
', ! '#process' => array('views_process_dependency'), '#dependency' => array('edit-style-options-mode' => array($module)), ); --- 65,72 ---- $form[$module . '-prefix'] = array( '#type' => 'hidden', '#id' => $module . '-options-wrapper', ! '#prefix' => '
', ! '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-style-options-mode' => array($module)), ); *************** *** 73,81 **** '#type' => 'fieldset', '#title' => t('!module options', array('!module' => $modules[$module])), '#collapsible' => TRUE, ! '#attributes' => array('class' => $module), ); ! $function = $module .'_views_slideshow_options_form'; call_user_func_array($function, array(&$form, &$form_state, &$this)); $form[$module . '-suffix'] = array( --- 74,82 ---- '#type' => 'fieldset', '#title' => t('!module options', array('!module' => $modules[$module])), '#collapsible' => TRUE, ! '#attributes' => array('class' => array($module)), ); ! $function = $module . '_views_slideshow_options_form'; call_user_func_array($function, array(&$form, &$form_state, &$this)); $form[$module . '-suffix'] = array( *************** *** 85,95 **** } else { $form['enable_module'] = array( ! '#value' => t('There is no Views Slideshow plugin enabled. Go to the !modules and enable a Views Slideshow plugin module. For example Views Slideshow Singleframe.', array('!modules' => l('Modules Page', 'admin/build/modules'))), ); } } ! function options_validate(&$form, &$form_state) { module_load_all_includes('views_slideshow.inc'); foreach (module_implements('views_slideshow_options_form_validate') as $module) { --- 86,96 ---- } else { $form['enable_module'] = array( ! '#value' => t('There is no Views Slideshow plugin enabled. Go to the !modules and enable a Views Slideshow plugin module. For example Views Slideshow Singleframe.', array('!modules' => l(t('Modules Page'), 'admin/build/modules'))), ); } } ! function options_validate(&$form, &$form_state) { module_load_all_includes('views_slideshow.inc'); foreach (module_implements('views_slideshow_options_form_validate') as $module) { *************** *** 97,104 **** call_user_func_array($function, array(&$form, &$form_state, &$this)); } } ! ! function options_submit($form, &$form_state) { module_load_all_includes('views_slideshow.inc'); foreach (module_implements('views_slideshow_options_form_submit') as $module) { $function = $module . '_views_slideshow_options_form_submit'; --- 98,105 ---- call_user_func_array($function, array(&$form, &$form_state, &$this)); } } ! ! function options_submit(&$form, &$form_state) { module_load_all_includes('views_slideshow.inc'); foreach (module_implements('views_slideshow_options_form_submit') as $module) { $function = $module . '_views_slideshow_options_form_submit'; diff -cr ./views_slideshow.theme.inc ../views_slideshow_d7/views_slideshow.theme.inc *** ./views_slideshow.theme.inc 2010-09-29 06:07:49.000000000 +0300 --- ../views_slideshow_d7/views_slideshow.theme.inc 2010-11-25 12:42:10.400377335 +0200 *************** *** 13,22 **** * * @ingroup themeable */ ! function theme_views_slideshow_main_section($id, $hidden_elements, $plugin) { ! $attributes['id'] = "${plugin}_main_${id}"; ! $attributes['class'] = "${plugin}_main views_slideshow_main"; $attributes = drupal_attributes($attributes); ! return "$hidden_elements
"; } --- 13,22 ---- * * @ingroup themeable */ ! function theme_views_slideshow_main_section($variables) { ! $attributes['id'] = "{$variables['plugin']}_main_{$variables['id']}"; ! $attributes['class'] = array("{$variables['plugin']}_main views", "slideshow_main"); $attributes = drupal_attributes($attributes); ! return "{$variables['hidden_elements']}
"; }