[LON-CAPA-cvs] cvs: loncom /interface courseprefs.pm loncommon.pm loncourserespicker.pm lonparmset.pm slotrequest.pm
raeburn
raeburn at source.lon-capa.org
Tue May 21 14:54:16 EDT 2013
raeburn Tue May 21 18:54:16 2013 EDT
Modified files:
/loncom/interface courseprefs.pm loncommon.pm loncourserespicker.pm
lonparmset.pm slotrequest.pm
Log:
- Wording Change.
- Top level of main content area now called: 'Main Content' in place of
'Main Course Documents', for consistency with tab names.
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.57 loncom/interface/courseprefs.pm:1.58
--- loncom/interface/courseprefs.pm:1.57 Sun May 12 02:46:32 2013
+++ loncom/interface/courseprefs.pm Tue May 21 18:54:15 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.57 2013/05/12 02:46:32 raeburn Exp $
+# $Id: courseprefs.pm,v 1.58 2013/05/21 18:54:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2484,7 +2484,7 @@
'<th>'.&mt('Attribute/Setting').'</th>'.
&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row().
- '<td> '.$icon.' '.&mt('Main Course Documents').'</td>');
+ '<td> '.$icon.' '.&mt('Main Content').'</td>');
&releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
$r->print(&Apache::loncommon::end_data_table_row());
my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1128 loncom/interface/loncommon.pm:1.1129
--- loncom/interface/loncommon.pm:1.1128 Fri May 10 21:37:54 2013
+++ loncom/interface/loncommon.pm Tue May 21 18:54:15 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1128 2013/05/10 21:37:54 raeburn Exp $
+# $Id: loncommon.pm,v 1.1129 2013/05/21 18:54:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -11826,7 +11826,7 @@
my @pcs = split(/,/,$pcslist);
foreach my $pc (@pcs) {
if ($pc == 1) {
- push(@pathitems,&mt('Main Course Documents'));
+ push(@pathitems,&mt('Main Content'));
} else {
my $res = $navmap->getByMapPc($pc);
if (ref($res)) {
@@ -11841,7 +11841,7 @@
}
if ($showitem) {
if ($mapres->{ID} eq '0.0') {
- push(@pathitems,&mt('Main Course Documents'));
+ push(@pathitems,&mt('Main Content'));
} else {
my $maptitle = $mapres->compTitle();
$maptitle =~ s/\W+/_/g;
@@ -14402,7 +14402,7 @@
$path =~ s/^\&//;
my $maptitle = $mapresobj->title();
if ($mapurl eq 'default') {
- $maptitle = 'Main Course Documents';
+ $maptitle = 'Main Content';
}
$path .= (($path ne '')? '&' : '').
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
@@ -14416,14 +14416,14 @@
my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $ispage = (($type eq 'page')? 1 : '');
if ($mapurl eq 'default') {
- $maptitle = 'Main Course Documents';
+ $maptitle = 'Main Content';
}
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
}
unless ($mapurl eq 'default') {
$path = 'default&'.
- &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+ &Apache::lonhtmlcommon::entity_encode('Main Content').
':::::&'.$path;
}
return $path;
Index: loncom/interface/loncourserespicker.pm
diff -u loncom/interface/loncourserespicker.pm:1.5 loncom/interface/loncourserespicker.pm:1.6
--- loncom/interface/loncourserespicker.pm:1.5 Tue Jan 15 17:39:58 2013
+++ loncom/interface/loncourserespicker.pm Tue May 21 18:54:15 2013
@@ -1,6 +1,6 @@
# The LearningOnline Network
#
-# $Id: loncourserespicker.pm,v 1.5 2013/01/15 17:39:58 raeburn Exp $
+# $Id: loncourserespicker.pm,v 1.6 2013/05/21 18:54:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,8 +50,8 @@
=head1 OVERVIEW
The main subroutine: &create_picker() will display the hierarchy of folders,
-sub-folders, and resources in the Main Course Documents area. Items can be
-selected using checkboxes, and/or a "Check All" button. Selection of a folder
+sub-folders, and resources in the Main Content area. Items can be selected
+using checkboxes, and/or a "Check All" button. Selection of a folder
causes the contents of the folder to also be selected automatically. The
propagation of check status is recursive into sub-folders. Likewise, if an
item deep in a nested set of folders and sub-folders is unchecked, the
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.531 loncom/interface/lonparmset.pm:1.532
--- loncom/interface/lonparmset.pm:1.531 Mon Apr 8 23:21:15 2013
+++ loncom/interface/lonparmset.pm Tue May 21 18:54:15 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.531 2013/04/08 23:21:15 raeburn Exp $
+# $Id: lonparmset.pm,v 1.532 2013/05/21 18:54:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1263,7 +1263,7 @@
$$mapp{$mapid}=$$mapp{$id};
$$allmaps{$mapid}=$$mapp{$id};
if ($mapid eq '1') {
- $$maptitles{$mapid}=&mt('Main Course Documents');
+ $$maptitles{$mapid}=&mt('Main Content');
} else {
$$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
}
@@ -1796,7 +1796,7 @@
.&Apache::loncommon::end_data_table_row()
);
- # Display row: "Main Course Documents"
+ # Display row: "Main Content"
if (exists($$allmaps{1})) {
$r->print(
&Apache::loncommon::start_data_table_row()
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.117 loncom/interface/slotrequest.pm:1.118
--- loncom/interface/slotrequest.pm:1.117 Wed Jan 23 17:48:37 2013
+++ loncom/interface/slotrequest.pm Tue May 21 18:54:15 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.117 2013/01/23 17:48:37 bisitz Exp $
+# $Id: slotrequest.pm,v 1.118 2013/05/21 18:54:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2050,7 +2050,7 @@
$maptitle = $maptitles->{$mapurl};
} else {
if ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) {
- $maptitle=&mt('Main Course Documents');
+ $maptitle=&mt('Main Content');
} else {
$maptitle=&Apache::lonnet::gettitle($mapurl);
}
More information about the LON-CAPA-cvs
mailing list