Optionally place watcher link in node links section

Ok here is another patch adding the ability to customise the watch link text in the admin settings UI.

Solution to the other links shifting left/right when the watcher link fades out then back in:

In watcher.js,

replace $(el).fadeOut("normal") (1 occurrence)
with $(el).fadeTo("normal", 0.2)

and $(el).fadeIn("normal") (2 occurrences)
with $(el).fadeTo("normal", 1)

This does a partial fade, but the whole element does not disappear.

Patch against the current 5.x-1.6 release of watcher.
I don't use Drupal 6 currently, so please don't ask (I'll post it if/when we upgrade).

Patch attached against 6.x-1.3. To summarise it does the following:
- Allows you to put the watcher link in the node links section instead of the node body
- Allows you to change the text used for the links

Hmm no drupal won't let me upload saying some sort of validation error, so here it is in text:

Index: watcher.module
--- watcher.module Base (BASE)
+++ watcher.module Locally Modified (Based On LOCAL)
@@ -162,6 +162,45 @@
 }
 
 /**
+ * Return a toggle watching post link array to be displayed in the node links section
+ *
+ * Please note that the JavaScript that handles the AJAX request looks for the class
+ * attribute so do not change it, rather override it with your own CSS rules if you
+ * want to change the appearance of this element.
+ *
+ * @param $uid
+ *    The user we'd like to toggle watching for
+ * @param $nid
+ *    The node id we're toggling watching for for this user
+ * @param $dest
+ *    The URL of the current page, used for redirection afterwards
+ * @param $user_is_watching
+ *    A boolean denoting whether uid is watching nid
+ * @param $t
+ *    An associative array of localized strings
+ *
+ * @return
+ *    An array defining the link properties
+ *
+ */
+function theme_watcher_node_links_toggle_watching_link($uid, $nid, $dest, $user_is_watching, $t = array()) {
+
+  // Set up classes
+  $class_watch_status_link = ( $user_is_watching ? ' watcher_node_toggle_watching_link_watched' : '');
+
+  return array(
+    'href' => "user/$uid/watcher/toggle/$nid",
+    'title' => ( $user_is_watching ? $t['watch_toggle_enabled'] : $t['watch_toggle_disabled'] ),
+    'attributes' => array(
+                      'class' => "watcher_node_toggle_watching_link$class_watch_status_link",
+                      'title' => ( $user_is_watching ? $t['watch_toggle_enabled_title'] : $t['watch_toggle_disabled_title'] ),
+                    ),
+    'query' => $dest,
+  );
+
+}
+
+/**
  * Return the help page
  *
  * @param $content
@@ -222,6 +261,9 @@
     'watcher_node_toggle_watching_link' => array(
       'arguments' => array('uid' => null, 'nid' => null, 'dest' => null, 'user_is_watching' => null, 't' => array()),
   ),
+    'watcher_node_links_toggle_watching_link' => array(
+      'arguments' => array('uid' => null, 'nid' => null, 'dest' => null, 'user_is_watching' => null, 't' => array()),
+  ),
     'watcher_help_page' => array(
       'arguments' => array('content' => null),
   ),
@@ -264,6 +306,16 @@
 }
 
 /**
+ * Implementation of hook_link().
+ */
+function watcher_link($type, $object, $teaser = FALSE) {
+  global $user;
+  if ($type == 'node' && _watcher_menu_access_toggle_watching_post($user) && _watcher_node_type_enabled($object)) {
+    return _watcher_node_watch_link($object, $teaser, null);
+  }
+}
+
+/**
  * Implementation of hook_menu().
  */
 function watcher_menu() {
@@ -725,6 +777,34 @@
     '#collapsed' => true,
   );
 
+  $form['togglelink']['watcher_toggle_link_disabled_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Link text when node is not being watched'),
+    '#default_value' => variable_get('watcher_toggle_link_disabled_text', t('You are not watching this post, click to start watching')),
+    '#size' => 50,
+    '#maxlength' => 100,
+  );
+
+  $form['togglelink']['watcher_toggle_link_enabled_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Link text when node is being watched'),
+    '#description' => t('If your site uses many languages, both these strings can be translated to languages other than the default by using the locale module.'),
+    '#default_value' => variable_get('watcher_toggle_link_enabled_text', t('You are watching this post, click to stop watching')),
+    '#size' => 50,
+    '#maxlength' => 100,
+  );
+
+  $form['togglelink']['watcher_toggle_link_position'] = array(
+    '#type' => 'radios',
+    '#title' => t('Where should "watch this post" toggle links be inserted on each node?'),
+    '#description' => t('This setting applies for both full page view and teasers (if the "display in teasers" option is checked).'),
+    '#options' => array(
+      'body' => t('At the bottom of the node body'),
+      'links' => t('In the node links section'),
+    ),
+    '#default_value' => variable_get('watcher_toggle_link_position', 'body'),
+  );
+
   $form['togglelink']['watcher_toggle_link_in_teaser'] = array(
       '#type' => 'checkbox',
       '#title' => t('Display "watch this post" toggle link in teasers.'),
@@ -2172,9 +2252,9 @@
 
   // Make localized strings
   $tstrings = array();
-  $tstrings['watch_toggle_enabled'] = t('You are watching this post, click to stop watching');
+  $tstrings['watch_toggle_enabled'] = variable_get('watcher_toggle_link_enabled_text', t('You are watching this post, click to stop watching'));
   $tstrings['watch_toggle_enabled_title'] = t('This post is being watched. You can track and change email notification setting for this post in your watched posts list (see your user profile)');
-  $tstrings['watch_toggle_disabled'] = t('You are not watching this post, click to start watching');
+  $tstrings['watch_toggle_disabled'] = variable_get('watcher_toggle_link_disabled_text', t('You are not watching this post, click to start watching'));
   $tstrings['watch_toggle_disabled_title'] = t('Watch posts to be notified when other users comment on them or the posts are changed');
 
   // Build link to the user's list of watched posts
@@ -2198,6 +2278,12 @@
   // Add CSS
   drupal_add_css(drupal_get_path('module', 'watcher') .'/css/watcher.css');
 
+  $position = variable_get('watcher_toggle_link_position', 'body');
+  if ($position == 'links') {
+    // Add toggle element to links array
+    return array( 'watcher' => theme('watcher_node_links_toggle_watching_link', $user->uid, $node->nid, $dest, $watching, $tstrings) );
+  }
+  else {
   //Add element to node
   $node->content['watcher'] = array(
     '#value' => theme('watcher_node_toggle_watching_link', $user->uid, $node->nid, $dest, $watching, $tstrings),
@@ -2205,6 +2291,8 @@
   );
 }
 
+}
+
 /**
  * Save user settings for Watcher
  *

Patch against 6.x-1.4 attached.

It also contains a fix for #937894: Watcher always sends notifications after updating published comments as we needed it.

Strange it may be my IDE's fault (I created it using NetBeans). Just eyeballing it the format looks fine.
Try removing the first 2 comment lines at the start?

Ah yes see my original post #1 up top - you can use some css to stop that happening.

Any chance of this being committed before its 4th birthday?