Index: taxonomy_super_select.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_super_select/taxonomy_super_select.module,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 taxonomy_super_select.module
--- taxonomy_super_select.module	30 Sep 2008 04:17:51 -0000	1.2.2.1
+++ taxonomy_super_select.module	30 Sep 2008 16:41:07 -0000
@@ -52,10 +52,34 @@
 
       if (module_exists('taxonomy_image')) {
         $form['tss']['taxonomy_super_select_vid_'. $vid]['image'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Allow Taxonomy Image to provide images with the terms'),
-          '#default_value' => $tss['image'],
+          '#type' => 'radios',
+          '#options' => array(
+            'text' => 'Text only',
+            'image' => 'Image only',
+            'both' => 'Both text and image',
+            ),
+          '#title' => t('Use Taxonomy Image for the terms'),
+          '#default_value' => isset($tss['image']) ? $tss['image'] : 'text',
+          '#description'    => t('The Taxonomy Image module is available. How would you prefer to show the terms?'),
+          '#prefix' => '<div class="taxonomy-super-select-radios">',
+          '#suffix' => '</div>',
           );
+
+        if (module_exists('imagecache')) {
+          $form['tss']['taxonomy_super_select_vid_'. $vid]['image']['#description'] .= ' '. t('You will have a resizing option below.');
+          $form['tss']['taxonomy_super_select_vid_'. $vid]['size'] = array(
+            '#type' => 'radios',
+            '#options' => drupal_map_assoc(_taxonomy_image_presets()),
+            '#title' => t('Size to use for the images'),
+            '#default_value' => isset($tss['size']) ? $tss['size'] : 'thumbnail',
+            '#description'    => t('The Taxonomy Image module is can resize the images. What preset size would you like to use?'),
+            '#prefix' => '<div class="taxonomy-super-select-radios">',
+            '#suffix' => '</div>',
+            );        
+        }
+        else {
+          $form['tss']['taxonomy_super_select_vid_'. $vid]['image']['#description'] .= ' '. t('The image will be displayed in the default Taxonomy Image size.');
+        }
       }
     }
   }
@@ -143,6 +167,27 @@
 }
 
 function _tss_branch($vid, $term, $value = NULL, $type = 'fieldset', $fieldweight = -1) {
+  static $show_as, $image_size;
+  if ($type == 'fieldset') {
+    $tss = variable_get('taxonomy_super_select_vid_'. $vid, 0);
+    $show_as = isset($tss['image']) ? $tss['image'] : 'text';
+    $image_size = isset($tss['size']) ? $tss['size'] : 'thumbnail';
+  }
+
+  $name = check_plain($term->name);
+  if ($type != 'fieldset') {
+    $name = check_plain($term->name);
+    if ($show_as != 'text') {
+      $image = taxonomy_image_display($term->tid, NULL, $image_size, array('wrapper' => FALSE));
+      if ($show_as = 'both') {
+        $name = $image . $name;
+      }
+      else {
+        $name = $image;
+      }
+    }
+  }
+  
   $required = $term->required ? ' <span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
   switch ($type) {
     case 'fieldset':
@@ -153,11 +198,11 @@
         $help = '<div class="taxonomy-super-select-help">'. $term->help .'</div>';
       }
       else {
-        $help = null;
+        $help = NULL;
       }
       $form = array(
         '#type' => 'fieldset',
-        '#title' => check_plain($term->name) . $required,
+        '#title' => $name . $required,
         '#collapsible' => TRUE,
         '#collapsed' => $collapsed,
         '#weight' => ($fieldweight >= 0) ? $fieldweight : $term->weight,
@@ -185,7 +230,7 @@
     case 'radio':
       $form = array(
         '#type' => 'radio',
-        '#title' => ($term->is_parent ? '<strong>' : '') . check_plain($term->name) . ($term->is_parent ? '</strong>' : ''),
+        '#title' => ($term->is_parent ? '<strong>' : '') . $name . ($term->is_parent ? '</strong>' : ''),
         '#return_value' => $term->tid,
         '#default_value' => $value,
         '#weight' => ($fieldweight >= 0) ? $fieldweight : $term->weight,
@@ -195,7 +240,7 @@
     case 'checkbox':
       $form = array(
         '#type' => 'checkbox',
-        '#title' => ($term->is_parent ? '<strong>' : '') . check_plain($term->name) . ($term->is_parent ? '</strong>' : ''),
+        '#title' => ($term->is_parent ? '<strong>' : '') . $name . ($term->is_parent ? '</strong>' : ''),
         '#return_value' => $term->tid,
         '#default_value' => $value,
         '#weight' => ($fieldweight >= 0) ? $fieldweight : $term->weight,       
Index: taxonomy_super_select.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_super_select/Attic/taxonomy_super_select.css,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_super_select.css
--- taxonomy_super_select.css	30 Sep 2008 04:17:51 -0000	1.1.2.1
+++ taxonomy_super_select.css	30 Sep 2008 16:36:43 -0000
@@ -1,32 +1,51 @@
-/* $Id: taxonomy_super_select.css,v 1.1.2.1 2008/09/30 04:17:51 codexmas Exp $ */
-
-/**
- * @file
- *   Changes the default taxonomy select box into checkbox or radio buttons.
- */
-
-.taxonomy-super-select-checkboxes {
-  clear: both;
-  padding-top: 1em;
-}
-
-.taxonomy-super-select-checkboxes .form-item label.option {
-  float: left;
-  margin-right: 1.5em;
-}
-
-.taxonomy-super-select-radios {
-  clear: both;
-  padding-top: 1em;
-}
-
-.taxonomy-super-select-radios .form-item label.option {
-  float: left;
-  margin-right: 1.5em;
-}
-
-.taxonomy-super-select-help {
-  display: block;
-  font-style: italic;
-  margin-left: 1em;
-}
+/* $Id: taxonomy_super_select.css,v 1.1.2.1 2008/09/30 04:17:51 codexmas Exp $ */
+/**
+ * @file
+ *   Changes the default taxonomy select box into checkbox or radio buttons.
+ */
+
+.taxonomy-super-select-checkboxes {
+  clear: both;
+  padding-top: 1em;
+}
+
+.taxonomy-super-select-checkboxes .form-item label.option {
+  float: left;
+  margin-right: 1.5em;
+}
+
+.taxonomy-super-select-radios {
+  clear: both;
+  padding-top: 1em;
+}
+
+.taxonomy-super-select-radios .form-item label.option {
+  float: left;
+  margin-right: 1.5em;
+}
+
+.taxonomy-super-select-radios .description {
+  clear: both;
+}
+
+.taxonomy-super-select-help {
+  display: block;
+  font-style: italic;
+  margin-left: 1em;
+}
+
+#taxonomy-form-vocabulary .taxonomy-super-select-radios {
+  padding-top: 0;
+}
+
+#taxonomy-form-vocabulary .form-radios {
+  margin-top: 0;
+}
+
+#taxonomy-form-vocabulary .form-item {
+  margin-top: 0;
+}
+
+.taxonomy-super-select-image .form-item {
+  display: inline;
+}
Index: taxonomy_super_select.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_super_select/Attic/taxonomy_super_select.install,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 taxonomy_super_select.install
--- taxonomy_super_select.install	30 Sep 2008 04:17:51 -0000	1.1.2.1
+++ taxonomy_super_select.install	30 Sep 2008 17:03:08 -0000
@@ -1,28 +1,29 @@
-<?php
-// $Id: taxonomy_super_select.install,v 1.1.2.1 2008/09/30 04:17:51 codexmas Exp $
-
-/**
- * @file
- *   Changes the default taxonomy select box into checkbox or radio buttons.
- */
-
-/**
- * Implementation of hook_install().
- */
-function taxonomy_super_select_install() {
-  // This module must run after the main taxonomy module, 
-  // as it alters that form in turn.
-  $taxonomy_weight = db_result(db_query("SELECT weight FROM {system} WHERE name='taxonomy'"));
-  db_query("UPDATE {system} SET weight=%d WHERE name='taxonomy_super_select'", 1 + $taxonomy_weight );
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function taxonomy_super_select_uninstall() {
-  // Delete our variables.
-  $result = db_query("SELECT vid FROM {vocabulary}");
-  while ($vid = db_result($result)) {
-    variable_del('taxonomy_super_select_vid_'. $vid);
-  }
-}
+<?php
+// $Id: taxonomy_super_select.install,v 1.1.2.1 2008/09/30 04:17:51 codexmas Exp $
+
+/**
+ * @file
+ * Changes the default taxonomy select box into checkboxes or radio buttons.
+ */
+
+/**
+ * Implementation of hook_install().
+ */
+
+function taxonomy_super_select_install() {
+  // This module must run after the main taxonomy module,
+  // as it alters that form in turn.
+  $taxonomy_weight = db_result(db_query("SELECT weight FROM {system} WHERE name='taxonomy'"));
+  db_query("UPDATE {system} SET weight=%d WHERE name='taxonomy_super_select'", 1 + $taxonomy_weight );
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function taxonomy_super_select_uninstall() {
+  // Delete our variables.
+  $result = db_query("SELECT vid FROM {vocabulary}");
+  while ($vid = db_result($result)) {
+    variable_del('taxonomy_super_select_vid_'. $vid);
+  }
+}