Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-kernel/acs-kernel.info 6 Sep 2001 19:32:18 -0000 1.5 +++ openacs-4/packages/acs-kernel/acs-kernel.info 7 Dec 2001 22:02:08 -0000 1.6 @@ -128,6 +128,8 @@ + + Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -r1.25 -r1.26 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 1 Dec 2001 17:55:16 -0000 1.25 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 7 Dec 2001 22:02:08 -0000 1.26 @@ -655,6 +655,7 @@ new__context_id alias for $6; -- default null new__security_inherit_p alias for $7; -- default ''t'' v_object_id acs_objects.object_id%TYPE; + v_creation_date timestamp; begin if new__object_id is null then select acs_object_id_seq.nextval @@ -663,12 +664,18 @@ v_object_id := new__object_id; end if; + if new__creation_date is null then + v_creation_date:= now(); + else + v_creation_date := new__creation_date; + end if; + insert into acs_objects (object_id, object_type, context_id, creation_date, creation_user, creation_ip, security_inherit_p) values (v_object_id, new__object_type, new__context_id, - new__creation_date, new__creation_user, new__creation_ip, + v_creation_date, new__creation_user, new__creation_ip, new__security_inherit_p); PERFORM acs_object__initialize_attributes(v_object_id); @@ -690,6 +697,7 @@ new__creation_ip alias for $5; -- default null new__context_id alias for $6; -- default null v_object_id acs_objects.object_id%TYPE; + v_creation_date timestamp; begin if new__object_id is null then select acs_object_id_seq.nextval @@ -698,12 +706,18 @@ v_object_id := new__object_id; end if; + if new__creation_date is null then + v_creation_date:= now(); + else + v_creation_date := new__creation_date; + end if; + insert into acs_objects (object_id, object_type, context_id, creation_date, creation_user, creation_ip) values (v_object_id, new__object_type, new__context_id, - new__creation_date, new__creation_user, new__creation_ip); + v_creation_date, new__creation_user, new__creation_ip); PERFORM acs_object__initialize_attributes(v_object_id); Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 20 Nov 2001 17:46:28 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 7 Dec 2001 21:59:51 -0000 1.6 @@ -58,7 +58,7 @@ # /pvt/home.tcl proc ad_pvt_home {} { - return "/pvt/home" + return [ad_parameter -package_id [ad_acs_kernel_id] HomeURL] } proc ad_admin_home {} { @@ -70,16 +70,16 @@ } proc ad_pvt_home_name {} { - return "workspace" + return [ad_parameter -package_id [ad_acs_kernel_id] HomeName] } proc ad_pvt_home_link {} { - return "your workspace" + return "[ad_pvt_home_name]" } proc ad_site_home_link {} { if { [ad_get_user_id] != 0 } { - return "[ad_system_name]" + return "[ad_system_name]" } else { # we don't know who this person is return "[ad_system_name]" Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 6 Jul 2001 00:15:41 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 7 Dec 2001 21:59:51 -0000 1.3 @@ -47,7 +47,7 @@ if {[string match /pvt/home* [ad_conn url]]} { set display_main_p 0 } else { - lappend context [list "/pvt/home" "Your Workspace"] + lappend context [list "[ad_pvt_home]" "[ad_pvt_home_name]"] } } @@ -96,7 +96,7 @@ proc_doc ad_context_bar_ws args { Returns a Yahoo-style hierarchical navbar, starting with a link to workspace. } { - set choices [list "Your Workspace"] + set choices [list "[ad_pvt_home_link]"] # if { [ad_conn scope on_which_table] != "." } { # if { [llength $args] == 0 } { @@ -129,7 +129,7 @@ if { [ad_get_user_id] == 0 } { set choices [list "[ad_system_name]"] } else { - set choices [list "Your Workspace"] + set choices [list "[ad_pvt_home_link]"] } # lars, Apr25-00: Took out this old scoping thing @@ -159,7 +159,7 @@ workspace and admin home. Suitable for use in pages underneath /admin. } { - set choices [list "Your Workspace" "ACS System Wide Administration"] + set choices [list "[ad_pvt_home_link]" "ACS System Wide Administration"] set index 0 foreach arg $args { incr index