Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 18 Apr 2002 19:10:09 -0000 1.3
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 19 Apr 2002 18:16:48 -0000 1.4
@@ -54,11 +54,6 @@
set portal_id [dotlrn::get_workspace_portal_id $user_id]
}
-
-
-# ad_return_complaint 1 "$portal_id |$community_id|"
-
-
if {![empty_string_p $community_id]} {
set have_comm_id_p 1
} else {
@@ -87,9 +82,10 @@
set link $return_url
}
+set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id $community_id]
+
if {![info exists show_control_panel]} {
- if {$have_comm_id_p
- && [dotlrn::user_can_admin_community_p -user_id $user_id $community_id]} {
+ if {$have_comm_id_p && $admin_p } {
set show_control_panel 1
} else {
set show_control_panel 0
@@ -111,25 +107,26 @@
set text [dotlrn_community::get_community_header_name $community_id]
set link [dotlrn_community::get_community_url $community_id]
+# ns_log notice "aks9: $link"
+
# ad_return_complaint 1 "$portal_id | $text | $link"
- if {[empty_string_p $portal_id]} {
+ if {[empty_string_p $portal_id] && !$admin_p } {
# not a member yet
set portal_id [dotlrn_community::get_community_non_members_portal_id $community_id]
}
-
if { $have_portal_id_p && $show_navbar_p } {
if {$show_control_panel} {
if {$link_control_panel} {
- set extra_td_html " $control_panel_text"
+ set extra_td_html " $control_panel_text"
} else {
set extra_td_html " $control_panel_text"
}
} else {
# don't show control panel
set extra_td_html ""
}
-
+
set navbar [portal::navbar \
-portal_id $portal_id \
-link_all $link_all \
@@ -224,7 +221,7 @@
if {[ad_parameter community_level_p] == 1 || $parent_comm_p } {
set community_id [dotlrn_community::get_community_id]
- # aks color hack
+ # color hack
if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
set color_hack "#663366"
set color_hack_name "purple"
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/one-community.tcl 29 Mar 2002 19:14:46 -0000 1.23
+++ openacs-4/packages/dotlrn/www/one-community.tcl 19 Apr 2002 18:16:48 -0000 1.24
@@ -51,7 +51,7 @@
}
# Check that this user is a member
-if {![dotlrn_community::member_p $community_id $user_id]} {
+if {![dotlrn_community::member_p $community_id $user_id] && !$admin_p} {
set context_bar [list "Not a member"]
if {[dotlrn_community::member_pending_p -community_id $community_id -user_id $user_id]} {