Index: openacs-4/packages/notifications/www/request-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/notifications/www/request-new.adp	29 May 2002 05:12:01 -0000	1.1
+++ openacs-4/packages/notifications/www/request-new.adp	1 Aug 2002 14:26:26 -0000	1.2
@@ -1,5 +1,8 @@
 <master src="master">
-<property name="title">New Notification Request for @pretty_name@</property>
-<property name="context_bar"></property>
+<property name="title">@page_title@</property>
 
-<formtemplate id="request"></formtemplate>
+<h2>@page_title@</h2>
+@context_bar@
+<hr>
+
+<formtemplate id="subscribe"></formtemplate>
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.1 -r1.2
--- openacs-4/packages/notifications/www/request-new.tcl	29 May 2002 05:12:01 -0000	1.1
+++ openacs-4/packages/notifications/www/request-new.tcl	1 Aug 2002 14:26:26 -0000	1.2
@@ -18,27 +18,32 @@
 # Check that the object can be subcribed to
 notification::security::require_notify_object -object_id $object_id
 
-form create request
+set page_title "Request Notification for $pretty_name"
 
-element create request type_id \
+set context_bar [ad_context_bar $page_title]
+
+
+form create subscribe
+
+element create subscribe type_id \
         -label "Type ID" -datatype integer -widget hidden
 
-element create request object_id \
+element create subscribe object_id \
         -label "Object ID" -datatype integer -widget hidden
 
-element create request return_url \
+element create subscribe return_url \
         -label "Return URL" -datatype text -widget hidden
 
-element create request interval_id \
+element create subscribe interval_id \
         -label "Notification Interval" -datatype integer -widget select -options [notification::get_intervals -type_id $type_id]
 
-element create request delivery_method_id \
+element create subscribe delivery_method_id \
         -label "Delivery Method" -datatype integer -widget select -options [notification::get_delivery_methods -type_id $type_id]
 
-if {[form is_valid request]} {
-    template::form get_values request type_id object_id return_url interval_id delivery_method_id
+if {[form is_valid subscribe]} {
+    template::form get_values subscribe type_id object_id return_url interval_id delivery_method_id
 
-    # Add the request
+    # Add the subscribe
     notification::request::new \
             -type_id $type_id \
             -user_id $user_id \
@@ -50,6 +55,6 @@
     ad_script_abort
 }
         
-element set_properties request type_id -value $type_id
-element set_properties request object_id -value $object_id
-element set_properties request return_url -value $return_url
+element set_properties subscribe type_id -value $type_id
+element set_properties subscribe object_id -value $object_id
+element set_properties subscribe return_url -value $return_url