diff --git a/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc b/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc index 9f489c6..480d8dd 100644 --- a/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc +++ b/contrib/views_slideshow_cycle/theme/views_slideshow_cycle.theme.inc @@ -11,7 +11,7 @@ * @ingroup themeable */ -function template_preprocess_views_slideshow_cycle_main_frame(&$vars) { +function _views_slideshow_preprocess_views_slideshow_cycle_main_frame(&$vars) { $settings = $vars['settings']; $rows = $vars['rows']; $view = $vars['view']; @@ -130,7 +130,7 @@ function template_preprocess_views_slideshow_cycle_main_frame(&$vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_cycle_main_frame_row(&$vars) { +function _views_slideshow_preprocess_views_slideshow_cycle_main_frame_row(&$vars) { $current = $vars['count'] + 1; $vars['classes_array'][] = 'views_slideshow_cycle_slide'; $vars['classes_array'][] = 'views_slideshow_slide views-row-' . $current; @@ -146,7 +146,7 @@ function template_preprocess_views_slideshow_cycle_main_frame_row(&$vars) { } } -function template_preprocess_views_slideshow_cycle_main_frame_row_item(&$vars) { +function _views_slideshow_preprocess_views_slideshow_cycle_main_frame_row_item(&$vars) { $vars['classes_array'][] = 'views-row views-row-' . $vars['item_count']; if (!$vars['item_count']) { $vars['classes_array'][] = 'views-row-first'; diff --git a/contrib/views_slideshow_cycle/views_slideshow_cycle.module b/contrib/views_slideshow_cycle/views_slideshow_cycle.module index 0946705..a7d1471 100644 --- a/contrib/views_slideshow_cycle/views_slideshow_cycle.module +++ b/contrib/views_slideshow_cycle/views_slideshow_cycle.module @@ -45,17 +45,14 @@ function views_slideshow_cycle_theme($existing, $type, $theme, $path) { 'views_slideshow_cycle_main_frame' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => NULL, 'rows' => NULL), 'template' => 'theme/views-slideshow-cycle-main-frame', - 'file' => 'theme/views_slideshow_cycle.theme.inc', ), 'views_slideshow_cycle_main_frame_row' => array( 'variables' => array('vss_id' => NULL, 'items' => 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', ), ); } @@ -74,4 +71,24 @@ function views_slideshow_cycle_help($path, $arg) { } return $output; } -} \ No newline at end of file +} + +/** + * Need to have preprocess functions here because drupal doesn't cache them + * correctly in the theme.inc file. + * + * If you would like to override the preprocess functions make sure to look at + * the associated function in theme.inc. + */ + +function template_preprocess_views_slideshow_cycle_main_frame(&$vars) { + _views_slideshow_preprocess_views_slideshow_cycle_main_frame($vars); +} + +function template_preprocess_views_slideshow_cycle_main_frame_row(&$vars) { + _views_slideshow_preprocess_views_slideshow_cycle_main_frame_row($vars); +} + +function template_preprocess_views_slideshow_cycle_main_frame_row_item(&$vars) { + _views_slideshow_preprocess_views_slideshow_cycle_main_frame_row_item($vars); +} diff --git a/theme/views_slideshow.theme.inc b/theme/views_slideshow.theme.inc index 9c88030..1e428d5 100644 --- a/theme/views_slideshow.theme.inc +++ b/theme/views_slideshow.theme.inc @@ -7,7 +7,7 @@ * This just adds a wrapper div to the slideshow. */ -function template_preprocess_views_slideshow(&$vars) { +function _views_slideshow_preprocess_views_slideshow(&$vars) { $options = $vars['options']; $vars['skin'] = 'default'; $vars['slideshow'] = ''; @@ -201,7 +201,7 @@ function theme_views_slideshow_pager_widget_render($vars) { /** * Theme pager fields */ -function template_preprocess_views_slideshow_pager_fields(&$vars) { +function _views_slideshow_preprocess_views_slideshow_pager_fields(&$vars) { // Build our javascript settings. $js_vars = array( 'viewsSlideshowPagerFields' => array( @@ -239,7 +239,7 @@ function template_preprocess_views_slideshow_pager_fields(&$vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_pager_field_item(&$vars) { +function _views_slideshow_preprocess_views_slideshow_pager_field_item(&$vars) { $vars['classes_array'][] = 'views_slideshow_pager_field_item'; if (!$vars['count']) { $vars['classes_array'][] = 'views_slideshow_active_pager_field_item'; @@ -279,7 +279,7 @@ function theme_views_slideshow_controls_widget_render($vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_controls_text(&$vars) { +function _views_slideshow_preprocess_views_slideshow_controls_text(&$vars) { $module_path = drupal_get_path('module', 'views_slideshow'); drupal_add_css($module_path . '/views_slideshow_controls_text.css', array('type' => 'file')); @@ -297,7 +297,7 @@ function template_preprocess_views_slideshow_controls_text(&$vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_controls_text_previous(&$vars) { +function _views_slideshow_preprocess_views_slideshow_controls_text_previous(&$vars) { $vars['classes_array'][] = 'views_slideshow_controls_text_previous'; } @@ -306,7 +306,7 @@ function template_preprocess_views_slideshow_controls_text_previous(&$vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_controls_text_pause(&$vars) { +function _views_slideshow_preprocess_views_slideshow_controls_text_pause(&$vars) { $vars['classes_array'][] = 'views_slideshow_controls_text_pause'; $vars['start_text'] = t('Pause'); } @@ -316,7 +316,7 @@ function template_preprocess_views_slideshow_controls_text_pause(&$vars) { * * @ingroup themeable */ -function template_preprocess_views_slideshow_controls_text_next(&$vars) { +function _views_slideshow_preprocess_views_slideshow_controls_text_next(&$vars) { $vars['classes_array'][] = 'views_slideshow_controls_text_next'; } @@ -332,6 +332,6 @@ function theme_views_slideshow_slide_counter_widget_render($vars) { /** * Views Slideshow: slide counter. */ -function template_preprocess_views_slideshow_slide_counter(&$vars) { +function _views_slideshow_preprocess_views_slideshow_slide_counter(&$vars) { $vars['classes_array'][] = 'views_slideshow_slide_counter'; } diff --git a/views_slideshow.module b/views_slideshow.module index 27bdd61..bca1f9b 100644 --- a/views_slideshow.module +++ b/views_slideshow.module @@ -21,7 +21,6 @@ function views_slideshow_theme($existing, $type, $theme, $path) { 'views_slideshow_pager_fields' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'attributes' => array()), 'template' => 'theme/views-slideshow-pager-fields', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_pager_field_field' => array( 'variables' => array('view' => NULL, 'field' => NULL, 'count' => NULL), @@ -31,7 +30,6 @@ function views_slideshow_theme($existing, $type, $theme, $path) { 'views_slideshow_pager_field_item' => array( 'variables' => array('vss_id' => NULL, 'item' => NULL, 'count' => NULL, 'location' => NULL), 'template' => 'theme/views-slideshow-pager-field-item', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_controls_widget_render' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'rows' => array()), @@ -40,22 +38,18 @@ function views_slideshow_theme($existing, $type, $theme, $path) { 'views_slideshow_controls_text' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'rows' => array()), 'template' => 'theme/views-slideshow-controls-text', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_controls_text_previous' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array()), 'template' => 'theme/views-slideshow-controls-text-previous', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_controls_text_pause' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array()), 'template' => 'theme/views-slideshow-controls-text-pause', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_controls_text_next' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array()), 'template' => 'theme/views-slideshow-controls-text-next', - 'file' => 'theme/views_slideshow.theme.inc', ), 'views_slideshow_slide_counter_widget_render' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'rows' => array()), @@ -64,7 +58,6 @@ function views_slideshow_theme($existing, $type, $theme, $path) { 'views_slideshow_slide_counter' => array( 'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'rows' => array()), 'template' => 'theme/views-slideshow-slide-counter', - 'file' => 'theme/views_slideshow.theme.inc', ), ); } @@ -407,3 +400,43 @@ function views_slideshow_views_slideshow_option_definition() { return $options; } + +/** + * Need to have preprocess functions here because drupal doesn't cache them + * correctly in the theme.inc file. + * + * If you would like to override the preprocess functions make sure to look at + * the associated function in theme.inc. + */ + +function template_preprocess_views_slideshow(&$vars) { + _views_slideshow_preprocess_views_slideshow($vars); +} + +function template_preprocess_views_slideshow_pager_fields(&$vars) { + _views_slideshow_preprocess_views_slideshow_pager_fields($vars); +} + +function template_preprocess_views_slideshow_pager_field_item(&$vars) { + _views_slideshow_preprocess_views_slideshow_pager_field_item($vars); +} + +function template_preprocess_views_slideshow_controls_text(&$vars) { + _views_slideshow_preprocess_views_slideshow_controls_text($vars); +} + +function template_preprocess_views_slideshow_controls_text_previous(&$vars) { + _views_slideshow_preprocess_views_slideshow_controls_text_previous($vars); +} + +function template_preprocess_views_slideshow_controls_text_pause(&$vars) { + _views_slideshow_preprocess_views_slideshow_controls_text_pause($vars); +} + +function template_preprocess_views_slideshow_controls_text_next(&$vars) { + _views_slideshow_preprocess_views_slideshow_controls_text_next($vars); +} + +function template_preprocess_views_slideshow_slide_counter(&$vars) { + _views_slideshow_preprocess_views_slideshow_slide_counter($vars); +}