Index: advanced_forum.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/advanced_forum.install,v retrieving revision 1.16.2.2 diff -u -p -r1.16.2.2 advanced_forum.install --- advanced_forum.install 15 Jun 2009 18:49:50 -0000 1.16.2.2 +++ advanced_forum.install 28 Jan 2011 15:17:38 -0000 @@ -19,6 +19,7 @@ function advanced_forum_uninstall() { variable_del('advanced_forum_topic_pager_max'); variable_del('advanced_forum_get_new_comments'); variable_del('advanced_forum_use_topic_navigation'); + variable_del('advanced_forum_collapsible_containers'); } function advanced_forum_update_5000() { Index: includes/advanced_forum_preprocess_forum_list.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/includes/Attic/advanced_forum_preprocess_forum_list.inc,v retrieving revision 1.1.2.20 diff -u -p -r1.1.2.20 advanced_forum_preprocess_forum_list.inc --- includes/advanced_forum_preprocess_forum_list.inc 16 Jan 2011 06:45:26 -0000 1.1.2.20 +++ includes/advanced_forum_preprocess_forum_list.inc 28 Jan 2011 15:17:38 -0000 @@ -8,7 +8,11 @@ */ function _advanced_forum_preprocess_forum_list(&$variables) { - ctools_add_js("collapsible-div"); + $variables['collapsible'] = variable_get('advanced_forum_collapsible_containers', 'toggle'); + if ($variables['collapsible'] != 'none') { + drupal_add_js(drupal_get_path('module', 'advanced_forum') . '/js/advanced_forum.js','module'); + drupal_add_js(array('advanced_forum' => array('effect' => $variables['collapsible'])), 'setting'); + } advanced_forum_add_template_suggestions("forum-list", $variables['template_files']); // Determine if we want to use taxonomy image here so we don't need to keep Index: includes/settings.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/includes/Attic/settings.inc,v retrieving revision 1.1.2.15 diff -u -p -r1.1.2.15 settings.inc --- includes/settings.inc 16 Nov 2010 15:55:07 -0000 1.1.2.15 +++ includes/settings.inc 28 Jan 2011 15:17:39 -0000 @@ -87,7 +87,18 @@ function advanced_forum_settings_page() '#default_value' => variable_get('advanced_forum_views_as_tabs', TRUE), '#description' => t('If checked, this will add a local task tab for "Active topics," "New posts," "My posts," and "Unanswered topics." If you don\'t know what this means, leave it unchecked. You must clear the cache before this will take effect.'), ); - + + $form['advanced_forum_general']['advanced_forum_collapsible_containers'] = array( + '#type' => 'select', + '#title' => t('Collapsible Forum Containers'), + '#options' => array ( + 'none' => t("None"), + 'toggle' => t("Toggle"), + 'fade' => t("Fade"), + ), + '#description' => t('Select whether or not to enable collapsible forum containers and what type of animation to use.'), + '#default_value' => variable_get('advanced_forum_collapsible_containers', 'toggle'), + ); /* Forum / topic list settings */ $form['advanced_forum_lists'] = array( Index: styles/naked/advanced_forum.naked.forum-list.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/styles/naked/Attic/advanced_forum.naked.forum-list.tpl.php,v retrieving revision 1.1.2.11 diff -u -p -r1.1.2.11 advanced_forum.naked.forum-list.tpl.php --- styles/naked/advanced_forum.naked.forum-list.tpl.php 16 Jan 2011 06:35:48 -0000 1.1.2.11 +++ styles/naked/advanced_forum.naked.forum-list.tpl.php 28 Jan 2011 15:17:39 -0000 @@ -43,20 +43,19 @@ - +
- - - + description): ?> +
+ name; ?>
@@ -68,7 +67,7 @@ depth == 1): ?> -
icon_text ?> Index: styles/naked/advanced_forum.naked.images.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/styles/naked/Attic/advanced_forum.naked.images.css,v retrieving revision 1.1.2.20 diff -u -p -r1.1.2.20 advanced_forum.naked.images.css --- styles/naked/advanced_forum.naked.images.css 1 Jan 2011 22:30:29 -0000 1.1.2.20 +++ styles/naked/advanced_forum.naked.images.css 28 Jan 2011 15:17:39 -0000 @@ -86,3 +86,19 @@ span.topic-icon { .topic-icon-closed { background: transparent url(images/topic_list_closed.png) no-repeat top left; } + +/* FORUM LIST COLLAPSIBLE CONTAINERS *********************************************************/ +span.advanced-forum-toggle { + width: 9px; + height: 100%; + text-indent: -9999px; + display: block; + margin-left: 10px; + float: right; + cursor: pointer; + background: transparent url(images/container_collapse.png) no-repeat center center; + +} +span.advanced-forum-toggle-collapsed { + background: transparent url(images/container_expand.png) no-repeat center center; +} Index: styles/naked/advanced_forum.naked.structure.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/styles/naked/Attic/advanced_forum.naked.structure.css,v retrieving revision 1.1.2.32 diff -u -p -r1.1.2.32 advanced_forum.naked.structure.css --- styles/naked/advanced_forum.naked.structure.css 26 Jan 2011 05:43:29 -0000 1.1.2.32 +++ styles/naked/advanced_forum.naked.structure.css 28 Jan 2011 15:17:39 -0000 @@ -111,25 +111,6 @@ th.forum-last-post { width: 20%; } -/* Collapsable containers */ -table.ctools-collapsible-container thead { - cursor: pointer; -} - -.ctools-toggle + table.ctools-collapsible-container th.forum-name a{ - background-image: url('images/container_collapse.png'); - background-repeat: no-repeat; - background-position: 3px center; - padding-left: 15px; -} - -.ctools-toggle-collapsed + table.ctools-collapsible-container th.forum-name a{ - background-image: url('images/container_expand.png'); - background-repeat: no-repeat; - background-position: 3px center; - padding-left: 15px; -} - /**** Topic listing ****/ .view-advanced-forum-topic-list .view-empty {