Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -N -r1.40 -r1.40.2.1
--- openacs-4/packages/forums/www/forum-view.adp	3 Jul 2015 09:56:53 -0000	1.40
+++ openacs-4/packages/forums/www/forum-view.adp	19 Sep 2015 16:05:32 -0000	1.40.2.1
@@ -9,7 +9,16 @@
 </if>
 
 <p>
-@notification_chunk;noquote@
-</p>
+<include src="/packages/notifications/lib/notification-widget" type="forums_forum_notif"
+	 object_id="@forum_id;literal@"
+	 pretty_name="@forum.name;literal@"
+	 url="@forum_url;literal@" >
 
-<include src="/packages/forums/lib/message/threads-chunk" &="forum_id" &="flush_p" &="permissions" moderate_p="@permissions.moderate_p;literal@" &="orderby" &="page" admin_p="@permissions.admin_p;literal@">
+<include src="/packages/forums/lib/message/threads-chunk"
+	 &="forum_id"
+	 &="flush_p"
+	 &="permissions"
+	 moderate_p="@permissions.moderate_p;literal@"
+	 &="orderby"
+	 &="page"
+	 admin_p="@permissions.admin_p;literal@" >
Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -N -r1.35.2.1 -r1.35.2.2
--- openacs-4/packages/forums/www/forum-view.tcl	12 Sep 2015 11:06:27 -0000	1.35.2.1
+++ openacs-4/packages/forums/www/forum-view.tcl	19 Sep 2015 16:05:32 -0000	1.35.2.2
@@ -44,14 +44,7 @@
 # Show search box?
 set searchbox_p [parameter::get -parameter ForumsSearchBoxP -default 1]
 
-# Need to quote forum(name) since it is noquoted on display as part of an 
-# HTML fragment.
-set notification_chunk [notification::display::request_widget \
-    -type forums_forum_notif \
-    -object_id $forum_id \
-    -pretty_name $forum(name) \
-    -url [ad_conn url]?forum_id=$forum_id \
-]
+set forum_url [ad_conn url]?forum_id=$forum_id
 
 template::head::add_css -href /resources/forums/forums.css -media all
 template::head::add_css -href /resources/forums/print.css -media print
Index: openacs-4/packages/notifications/lib/notification-widget.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/lib/notification-widget.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/lib/notification-widget.adp	19 Sep 2015 16:05:31 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+<if @sub_url@ not nil>
+<a href="@sub_url@" title="@title@"><img src="@icon;noi18n@" alt="@icon_alt@" style="border:0">&nbsp;@sub_chunk@</a>
+<if @subscribers_url@ not nil>
+[<a href="@subscribers_url;noi18n@">#notifications.Subscribers#</a>]
+</if>
+</if>
\ No newline at end of file
Index: openacs-4/packages/notifications/lib/notification-widget.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/lib/notification-widget.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/lib/notification-widget.tcl	19 Sep 2015 16:05:31 -0000	1.1.2.1
@@ -0,0 +1,41 @@
+ad_include_contract {
+    Include for notification chunk
+} {
+    {type:token}
+    {object_id:naturalnum}
+    {pretty_name}
+    {url}
+    {user_id:naturalnum ""}
+}
+
+if {$user_id eq ""} {
+    set user_id [ad_conn user_id]
+}
+
+set type_id [notification::type::get_type_id -short_name $type]
+set request_id [notification::request::get_request_id -type_id $type_id -object_id $object_id -user_id $user_id]
+    
+if {$request_id ne ""} {
+    set icon /resources/acs-subsite/email_delete.gif
+    set icon_alt [_ acs-subsite.icon_of_envelope]
+    set sub_url [notification::display::unsubscribe_url -request_id $request_id -url $url]
+    set title [_ notifications.lt_Ubsubscribe_Notification_]
+    set sub_chunk [_ notifications.lt_You_have_requested_no]
+} else {
+    set icon /resources/acs-subsite/email_add.gif
+    set icon_alt [_ acs-subsite.icon_of_envelope]
+    set sub_url [notification::display::subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]
+    set title [_ notifications.lt_Request_Notification_]
+    set sub_chunk [_ notifications.lt_You_may_a_hrefsub_url]
+}
+
+if { [permission::permission_p -object_id $object_id -privilege admin] } {
+    set subscribers_url [export_vars -base /notifications/subscribers -url {object_id}]
+}
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
+
Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v
diff -u -N -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/notifications/tcl/notification-display-procs.tcl	18 Sep 2015 08:08:43 -0000	1.20.2.2
+++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl	19 Sep 2015 16:05:31 -0000	1.20.2.3
@@ -57,7 +57,7 @@
        <img src=\"$icon\" alt=\"$icon_alt\" style=\"border:0\">$sub_chunk</a>"
     # if they are an admin give them to view all subscribers
     if { [permission::permission_p -object_id $object_id -privilege admin] } {
-	set href [export_vars -base /notifications/subscribers -url {object_id}]
+        set href [export_vars -base /notifications/subscribers -url {object_id}]
         append notif_chunk " \[<a href=\"[ns_quotehtml $href]\">[_ notifications.Subscribers]</a>\]"
     }
 
@@ -96,7 +96,7 @@
     {-request_id:required}
     {-url:required}
 } {
-    Returns the URL that allows one to unsubscribe from a particular request.	
+    Returns the URL that allows one to unsubscribe from a particular request.
 } {
     set root_path [apm_package_url_from_key [notification::package_key]]