Index: print.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/print/print.module,v
retrieving revision 1.6
diff -u -p -r1.6 print.module
--- print.module	27 Jul 2005 17:48:22 -0000	1.6
+++ print.module	26 Dec 2005 21:46:47 -0000
@@ -56,13 +56,34 @@ function print_link($type, $node = 0, $m
 }
 
 function print_settings() {
-  $output = form_textfield(t('Stylesheet URL'), 'print_css', variable_get('print_css', 'misc/print.css'), 60, 64, t('The URL to your print cascading stylesheet.'));
+  $form['page_elements'] = array(
+	'#type' => 'fieldset',
+  	'#title' => t('Print page elements'),
+  );
+  $form['page_elements']['print_css'] = array(
+  	'#type' => 'textfield',
+  	'#title' => t('Stylesheet URL'),
+  	'#default_value' => variable_get('print_css', 'misc/print.css'),
+  	'#size' => 60,
+  	'#maxlength' => 64,
+  	'#description' => t('The URL to your print cascading stylesheet.'),
+  );
+
+  $form['page_elements']['print_urls'] = array(
+  	'#type' => 'checkbox',
+  	'#title' => t('Printer friendly URLs'),
+  	'#return_value' => 1,
+  	'#default_value' => variable_get('print_urls', 0),
+  );
+  $form['print_show_link'] = array(
+  	'#type' => 'radios',
+  	'#title' => t('Printer friendly page link'),
+  	'#default_value' => variable_get('print_show_link', 1),
+  	'#options' => array(t("Disabled"), t("Enabled")),
+  	'#description' => t("Enable or disable the 'printer friendly page' link for each node. Even if the link is disabled, you can still view the print version of a node by going to 'node/nid/print' where nid is the numeric id of the node."),
+  );
 
-  $field .= form_checkbox(t('Printer friendly URLs'), 'print_urls', 1, variable_get('print_urls', 0));
-  $output .= form_group(t('Print page elements'), $field);
-  $output .= form_radios(t('Printer friendly page link'), 'print_show_link', variable_get('print_show_link', 1), array(t("Disabled"), t("Enabled")), t("Enable or disable the 'printer friendly page' link for each node. Even if the link is disabled, you can still view the print version of a node by going to 'node/nid/print' where nid is the numeric id of the node."));
-
-  return $output;
+  return $form;
 }
 
 /********************************************************************