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 ""