Index: marksmarty.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/marksmarty/marksmarty.module,v
retrieving revision 1.13
diff -u -F^f -r1.13 marksmarty.module
--- marksmarty.module	20 Mar 2005 16:57:02 -0000	1.13
+++ marksmarty.module	9 Jan 2006 20:05:16 -0000
@@ -76,14 +76,40 @@ function _marksmarty_process($text, $for
 }
 
 function _marksmarty_settings($format) {
-  $the_output = 'Markdown is enabled. Please read the <a href="http://daringfireball.net/projects/markdown/syntax">Markdown documentation</a> for full details on its formatting syntax.';
-  $the_output .= form_select(t('Enable SmartyPants?'), "marksmarty_is_smarty_on_$format", variable_get("marksmarty_is_smarty_on_$format", 1), array(0 => t('No'), 1 => t('Yes')) );
-  $the_output .= form_select(t('Hyphenation settings for SmartyPants'), "marksmarty_smarty_hyphens_$format", variable_get("marksmarty_smarty_hyphens_$format", 0), array(0 => t('"--" for em-dashes; no en-dash support'), 1 => t('"---" for em-dashes; "--" for en-dashes'), 2 => t('"--" for em-dashes; "---" for en-dashes')) );
-  $the_output .= 'Markdown PHP Version: <a href="http://www.michelf.com/projects/php-markdown/">'.$GLOBALS['MarkdownPHPVersion'].'</a><br />';
+  $form['markdown_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Markdown with SmartyPants'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  $form['markdown_settings']['help'] = array(
+    '#type' => 'markup',
+    '#value' => '<p>Markdown is enabled. Please read the <a href="http://daringfireball.net/projects/markdown/syntax">Markdown documentation</a> for full details on its formatting syntax.</p>',
+  );
+  $form['markdown_settings']["marksmarty_is_smarty_on_$format"] = array(
+    '#type' => 'select',
+    '#title' => t('Enable SmartyPants?'),
+    '#default_value' => variable_get("marksmarty_is_smarty_on_$format", 1),
+    '#options' => array(0 => t('No'), 1 => t('Yes')),
+  );
+  $form['markdown_settings']["marksmarty_smarty_hyphens_$format"] = array(
+    '#type' => 'select',
+    '#title' => t('Hyphenation settings for SmartyPants'),
+    '#default_value' => variable_get("marksmarty_smarty_hyphens_$format", 0),
+    '#options' => array(0 => t('"--" for em-dashes; no en-dash support'), 1 => t('"---" for em-dashes; "--" for en-dashes'), 2 => t('"--" for em-dashes; "---" for en-dashes')),
+  );
+
+  $the_output = '<p>Markdown PHP Version: <a href="http://www.michelf.com/projects/php-markdown/">'.$GLOBALS['MarkdownPHPVersion'].'</a><br />';
   $the_output .= 'Markdown Syntax Version: '.$GLOBALS['MarkdownSyntaxVersion'].'<br />';
   $the_output .= 'SmartyPants PHP Version: <a href="http://www.michelf.com/projects/php-smartypants/">'.$GLOBALS['SmartyPantsPHPVersion'].'</a><br />';
-  $the_output .= 'SmartyPants Syntax Version: '.$GLOBALS['SmartyPantsSyntaxVersion'];
-  return form_group(t('Markdown with SmartyPants'), $the_output);
+  $the_output .= 'SmartyPants Syntax Version: '.$GLOBALS['SmartyPantsSyntaxVersion'] .'</p>';
+
+  $form['markdown_settings']['markdown_status'] = array(
+    '#type' => 'markup',
+    '#value' => $the_output,
+  );
+
+  return $form;
 }
 
 ?>