Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.103 -r1.104
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl 23 Jan 2002 00:26:10 -0000 1.103
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 23 Jan 2002 05:09:19 -0000 1.104
@@ -609,6 +609,7 @@
ad_proc -public get_page_id {
{-portal_id:required}
+ {-page_name ""}
{-sort_key "0"}
{-current "f"}
} {
@@ -624,7 +625,11 @@
if {$current == "f"} {
return [db_string get_page_id_select {}]
} else {
- return [db_string get_current_page_id_select {}]
+ if {![empty_string_p $page_name]} {
+ return [db_string get_page_id_from_name {} -default ""]
+ } else {
+ return [db_string get_current_page_id_select {}]
+ }
}
}
@@ -1359,7 +1364,8 @@
}
ad_proc -public add_element_or_append_id {
- {-portal_id:required}
+ {-portal_id:required}
+ {-page_id ""}
{-portlet_name:required}
{-value_id:required}
{-key "instance_id"}
@@ -1386,7 +1392,7 @@
db_transaction {
# Tell portal to add this element to the page
- set element_id [add_element $portal_id $portlet_name]
+ set element_id [add_element -page_id $page_id $portal_id $portlet_name]
# There is already a value for the param which is overwritten
set_element_param $element_id $key $value_id
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/new-portal/tcl/portal-procs.xql 22 Jan 2002 20:51:49 -0000 1.11
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql 23 Jan 2002 05:09:19 -0000 1.12
@@ -201,6 +201,15 @@
select page_id
+ from portal_pages
+ where portal_id = :portal_id
+ and pretty_name= :page_name
+
+
+
+
+
+ select page_id
from portal_current_page
where portal_id = :portal_id
Index: openacs-4/packages/new-portal/www/themes/simple-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/simple-theme.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp 18 Jan 2002 15:51:14 -0000 1.9
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp 23 Jan 2002 05:09:19 -0000 1.10
@@ -5,11 +5,12 @@