- [ New Forum ]
+ [ New Forum | Administration ]
Index: openacs.org-dev/packages/forums/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/master.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/master.adp 9 Jul 2002 17:35:09 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/master.adp 5 Aug 2002 21:38:51 -0000 1.1.1.2
@@ -1,5 +1,6 @@
@title@
+@focus@
@title@
Index: openacs.org-dev/packages/forums/www/message-post-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-post-oracle.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/message-post-oracle.xql 31 Jul 2002 16:31:16 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/message-post-oracle.xql 5 Aug 2002 21:38:51 -0000 1.1.1.2
@@ -2,7 +2,7 @@
oracle8.1.6
-
+
select to_char(sysdate, 'Mon DD YYYY HH24:MI:SS')
from dual
Index: openacs.org-dev/packages/forums/www/message-post.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-post.adp,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/forums/www/message-post.adp 31 Jul 2002 16:31:16 -0000 1.1.1.2
+++ openacs.org-dev/packages/forums/www/message-post.adp 5 Aug 2002 21:38:51 -0000 1.1.1.3
@@ -1,6 +1,7 @@
Post to Forum: @forum.name@
@context_bar@
+message.subject
Index: openacs.org-dev/packages/forums/www/admin/forum-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-edit.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/admin/forum-edit.adp 9 Jul 2002 17:35:09 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-edit.adp 5 Aug 2002 21:38:52 -0000 1.1.1.2
@@ -1,6 +1,7 @@
Edit Forum: @forum.name@
-
+@context_bar@
+forum.name
This forum is enabled. You may disable it.
Index: openacs.org-dev/packages/forums/www/admin/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-edit.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/admin/forum-edit.tcl 9 Jul 2002 17:35:09 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-edit.tcl 5 Aug 2002 21:38:52 -0000 1.1.1.2
@@ -19,7 +19,7 @@
-label "Name" -datatype text -widget text -html {size 60}
element create forum charter \
- -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft}
+ -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft} -optional
element create forum presentation_type \
-label "Presentation" -datatype text -widget select -options {{Flat flat} {Threaded threaded}}
@@ -61,11 +61,15 @@
ad_script_abort
}
-element set_properties forum forum_id -value $forum_id
-element set_properties forum name -value $forum(name)
-element set_properties forum charter -value $forum(charter)
-element set_properties forum presentation_type -value $forum(presentation_type)
-element set_properties forum posting_policy -value $forum(posting_policy)
-element set_properties forum new_threads_p -value [forum::new_questions_allowed_p -forum_id $forum_id]
+set context_bar [list "Edit forum"]
+
+if { [form is_request forum] } {
+ element set_properties forum forum_id -value $forum_id
+ element set_properties forum name -value $forum(name)
+ element set_properties forum charter -value $forum(charter)
+ element set_properties forum presentation_type -value $forum(presentation_type)
+ element set_properties forum posting_policy -value $forum(posting_policy)
+ element set_properties forum new_threads_p -value [forum::new_questions_allowed_p -forum_id $forum_id]
+}
ad_return_template
Index: openacs.org-dev/packages/forums/www/admin/forum-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-new.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/admin/forum-new.adp 9 Jul 2002 17:35:09 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-new.adp 5 Aug 2002 21:38:52 -0000 1.1.1.2
@@ -1,5 +1,6 @@
Create New Forum
-
+@context_bar@
+forum.name
Index: openacs.org-dev/packages/forums/www/admin/forum-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-new.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/forums/www/admin/forum-new.tcl 9 Jul 2002 17:35:09 -0000 1.1.1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-new.tcl 5 Aug 2002 21:38:52 -0000 1.1.1.2
@@ -73,11 +73,15 @@
ad_script_abort
}
-# Pre-fetch the forum_id
-set forum_id [db_nextval acs_object_id_seq]
-element set_properties forum forum_id -value $forum_id
-element set_properties forum name -value $name
-element set_properties forum presentation_type -value threaded
-element set_properties forum new_threads_p -value 1
+set context_bar [list "Create New Forum"]
+if { [form is_request forum] } {
+ # Pre-fetch the forum_id
+ set forum_id [db_nextval acs_object_id_seq]
+ element set_properties forum forum_id -value $forum_id
+ element set_properties forum name -value $name
+ element set_properties forum presentation_type -value threaded
+ element set_properties forum new_threads_p -value 1
+}
+
ad_return_template
Index: openacs.org-dev/packages/notifications/tcl/notification-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/notification-display-procs.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/tcl/notification-display-procs.tcl 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/tcl/notification-display-procs.tcl 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -33,7 +33,7 @@
set sub_url [unsubscribe_url -request_id $request_id -url $url]
set sub_chunk "You have requested notification for $pretty_name. You may unsubscribe."
} else {
- set sub_url [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id]
+ set sub_url [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]
set sub_chunk "You may request notification for $pretty_name."
}
@@ -45,11 +45,12 @@
{-object_id:required}
{-url:required}
{-user_id:required}
+ {-pretty_name}
} {
set type_id [notification::type::get_type_id -short_name $type]
set root_path [apm_package_url_from_key [notification::package_key]]
- set subscribe_url "${root_path}request-new?type_id=$type_id&user_id=$user_id&object_id=$object_id&return_url=[ns_urlencode $url]"
+ set subscribe_url "${root_path}request-new?[export_vars { type_id user_id object_id pretty_name {return_url $url} }]"
return $subscribe_url
}
Index: openacs.org-dev/packages/notifications/tcl/notification-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/notification-procs-oracle.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/tcl/notification-procs-oracle.xql 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/tcl/notification-procs-oracle.xql 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -11,4 +11,15 @@
+
+
+ insert
+ into notification_user_map
+ (notification_id, user_id, sent_date)
+ values
+ (:notification_id, :user_id, sysdate)
+
+
+
+
Index: openacs.org-dev/packages/notifications/tcl/notification-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/notification-procs-postgresql.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/tcl/notification-procs-postgresql.xql 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/tcl/notification-procs-postgresql.xql 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -9,4 +9,14 @@
+
+
+ insert
+ into notification_user_map
+ (notification_id, user_id, sent_date)
+ values
+ (:notification_id, :user_id, now())
+
+
+
Index: openacs.org-dev/packages/notifications/tcl/notification-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/notification-procs.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/tcl/notification-procs.xql 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/tcl/notification-procs.xql 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -60,14 +60,4 @@
-
-
- insert
- into notification_user_map
- (notification_id, user_id, sent_date)
- values
- (:notification_id, :user_id, sysdate)
-
-
-
Index: openacs.org-dev/packages/notifications/tcl/sweep-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/sweep-procs-postgresql.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/tcl/sweep-procs-postgresql.xql 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/tcl/sweep-procs-postgresql.xql 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -27,6 +27,9 @@
notifications.notif_text,
notifications.notif_html,
notification_requests.user_id,
+ notification_requests.type_id,
+ notification_requests.delivery_method_id,
+ notifications.response_id,
acs_object__name(notifications.object_id) as object_name
from notifications
inner join notification_requests
Index: openacs.org-dev/packages/notifications/www/request-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/www/request-new.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/www/request-new.adp 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/www/request-new.adp 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -1,5 +1,8 @@
-New Notification Request for @pretty_name@
-
+@page_title@
-
+@page_title@
+@context_bar@
+
+
+
Index: openacs.org-dev/packages/notifications/www/request-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/www/request-new.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/notifications/www/request-new.tcl 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/notifications/www/request-new.tcl 5 Aug 2002 21:38:55 -0000 1.1.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
Index: openacs.org-dev/packages/page/page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/page/page.info,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/page/page.info 9 Jul 2002 17:35:10 -0000 1.1.1.1
+++ openacs.org-dev/packages/page/page.info 5 Aug 2002 21:38:55 -0000 1.1.1.2
@@ -7,14 +7,15 @@
t
f
-
+
oracle
postgresql
- Rafael Schloming
+ Rafael Schloming
Creates a page.
- ArsDigita Corporation
+ 2002-05-15
+ OpenACS
Index: openacs.org-dev/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/search/search.info,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/search/search.info 9 Jul 2002 17:35:12 -0000 1.1.1.1
+++ openacs.org-dev/packages/search/search.info 5 Aug 2002 21:39:17 -0000 1.1.1.2
@@ -7,14 +7,16 @@
t
f
-
+
oracle
postgresql
Neophytos Demetriou
+ 2002-05-15
+ OpenACS
-
+
@@ -41,6 +43,7 @@
+
@@ -51,11 +54,11 @@
-
-
-
-
+
+
+
+
Index: openacs.org-dev/packages/search/tcl/search-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/search/tcl/search-procs-oracle.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/search/tcl/search-procs-oracle.xql 9 Jul 2002 17:35:12 -0000 1.1.1.1
+++ openacs.org-dev/packages/search/tcl/search-procs-oracle.xql 5 Aug 2002 21:39:17 -0000 1.1.1.2
@@ -1,7 +1,7 @@
- postgresql>7.1
+ oracle8.1.6
Index: openacs.org-dev/packages/search/tcl/search-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/search/tcl/search-procs-postgresql.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/search/tcl/search-procs-postgresql.xql 9 Jul 2002 17:35:12 -0000 1.1.1.1
+++ openacs.org-dev/packages/search/tcl/search-procs-postgresql.xql 5 Aug 2002 21:39:17 -0000 1.1.1.2
@@ -1,13 +1,13 @@
- postgresql>7.1
+ postgresql7.1
select search_observer__dequeue(
:object_id,
- :date,
+ :event_date,
:event
);
Index: openacs.org-dev/packages/skin/skin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/skin/skin.info,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/skin/skin.info 9 Jul 2002 17:35:13 -0000 1.1.1.1
+++ openacs.org-dev/packages/skin/skin.info 5 Aug 2002 21:39:30 -0000 1.1.1.2
@@ -1,21 +1,21 @@
-
+
Skin
Skins
t
t
-
+
oracle
postgresql
- Christian Brechbuhler
+ Christian Brechbuhler
Demonstration of skins or cobranding.
- 2001-02-23
- ArsDigita Corporation
+ 2002-05-15
+ OpenACS
Show how the template system lets you give different looks to pages depending on the subsite under which they are mounted.
|