Index: openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql 21 Jan 2002 06:29:55 -0000 1.2 +++ openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql 21 Jan 2002 09:37:41 -0000 1.3 @@ -98,8 +98,7 @@ :1 := portal_page.new ( pretty_name => :pretty_name, - portal_id => :portal_id, - layout_id => :layout_id, + portal_id => :portal_id ); end; 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.92 -r1.93 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 21 Jan 2002 06:29:55 -0000 1.92 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 21 Jan 2002 09:37:41 -0000 1.93 @@ -143,7 +143,6 @@ ad_proc -public render { {-page_num 0} {-hide_links_p "f"} - {-hide_links_p "f"} {-render_style "individual"} portal_id {theme_id ""} @@ -161,6 +160,10 @@ set master_template [ad_parameter master_template] set css_path [ad_parameter css_path] +# if {[empty_string_p $page_num]} { +# set page_num [get_current_page -portal_id $portal_id] +# } + # get the portal and layout db_1row portal_select {} -column_array portal @@ -302,6 +305,14 @@ } append theme_data "" + + # set up the page creation stuff + set new_page_num [expr [page_count -portal_id $portal_id] + 1] + + set page_data \ + "
+ + " # get the portal. db_1row portal_select {} -column_array portal @@ -335,6 +346,12 @@ Change Theme: @theme_data@ +
+ + + Add a new page: + @page_data@ +

Configure The Portal's Elements: [get_page_pretty_name -page_id $page]" + if {[empty_string_p $return_url]} { + set url_length [string length [ns_conn url]] + if {[string range [ns_conn url] [expr $url_length - 1] end] != "/"} { + # if the url dosen't end in a /, set the return_url to the filename + set return_url [lindex [ns_conn urlv] [expr [ns_conn urlc] - 1]] + } else { + set return_url "" + } + } + + append html "[get_page_pretty_name -page_id $page]" } append html $separator }