[LON-CAPA-cvs] cvs: loncom /auth rolesplain.tab /interface loncommon.pm loncommunicate.pm lonmsgdisplay.pm lonpickcourse.pm
raeburn
raeburn@source.lon-capa.org
Sat, 25 Jul 2009 23:16:09 -0000
This is a MIME encoded message
--raeburn1248563769
Content-Type: text/plain
raeburn Sat Jul 25 23:16:09 2009 EDT
Modified files:
/loncom/interface loncommon.pm loncommunicate.pm lonmsgdisplay.pm
lonpickcourse.pm
/loncom/auth rolesplain.tab
Log:
- Term used for type of course used to facilitate collaborative activities,
e.g., in a campus organization will be "Community".
--raeburn1248563769
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090725231609.txt"
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.864 loncom/interface/loncommon.pm:1.865
--- loncom/interface/loncommon.pm:1.864 Sat Jul 25 14:44:50 2009
+++ loncom/interface/loncommon.pm Sat Jul 25 23:16:04 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.864 2009/07/25 14:44:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.865 2009/07/25 23:16:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -483,7 +483,7 @@
sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname)=@_;
- my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
+ my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role');
my $output = '
<script type="text/javascript" language="JavaScript">
// <![CDATA[
@@ -532,7 +532,7 @@
if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;
}
- if (crstype == 'Course/Group') {
+ if (crstype == 'Course/Community') {
if (formname == 'cu') {
crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
if (crstype == "") {
@@ -10211,7 +10211,7 @@
my $crstype = &course_type();
my %names = (
'Course' => 'group',
- 'Group' => 'team',
+ 'Community' => 'group',
);
return $names{$crstype};
}
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.45 loncom/interface/loncommunicate.pm:1.46
--- loncom/interface/loncommunicate.pm:1.45 Thu May 7 11:12:47 2009
+++ loncom/interface/loncommunicate.pm Sat Jul 25 23:16:04 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Communicate
#
-# $Id: loncommunicate.pm,v 1.45 2009/05/07 11:12:47 bisitz Exp $
+# $Id: loncommunicate.pm,v 1.46 2009/07/25 23:16:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,7 +42,7 @@
my $usertype = 'student';
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) {
$crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
- if ($crstype eq 'Group') {
+ if ($crstype eq 'Community') {
$usertype = 'member';
}
}
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.127 loncom/interface/lonmsgdisplay.pm:1.128
--- loncom/interface/lonmsgdisplay.pm:1.127 Tue Jun 16 16:49:11 2009
+++ loncom/interface/lonmsgdisplay.pm Sat Jul 25 23:16:04 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.127 2009/06/16 16:49:11 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.128 2009/07/25 23:16:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1886,8 +1886,8 @@
return;
}
my $crstype = &Apache::loncommon::course_type();
- my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
- : 'faculty and staff';
+ my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
+ : 'faculty and staff';
&printheader($r,
'/adm/email?recordftf=query',
"User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
@@ -1973,8 +1973,8 @@
$r->print('Not allowed');
return;
}
- my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
- : 'students';
+ my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
+ : 'students';
my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',
'cbds' => 'Communication blocking during scheduled exams',
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.82 loncom/interface/lonpickcourse.pm:1.83
--- loncom/interface/lonpickcourse.pm:1.82 Thu May 14 09:58:31 2009
+++ loncom/interface/lonpickcourse.pm Sat Jul 25 23:16:04 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.82 2009/05/14 09:58:31 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.83 2009/07/25 23:16:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,7 +54,7 @@
my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
$lastaction,$autosubmit,$submitopener);
- # Get course type - Course or Non-standard Course.
+ # Get course type - Course or Community.
$type = $env{'form.type'};
if (!defined($env{'form.type'})) {
$type = 'Course';
@@ -545,7 +545,7 @@
'</script>'."\n";
}
}
- foreach my $posstype ('Course','Non-standard Course') {
+ foreach my $posstype ('Course','Community') {
$typeselectform.='<option value="'.$posstype.'"'.
($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
}
@@ -753,7 +753,7 @@
total => 'coursetotal',
list => 'courselist',
},
- 'Non-standard Course' => {
+ 'Community' => {
name => 'grouppick',
total => 'grouptotal',
list => 'grouplist',
@@ -870,7 +870,7 @@
Course Domain - the domain of the course
=item *
-Course Type - Course or Non-standard Course
+Course Type - Course or Community
=item *
Course Institutional Code - the institutional identifier assigned to the course
@@ -923,7 +923,7 @@
X<create_user_javascript()>
B<create_user_javascript($type)>:
-Input: 1 - $type - the course type - Course or Non-standard Course
+Input: 1 - $type - the course type - Course or Community
Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags
Index: loncom/auth/rolesplain.tab
diff -u loncom/auth/rolesplain.tab:1.36 loncom/auth/rolesplain.tab:1.37
--- loncom/auth/rolesplain.tab:1.36 Thu May 7 19:36:41 2009
+++ loncom/auth/rolesplain.tab Sat Jul 25 23:16:09 2009
@@ -13,11 +13,11 @@
cm:No Role, Cumulative Privileges
su:Superuser
dc:Domain Coordinator
-cc:Course Coordinator:Group Coordinator
+cc:Course Coordinator:Community Coordinator
in:Instructor:Leader
ta:Teaching Assistant:Assistant Leader
ep:Exam Proctor
-cr:Course Custom Role:Group Custom Role
+cr:Course Custom Role:Community Custom Role
st:Student:Member
ad:Administrator
li:Librarian
@@ -28,11 +28,11 @@
sc:Bubblesheet Scanning Operator
csu:Grant/revoke role of Superuser
cdc:Grant/revoke role of Domain Coordinator
-ccc:Grant/revoke role of Course Coordinator:Grant/revoke role of Group Coordinator
+ccc:Grant/revoke role of Course Coordinator:Grant/revoke role of Community Coordinator
cin:Grant/revoke role of Instructor
cta:Grant/revoke role of Teaching Assistant
cep:Grant/revoke role of Exam Proctor
-ccr:Grant/revoke Course Custom Role:Grant/revoke Group Custom Role
+ccr:Grant/revoke Course Custom Role:Grant/revoke Community Custom Role
cst:Grant/revoke role of Student:Grant/revoke role of Member
cad:Grant/revoke role of Administrator
cli:Grant/revoke role of Librarian
@@ -43,7 +43,7 @@
csc:Grant/revoke role of Bubblesheet Scanning Operator
dro:Delete a role
mky:Manage access keys
-mcr:Create a Course Custom Role:Create a Group Custom Role
+mcr:Create a Course Custom Role:Create a Community Custom Role
mau:Modify authentication mechanism and data for a user
mpq:Modify disk space allocated to portfolio files for a user
mut:Set availability of user tools for a user: Personal Information Page, Blog and Portfolio
--raeburn1248563769--