Index: modules/quicktags/quicktags.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quicktags/quicktags.module,v
retrieving revision 1.19
diff -u -r1.19 quicktags.module
--- modules/quicktags/quicktags.module	10 Oct 2006 15:48:44 -0000	1.19
+++ modules/quicktags/quicktags.module	11 Oct 2006 14:18:42 -0000
@@ -2,16 +2,6 @@
 // $Id: quicktags.module,v 1.19 2006/10/10 15:48:44 ber Exp $
 
 /**
- * Implementation of hook_help().
- */
-function quicktags_help($section) {
-  switch($section) {
-    case 'admin/modules#description':
-      return t('Allows Drupal to use quicktags around the textarea for easier user input');
-  }
-}
-
-/**
  * Implementation of hook_perm().
  */
 function quicktags_perm() {
@@ -22,7 +12,6 @@
  * Implementation of hook_settings().
  */
 function quicktags_settings() {
-
   $form['quicktags_options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Quicktags options'),
@@ -34,9 +23,8 @@
     '#options' => array(0 => t('Everywhere'), 1 => t('Only nodes'), 2 => t('Nodes and comments')),
     '#description' => t('Where to show the quicktags toolbar.'),
   );
-
-
-  return $form;
+  
+  return system_settings_form($form);
 }
 
 /**
@@ -47,6 +35,16 @@
 
   if ($may_cache) {
     $items[] = array(
+      'path' => 'admin/settings/quicktags',
+      'title' => t('Quicktags'),
+      'description' => t('Configure quicktags options.'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => 'quicktags_settings',
+      'access' => user_access('administer site configuration')
+    );
+  } 
+  else {
+    $items[] = array(
       'path' => 'quicktags',
       'callback' => 'quicktags_javascript',
       'access' => TRUE,
@@ -113,12 +111,10 @@
   $path = drupal_get_path('module','quicktags');
 
   //Add the stylesheet
-  $stylesheet =  $path .'/quicktags.css';
-  drupal_set_html_head(theme_stylesheet_import(base_path() . $stylesheet));
+  drupal_add_css($path .'/styles/quicktags.css');
 
   //Add the static file
-  $javascript = $path .'/quicktags.js';
-  drupal_add_js($javascript);
+  drupal_add_js($path .'/javascript/quicktags.js');
 
   //Add the dynamically generated file
   drupal_add_js('?q=quicktags');
@@ -154,7 +150,7 @@
  * location;   // optional: onclick action omit the ().
 */
 function quicktags_quicktags_insert() {
-  $path = base_path() . drupal_get_path('module','quicktags') .'/';
+  $path = base_path() . drupal_get_path('module','quicktags') .'/images/';
 
   $items = array(
     'ed_italic' => array(
@@ -227,7 +223,7 @@
 }
 
 function quicktags_javascript_prepare() {
-  $path = base_path() . drupal_get_path('module', 'quicktags');
+  $path = base_path() . drupal_get_path('module', 'quicktags') .'/images';
   $output = <<<EOD
 function edToolbar(id) {
   document.write('<div class="ed_toolbar" id="ed_toolbar' + id + '">');