[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonmenu.pm
raeburn
raeburn@source.lon-capa.org
Sun, 23 May 2010 20:46:52 -0000
raeburn Sun May 23 20:46:52 2010 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonmenu.pm
Log:
- Remove surplus line after changes in 1.244.2.12.
- Consistent wording.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.244.2.15 loncom/interface/lonmenu.pm:1.244.2.16
--- loncom/interface/lonmenu.pm:1.244.2.15 Sun May 23 19:16:02 2010
+++ loncom/interface/lonmenu.pm Sun May 23 20:46:51 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.244.2.15 2010/05/23 19:16:02 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.16 2010/05/23 20:46:51 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -174,7 +174,6 @@
'login' => 'Log In',
'launch' => 'Launch Remote Control',
'groups' => 'Groups',
- 'gdoc' => 'Community Documents',
);
if (&Apache::loncommon::course_type() eq 'Community') {
$lt{'nav'} = &mt('Community Contents');
@@ -247,12 +246,9 @@
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
ENDRELOAD
}
- my $is_community =
- (&Apache::loncommon::course_type() eq 'Community');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$text</a>
+<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
ENDDOCS
}
if ($showgroups) {
@@ -317,12 +313,9 @@
$navmaps=(<<ENDNAV);
<td><a href="$link" target="_top">$lt{'nav'}</a></td>
ENDNAV
- my $is_community =
- (&Apache::loncommon::course_type() eq 'Community');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<<ENDDOCS);
-<td><a href="/adm/coursedocs" target="_top">$text</a></td>
+<td><a href="/adm/coursedocs" target="_top">$lt{'docs'}</a></td>
ENDDOCS
}
if ($showgroups) {
@@ -1255,7 +1248,6 @@
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
$prt=~s/\$uname/$uname/g;
$prt=~s/\$udom/$udom/g;
- $prt=~s/\$crs/$crs/g;
if ($prt =~ /\$crs/) {
next unless ($env{'request.course.id'});
next if ($crstype eq 'Community');