[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
raeburn
raeburn at source.lon-capa.org
Mon Dec 31 09:54:55 EST 2012
raeburn Mon Dec 31 14:54:55 2012 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonmenu.pm
Log:
- For 2.11
- Backport 1.406
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.31 loncom/interface/lonmenu.pm:1.369.2.32
--- loncom/interface/lonmenu.pm:1.369.2.31 Fri Dec 28 17:26:15 2012
+++ loncom/interface/lonmenu.pm Mon Dec 31 14:54:55 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.31 2012/12/28 17:26:15 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.32 2012/12/31 14:54:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1302,6 +1302,13 @@
$forceedit,$forceview,$forcereg,
$env{'form.title'},$env{'form.suppurl'});
}
+ } elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
+ (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
+ ($cfile,$home,$switchserver,$forceedit,$forceview) =
+ &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
+ $env{'form.symb'});
+ $editbutton = &get_editbutton($cfile,$home,$switchserver,
+ $forceedit,$forceview,$forcereg);
} elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
($resurl ne '/cgi-bin/printout.pl')) {
if ($env{'request.filename'}) {
@@ -1357,14 +1364,6 @@
'Add records');
}
}
- } elsif ($resurl =~ m{^/?adm/viewclasslist}) {
-# This applies to viewclasslist page for users in a course
- if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
- &switch('','',6,4,'pparm.png','Settings',
- '',
- "go('/adm/courseprefs?actions=classlists&phase=display')",
- 'Student-viewable classlist options');
- }
}
if (($env{'form.folderpath'} =~ /^supplemental/) &&
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
@@ -1418,7 +1417,7 @@
'advtools', @funcs[61,71,72,73,74,92]);
} elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
&Apache::lonhtmlcommon::add_breadcrumb_tool(
- 'advtools', @funcs[64]);
+ 'advtools', @funcs[61]);
}
}
More information about the LON-CAPA-cvs
mailing list