Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	22 Jan 2002 04:10:12 -0000	1.2
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	23 Jan 2002 06:29:36 -0000	1.3
@@ -16,7 +16,10 @@
 # ad_return_complaint 1 "$cf"
 
 # set up some vars
-set date [dt_sysdate]
+set date [ns_queryget date]
+if {[empty_string_p $date]} {
+    set date [dt_sysdate]
+}
 set current_date $date
 set date_format "YYYY-MM-DD HH24:MI"
 
Index: openacs-4/packages/dotlrn/www/applets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/applets.adp	21 Jan 2002 06:30:11 -0000	1.2
+++ openacs-4/packages/dotlrn/www/applets.adp	23 Jan 2002 06:29:14 -0000	1.3
@@ -3,4 +3,6 @@
 <property name="context_bar">@context_bar@</property>
 <property name="portal_id">@portal_id@</property>
 
+<b><font size=-1><a href=one-community-admin>Group Admin</a></font></b><p>
+
 <include src="applets-chunk">
Index: openacs-4/packages/dotlrn/www/applets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/applets.tcl	23 Jan 2002 01:30:14 -0000	1.6
+++ openacs-4/packages/dotlrn/www/applets.tcl	23 Jan 2002 06:29:14 -0000	1.7
@@ -8,6 +8,7 @@
 }
 
 set context_bar {{"one-community-admin" Admin} {Manage Applets}}
+
 set portal_id ""
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/index.adp	21 Jan 2002 06:30:11 -0000	1.13
+++ openacs-4/packages/dotlrn/www/index.adp	23 Jan 2002 06:29:14 -0000	1.14
@@ -2,15 +2,6 @@
 <property name="title">dotLRN</property>
 <property name="portal_id">@portal_id@</property>
 
-[
-  <font size="-1">
-    <a href="configure">customize</a>
-<if @admin_p@ eq 1>
-    |
-    <a href="@admin_url@">dotLRN Admin</a>
-</if>
-  </font>
-]
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/master.tcl	23 Jan 2002 05:03:16 -0000	1.8
+++ openacs-4/packages/dotlrn/www/master.tcl	23 Jan 2002 06:29:14 -0000	1.9
@@ -8,6 +8,22 @@
 # if we have a portal_id show navbar
 set user_id [ad_verify_and_get_user_id]
 
+if {![info exists link_all]} {
+    set link_all 0
+}
+
+if {![info exists return_url]} {
+    set return_url ""
+}
+
+if {![info exists show_control_panel]} {
+    set show_control_panel 0
+}
+
+if {![info exists link_control_panel]} {
+    set link_control_panel 1
+}
+
 db_0or1row pvt_home_user_info {
     select first_names, last_name
     from cc_users
@@ -24,10 +40,15 @@
     if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} {
         set navbar "<table border=0 cellpadding=5><tr>"
         
-        append navbar [portal::list_pages -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
+        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
+        if {$show_control_panel} {
+            if {$link_control_panel} {
+                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=one-community-admin>Group Admin</a></center></td> </tr></table>"
+            } else {
+                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Group Admin</center></td> </tr></table>"
+            }
+        }
         
-        append navbar "</tr></table>"
-        
     } else {
         set navbar ""
         set portal_id ""
@@ -40,7 +61,7 @@
     if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} {
         set navbar "<table border=0 cellpadding=5><tr>"
         
-        append navbar [portal::list_pages -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
+        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
         
         append navbar "</tr></table>"
         
@@ -55,9 +76,13 @@
     if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} {
         set navbar "<table border=0 cellpadding=5><tr>"
         
-        append navbar [portal::list_pages -portal_id $portal_id -link "switch-page" -pre_html "\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td>\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>\n"]
+        append navbar [portal::list_pages -return_url $return_url -portal_id $portal_id -link_all $link_all -link "switch-page" -pre_html "\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td>\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>\n"]
         
-        append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=preferences>Control Panel</a></center></td> </tr></table>"
+        if {$link_control_panel} {
+            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=preferences>Control Panel</a></center></td> </tr></table>"
+        } else {
+            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Control Panel</center></td> </tr></table>"
+        }
         
     } else {
         set navbar ""
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	22 Jan 2002 15:33:17 -0000	1.13
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	23 Jan 2002 06:29:14 -0000	1.14
@@ -1,7 +1,11 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@ Admin</property>
-<property name="portal_id">@admin_portal_id@</property>
+<property name="portal_id">@portal_id@</property>
+<property name="link_all">1</property>
+<property name="return_url">one-community</property>
+<property name="link_control_panel">0</property>
+<property name="show_control_panel">1</property>
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl	23 Jan 2002 01:15:10 -0000	1.15
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl	23 Jan 2002 06:29:14 -0000	1.16
@@ -16,6 +16,7 @@
 }
 
 set community_id [dotlrn_community::get_community_id]
+set user_id [ad_get_user_id]
 
 # Permissions
 dotlrn::require_user_admin_community $community_id
@@ -25,6 +26,8 @@
 # render the admin page
 set rendered_page [dotlrn::render_page -render_style all_in_one $admin_portal_id]
 
+set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
+
 set context_bar {Admin}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/one-community.adp	21 Jan 2002 06:30:11 -0000	1.9
+++ openacs-4/packages/dotlrn/www/one-community.adp	23 Jan 2002 06:29:14 -0000	1.10
@@ -2,18 +2,8 @@
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@</property>
 <property name="portal_id">@portal_id@</property>
+<property name="show_control_panel">@admin_p@</property>
 
-[
-  <font size="-1">
-    <include src="deregister-link">
-    |
-    <a href="configure">customize</a>
-<if @admin_p@ eq 1>
-    |
-    <a href="one-community-admin">admin</a>
-</if>
-  </font>
-]
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/preferences.adp	21 Jan 2002 08:17:27 -0000	1.4
+++ openacs-4/packages/dotlrn/www/preferences.adp	23 Jan 2002 06:29:14 -0000	1.5
@@ -1,6 +1,9 @@
 <master src="master">
 <property name="title">@title@</property>
 <property name="portal_id">@portal_id@</property>
+<property name="link_all">1</property>
+<property name="return_url">./</property>
+<property name="link_control_panel">0</property>
 
 <ul>
   <li><a href="/pvt/home">Edit My Profile</a></li>
Index: openacs-4/packages/dotlrn/www/preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/preferences.tcl	23 Jan 2002 05:03:16 -0000	1.7
+++ openacs-4/packages/dotlrn/www/preferences.tcl	23 Jan 2002 06:29:14 -0000	1.8
@@ -14,7 +14,7 @@
     admin_url:onevalue
 }
 
-set portal_id ""
+set portal_id [dotlrn::get_workspace_portal_id [ad_get_user_id]]
 
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	23 Jan 2002 05:09:32 -0000	1.20
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	23 Jan 2002 06:29:31 -0000	1.21
@@ -170,7 +170,9 @@
 	# Add the portlet here
         if { $workspace_portal_id != "" } {
             calendar_portlet::make_self_available $workspace_portal_id
+
             set element_id  [calendar_portlet::add_self_to_page \
+                    -page_id [portal::get_page_id -portal_id $portal_id -page_name [get_user_default_page]] \
                     $workspace_portal_id \
                     $calendar_id]
         }
@@ -198,7 +200,6 @@
 
 	# Call the portal element to be added correctly
 	calendar_portlet::add_self_to_page \
-                -page_id [portal::get_page_id -portal_id $portal_id -page_name [get_user_default_page]] \
                 $portal_id $g_cal_id
 
 	# Now for the user workspace
Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/new-portal/sql/oracle/api-create.sql	22 Jan 2002 20:02:39 -0000	1.31
+++ openacs-4/packages/new-portal/sql/oracle/api-create.sql	23 Jan 2002 06:29:22 -0000	1.32
@@ -94,7 +94,7 @@
                 else
                    update portal_current_page 
                    set page_id = v_page_id
-                   where portal_id = portal_id;
+                   where portal_id = portal_page.new.portal_id;
 
 --                   raise_application_error(-20000, 'aks1 just UPDATED portal_current_page with page_id ' || v_page_id || ' portal_id ' || portal_id || ' page count ' || v_current_page_count); 
                 end if;
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.106 -r1.107
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	23 Jan 2002 05:24:33 -0000	1.106
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	23 Jan 2002 06:29:22 -0000	1.107
@@ -728,6 +728,7 @@
         {-post_html ""}
         {-separator "&nbsp;"}
         {-return_url ""}
+        {-link_all 0}
     } {
         Returns an html string of the pretty names of the pages in the 
         given portal. 
@@ -741,7 +742,7 @@
         set current_page_id [get_page_id -current "t" -portal_id $portal_id]
 
         foreach page [list_pages_tcl_list -portal_id $portal_id] {
-            if {$page == $current_page_id} {
+            if {$page == $current_page_id && !$link_all} {
                 append html "[get_page_pretty_name -page_id $page]"
             } else {
                 if {[empty_string_p $return_url]} {
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.12 -r1.13
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	23 Jan 2002 05:09:19 -0000	1.12
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	23 Jan 2002 06:29:22 -0000	1.13
@@ -198,7 +198,7 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::get_page_id.get_current_page_id_select">      
+<fullquery name="portal::get_page_id.get_page_id_from_name">      
   <querytext>
    select page_id
    from portal_pages