Index: openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 4 Jul 2005 21:20:34 -0000 1.9.2.2
+++ openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 6 Jul 2005 17:24:05 -0000 1.9.2.3
@@ -81,6 +81,7 @@
Privilege on
Privilege on dotLRN-Catalog:
Professor:
+ <img src=/resources/dotlrn/request.gif alt="Request Membership" border="0" title="Request Membership">
Revision List
Revisions
Revoke
Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl 4 Jul 2005 21:20:34 -0000 1.8.2.2
+++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl 6 Jul 2005 17:17:20 -0000 1.8.2.3
@@ -78,13 +78,21 @@
append dotlrn_com "0)"
db_multirow -extend { join } classes_list get_dotlrn_classes { } {
-
if {![dotlrn_community::member_p $object_id [ad_conn user_id]]} {
if { $asmid == -1 } {
- set join "#dotlrn.join_link#"
+ if {[dotlrn_community::member_pending_p -community_id $object_id -user_id [ad_conn user_id]]} {
+ set join "\[ \#dotlrn.Pending_Approval\# \]"
+ } elseif {![dotlrn_community::not_closed_p -community_id $object_id]} {
+ set join ""
+ } elseif {[dotlrn_community::needs_approval_p -community_id $object_id]} {
+ set label "Request Membership"
+ set join "\#dotlrn-catalog.request_membership_link\#"
+ } else {
+ set join "#dotlrn.join_link#"
+ }
}
} else {
- set join "[_ dotlrn-catalog.member_p]"
+ set join "\[[_ dotlrn-catalog.member_p] \]"
}
}
@@ -155,13 +163,21 @@
db_multirow -extend {join} com_list get_dotlrn_communities {} {
- set join ""
if {![dotlrn_community::member_p $object_id [ad_conn user_id]]} {
if { $asmid == -1 } {
- set join "#dotlrn.join_link#"
+ if {[dotlrn_community::member_pending_p -community_id $object_id -user_id [ad_conn user_id]]} {
+ set join "\[ \#dotlrn.Pending_Approval\# \]"
+ } elseif {![dotlrn_community::not_closed_p -community_id $object_id]} {
+ set join ""
+ } elseif {[dotlrn_community::needs_approval_p -community_id $object_id]} {
+ set label "Request Membership"
+ set join "\#dotlrn-catalog.request_membership_link\#"
+ } else {
+ set join "#dotlrn.join_link#"
+ }
}
} else {
- set join "[_ dotlrn-catalog.member_p]"
+ set join "\[[_ dotlrn-catalog.member_p] \]"
}
}