Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/notifications/notifications.info	19 Dec 2024 16:59:14 -0000	1.63
+++ openacs-4/packages/notifications/notifications.info	7 Feb 2025 14:46:54 -0000	1.64
@@ -6,33 +6,36 @@
     <pretty-plural>Notifications</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
+    <implements-subsite-p>f</implements-subsite-p>
+    <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>notifications</auto-mount>
 
-    <version name="6.0.0d1" url="http://openacs.org/repository/download/apm/notifications-6.0.0d1.apm">
+    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/notifications-6.0.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Email notifications management</summary>
-        <release-date>2024-09-02</release-date>
+        <release-date>2025-02-07</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Provides an API for packages to provide subscription based email notifications and handle replies.  Used by forums, bug-tracker, etc.  The currently preferred package for email notifications.</description>
         <maturity>3</maturity>
         <package_instance_name>#notifications.Notifications#</package_instance_name>
 
-        <provides url="notifications" version="6.0.0d1"/>
+        <provides url="notifications" version="6.0.0d2"/>
         <requires url="acs-kernel" version="5.10.1"/>
-        <requires url="acs-tcl" version="5.10.1"/>
         <requires url="acs-mail-lite" version="5.10.1"/>
+        <requires url="acs-tcl" version="5.10.1"/>
 
         <callbacks>
+            <callback type="before-uninstall"  proc="notification::apm::before_uninstall"/>
             <callback type="after-install"  proc="notification::apm::after_install"/>
             <callback type="after-upgrade"  proc="notification::apm::after_upgrade"/>
-            <callback type="before-uninstall"  proc="notification::apm::before_uninstall"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="CleanupSweepInterval"  default="900" description="Run sweeper in the specified interval (seconds)"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDomain"  description="The domain for the notification email address" section_name="email"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueue"  description="The location of the qmail queue for incoming email, mail will be looked for in EmailQmailQueue/new/*" section_name="email"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueueScanP"  default="0" description="Should the package scan the qmail queue for incoming mail? (1 is true, 0 is false)" section_name="email"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailReplyAddressPrefix"  default="notification" description="The prefix for email replies" section_name="email"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="CleanupSweepInterval"  default="900" description="Run sweeper in the specified interval (seconds)"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDomain"  description="The domain for the notification email address" section_name="email"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueue"  description="The location of the qmail queue for incoming email, mail will be looked for in EmailQmailQueue/new/*" section_name="email"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueueScanP"  default="0" description="Should the package scan the qmail queue for incoming mail? (1 is true, 0 is false)" section_name="email"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailReplyAddressPrefix"  default="notification" description="The prefix for email replies" section_name="email"/>
+            <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="SSENotifications"  default="false" description="Should we use SSE notifications? When active, SSE can be chosen as a delivery method for notifications alongside emails and we will subscribe to the notifications EventSource on every page."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/notifications/www/request-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/notifications/www/request-new.tcl	11 Sep 2024 06:15:52 -0000	1.19
+++ openacs-4/packages/notifications/www/request-new.tcl	7 Feb 2025 14:46:54 -0000	1.20
@@ -31,6 +31,17 @@
 set intervals_pretty [notification::get_intervals -localized -type_id $type_id]
 set delivery_methods [notification::get_delivery_methods -type_id $type_id]
 
+set sse_notifications_p [::parameter::get_global_value \
+                             -boolean \
+                             -package_key notifications \
+                             -parameter SSENotifications \
+                             -default false]
+if {!$sse_notifications_p} {
+    set sse_delivery_method_id [::notification::get_delivery_method_id -name sse]
+    set delivery_methods [lsearch -all -not -inline -index 1 \
+                              $delivery_methods $sse_delivery_method_id]
+}
+
 ad_form -name subscribe -export {
     type_id object_id return_url
 } -form {
Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -r1.33 -r1.34
--- openacs-4/www/blank-master.adp	3 Sep 2024 15:38:00 -0000	1.33
+++ openacs-4/www/blank-master.adp	7 Feb 2025 14:46:53 -0000	1.34
@@ -25,6 +25,8 @@
   @footer;literal@
 <multiple name="body_script">    <script type="@body_script.type;literal@"<if @body_script.src@ not nil> src="@body_script.src;literal@"</if><if @body_script.charset@ not nil> charset="@body_script.charset;literal@"</if><if @body_script.defer@ not nil> defer="@body_script.defer;literal@"</if><if @body_script.async@ not nil> async="@body_script.async;literal@"</if><if @body_script.integrity@ not nil> integrity="@body_script.integrity;literal@"</if><if @body_script.crossorigin@ not nil> crossorigin="@body_script.crossorigin;literal@"</if><if @::__csp_nonce@ not nil> nonce="@::__csp_nonce;literal@"</if>><if @body_script.content@ not nil>@body_script.content;literal@</if></script>
 </multiple>
-
+<if @sse_notifications_p;literal@ true>
+  <include src="/packages/notifications/lib/notification-sse">
+</if>
 </body>
 </html>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.60 -r1.61
--- openacs-4/www/blank-master.tcl	3 Sep 2024 15:38:00 -0000	1.60
+++ openacs-4/www/blank-master.tcl	7 Feb 2025 14:46:53 -0000	1.61
@@ -294,6 +294,12 @@
     }
 }
 
+set sse_notifications_p [::parameter::get_global_value \
+                             -boolean \
+                             -package_key notifications \
+                             -parameter SSENotifications \
+                             -default false]
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4