Index: views_slideshow.admin.inc
===================================================================
RCS file: views_slideshow.admin.inc
diff -N views_slideshow.admin.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ views_slideshow.admin.inc 15 Nov 2009 09:19:36 -0000
@@ -0,0 +1,33 @@
+ 'fieldset',
+ '#title' => t('Views Slideshow Global Settings'),
+ '#description' => t('These settings will be set for every view.'),
+ '#collapsible' => TRUE,
+ );
+
+ foreach ($modules as $module) {
+ if ($form_values = module_invoke($module, 'views_slideshow_admin_form')) {
+ $module_info = unserialize(db_result(db_query("SELECT `info` FROM {system} WHERE `name` = '%s'", $module)));
+ $form['views_slideshow'][$module] = array(
+ '#type' => 'fieldset',
+ '#title' => t($module_info['name']),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+
+ $form['views_slideshow'][$module] = array_merge($form['views_slideshow'][$module], $form_values);
+ }
+ }
+
+ return system_settings_form($form);
+}
\ No newline at end of file
Index: views_slideshow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.module,v
retrieving revision 1.11.2.2.2.4
diff -u -p -r1.11.2.2.2.4 views_slideshow.module
--- views_slideshow.module 15 Oct 2009 08:47:01 -0000 1.11.2.2.2.4
+++ views_slideshow.module 15 Nov 2009 09:19:36 -0000
@@ -7,6 +7,23 @@
*/
/**
+ * implements hook_menu
+ */
+function views_slideshow_menu() {
+ $items = array();
+ $items['admin/settings/views_slideshow'] = array(
+ 'title' => 'Views Slideshow Global Settings',
+ 'description' => 'Set Views Slideshow Global Settings.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('views_slideshow_settings'),
+ 'type' => MENU_NORMAL_ITEM,
+ 'access arguments' => array('administer views'),
+ 'file' => 'views_slideshow.admin.inc',
+ );
+ return $items;
+}
+
+/**
* Implement hook_theme().
*/
function views_slideshow_theme($existing, $type, $theme, $path) {
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.module,v
retrieving revision 1.1.2.1.2.4
diff -u -p -r1.1.2.1.2.4 views_slideshow_singleframe.module
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.module 15 Oct 2009 08:47:02 -0000 1.1.2.1.2.4
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.module 15 Nov 2009 09:19:36 -0000
@@ -52,6 +52,52 @@ function views_slideshow_singleframe_the
}
/**
+ * Implements hook_init().
+ */
+function views_slideshow_singleframe_init() {
+ if (variable_get('views_slideshow_singleframe_js_init', 2) == 1) {
+ $base = drupal_get_path('module', 'views_slideshow_singleframe');
+ drupal_add_js($base . '/views_slideshow.js', 'module');
+
+ if (module_exists('jq')) {
+ if (in_array('cycle', jq_plugins())) {
+ $js = jq_add('cycle');
+ }
+ }
+
+ // 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');
+ }
+ }
+}
+
+/**
+ * Implements hook_views_slideshow_modes.
+ */
+function views_slideshow_singleframe_views_slideshow_modes() {
+ $options = array(
+ 'singleframe' => t('SingleFrame'),
+ );
+ return $options;
+}
+
+/**
+ * Add form elements for global settings.
+ */
+function views_slideshow_singleframe_views_slideshow_admin_form() {
+ $form['views_slideshow_singleframe_js_init'] = array(
+ '#type' => 'radios',
+ '#title' => t('Load Javascript On Every Page'),
+ '#options' => array(1 => t('Yes'), 2 => t('No')),
+ '#default_value' =>(variable_get('views_slideshow_singleframe_js_init', '')) ? variable_get('views_slideshow_singleframe_js_init', '') : 2,
+ '#description' => t('With some caching options sometimes the javascript files do not load. If this is the case you can try this option to load the javascript files on every page load.'),
+ );
+
+ return $form;
+}
+
+/**
* Implementation of hook_help().
*/
function views_slideshow_singleframe_help($path, $arg) {
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.theme.inc,v
retrieving revision 1.1.2.1.2.11
diff -u -p -r1.1.2.1.2.11 views_slideshow_singleframe.theme.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 6 Nov 2009 06:21:55 -0000 1.1.2.1.2.11
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc 15 Nov 2009 09:19:36 -0000
@@ -12,7 +12,9 @@
function template_preprocess_views_slideshow_singleframe(&$vars) {
$options = $vars['options'];
$base = drupal_get_path('module', 'views_slideshow_singleframe');
- drupal_add_js($base . '/views_slideshow.js', 'module');
+ if (variable_get('views_slideshow_singleframe_js_init', 2) == 2) {
+ drupal_add_js($base . '/views_slideshow.js', 'module');
+ }
drupal_add_css($base . '/views_slideshow.css', 'module');
$num_divs = sizeof($vars['rows']);
@@ -40,15 +42,17 @@ function theme_views_slideshow_singlefra
// Add support for the jQuery Cycle plugin.
// If we have the jQ module installed, use that to add the Cycle plugin if possible.
// That allows for version control.
- if (module_exists('jq')) {
- if (in_array('cycle', jq_plugins())) {
- $js = jq_add('cycle');
+ if (variable_get('views_slideshow_singleframe_js_init', 2) == 2) {
+ if (module_exists('jq')) {
+ if (in_array('cycle', jq_plugins())) {
+ $js = jq_add('cycle');
+ }
+ }
+
+ // 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');
}
- }
-
- // 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');
}
$output = '
' . "\n";
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.11
diff -u -p -r1.1.2.1.2.11 views_slideshow_singleframe.views_slideshow.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc 5 Oct 2009 04:41:09 -0000 1.1.2.1.2.11
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc 15 Nov 2009 09:19:36 -0000
@@ -6,13 +6,6 @@
* The default options available with Views Slideshow: SingleFrame.
*/
-function views_slideshow_singleframe_views_slideshow_modes() {
- $options = array(
- 'singleframe' => t('SingleFrame'),
- );
- return $options;
-}
-
function views_slideshow_singleframe_views_slideshow_option_definition() {
$options['singleframe'] =array(
'contains' => array(
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.module,v
retrieving revision 1.1.2.1.2.4
diff -u -p -r1.1.2.1.2.4 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 15 Oct 2009 08:47:04 -0000 1.1.2.1.2.4
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module 15 Nov 2009 09:19:36 -0000
@@ -61,6 +61,52 @@ function views_slideshow_thumbnailhover_
}
/**
+ * Implements hook_init().
+ */
+function views_slideshow_thumbnailhover_init() {
+ if (variable_get('views_slideshow_thumbnailhover_js_init', 2) == 1) {
+ $base = drupal_get_path('module', 'views_slideshow_thumbnailhover');
+ drupal_add_js($base . '/views_slideshow.js', 'module');
+
+ if (module_exists('jq')) {
+ if (in_array('cycle', jq_plugins())) {
+ $js = jq_add('cycle');
+ }
+ }
+
+ // 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');
+ }
+ }
+}
+
+/**
+ * Implements hook_views_slideshow_modes.
+ */
+function views_slideshow_thumbnailhover_views_slideshow_modes() {
+ $options = array(
+ 'thumbnailhover' => t('ThumbnailHover'),
+ );
+ return $options;
+}
+
+/**
+ * Add form elements for global settings.
+ */
+function views_slideshow_thumbnailhover_views_slideshow_admin_form() {
+ $form['views_slideshow_thumbnailhover_js_init'] = array(
+ '#type' => 'radios',
+ '#title' => t('Load Javascript On Every Page'),
+ '#options' => array(1 => t('Yes'), 2 => t('No')),
+ '#default_value' =>(variable_get('views_slideshow_thumbnailhover_js_init', '')) ? variable_get('views_slideshow_thumbnailhover_js_init', '') : 2,
+ '#description' => t('With some caching options sometimes the javascript files do not load. If this is the case you can try this option to load the javascript files on every page load.'),
+ );
+
+ return $form;
+}
+
+/**
* Implementation of hook_help().
*/
function views_slideshow_thumbnailhover_help($path, $arg) {
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.theme.inc,v
retrieving revision 1.1.2.1.2.9
diff -u -p -r1.1.2.1.2.9 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 6 Nov 2009 06:21:55 -0000 1.1.2.1.2.9
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc 15 Nov 2009 09:19:36 -0000
@@ -12,7 +12,9 @@
function template_preprocess_views_slideshow_thumbnailhover(&$vars) {
$options = $vars['options'];
$base = drupal_get_path('module', 'views_slideshow_thumbnailhover');
- drupal_add_js($base . '/views_slideshow.js', 'module');
+ if (variable_get('views_slideshow_singleframe_js_init', 2) == 2) {
+ drupal_add_js($base . '/views_slideshow.js', 'module');
+ }
drupal_add_css($base . '/views_slideshow.css', 'module');
$num_divs = sizeof($vars['rows']);
@@ -30,14 +32,16 @@ function template_preprocess_views_slide
);
drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['id'] => $settings)), 'setting');
- if ($settings['pager_event'] == 'hoverIntent') {
- if (module_exists('jq')) {
- if (in_array('hoverIntent', jq_plugins())) {
- jq_add('hoverIntent');
+ if (variable_get('views_slideshow_thumbnailhover_js_init', 2) == 2) {
+ if ($settings['pager_event'] == 'hoverIntent') {
+ if (module_exists('jq')) {
+ if (in_array('hoverIntent', jq_plugins())) {
+ jq_add('hoverIntent');
+ }
+ }
+ if (module_exists('hoverintent')) {
+ hoverintent_add();
}
- }
- if (module_exists('hoverintent')) {
- hoverintent_add();
}
}
}
@@ -50,16 +54,19 @@ function theme_views_slideshow_thumbnail
// Add support for the jQuery Cycle plugin.
// If we have the jQ module installed, use that to add the Cycle plugin if possible.
// That allows for version control.
- if (module_exists('jq')) {
- if (in_array('cycle', jq_plugins())) {
- $js = jq_add('cycle');
+ if (variable_get('views_slideshow_thumbnailhover_js_init', 2) == 2) {
+ if (module_exists('jq')) {
+ if (in_array('cycle', jq_plugins())) {
+ $js = jq_add('cycle');
+ }
+ }
+
+ // 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');
}
}
-
- // 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');
- }
+
$output = '
' . "\n";
foreach ($view->result as $count => $node) {
$output .= theme('views_slideshow_thumbnailhover_no_display_teaser', node_view(node_load($node->nid), $teaser, FALSE, FALSE), $id, $count);
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.9
diff -u -p -r1.1.2.1.2.9 views_slideshow_thumbnailhover.views_slideshow.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc 3 Oct 2009 20:22:11 -0000 1.1.2.1.2.9
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc 15 Nov 2009 09:19:36 -0000
@@ -6,13 +6,6 @@
* The default options available with Views Slideshow: ThumbnailHover.
*/
-function views_slideshow_thumbnailhover_views_slideshow_modes() {
- $options = array(
- 'thumbnailhover' => t('ThumbnailHover'),
- );
- return $options;
-}
-
function views_slideshow_thumbnailhover_views_slideshow_option_definition() {
$options['thumbnailhover'] = array(
'contains' => array (