changed subscription/unsubscription to links if javascript is enabled, and button...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 49a5dc5df4ba877d6120d0cbf6bddf0c1884e446..36a48f3aeb134496a6caed872408ce6e54aa0c1b 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3255,8 +3255,18 @@ function forum_get_subscribe_link($forum, $context, $messages = array(), $cantac
             $linktext = $messages['unsubscribed'];
             $linktitle = get_string('subscribestart', 'forum');
         }
-        return print_single_button($CFG->wwwroot . '/mod/forum/subscribe.php?id=' . $forum->id,
+
+        $link = '<script type="text/javascript">';
+        $link .= 'document.getElementById("subscriptionlink").innerHTML = "<a title=\"' . $linktitle . '\" href=\"' . $CFG->wwwroot .
+           '/mod/forum/subscribe.php?id=' . $forum->id . '\">' . $linktext . '</a>";';
+        $link .= '</script>';
+        // use <noscript> to print button in case javascript is not enabled
+        $link .= '<noscript>';
+        $link .= print_single_button($CFG->wwwroot . '/mod/forum/subscribe.php?id=' . $forum->id,
                 '', $linktext, 'post', '_self', true, $linktitle);
+        $link .= '</noscript>';
+
+        return $link;  
     }    
 }
 

diff --git a/mod/forum/view.php b/mod/forum/view.php
index e18e7af85559221fd6202476e56eb49ff51c03e8..e08505bcddd4bc2166842e1c00156125bd08c47a 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -155,7 +155,7 @@
                 echo '<span class="helplink">'.$streveryonecannowchoose.'</span>';
             }
 
-            echo '<br /><span class="helplink">', forum_get_subscribe_link($forum, $context, 
+            echo '<br /><span class="helplink" id="subscriptionlink">', forum_get_subscribe_link($forum, $context, 
                     array('forcesubscribed' => '', 'cantsubscribe' => '')), '</span>';
         }