[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm lonmenu.pm
www
www@source.lon-capa.org
Tue, 18 Jan 2011 22:59:06 -0000
www Tue Jan 18 22:59:06 2011 EDT
Modified files:
/loncom/interface lonhtmlcommon.pm lonmenu.pm
Log:
Fix cycle of "Edit Resource" and going back
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.288 loncom/interface/lonhtmlcommon.pm:1.289
--- loncom/interface/lonhtmlcommon.pm:1.288 Tue Jan 18 19:52:46 2011
+++ loncom/interface/lonhtmlcommon.pm Tue Jan 18 22:59:06 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.288 2011/01/18 19:52:46 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.289 2011/01/18 22:59:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1429,6 +1429,11 @@
#
sub show_return_link {
+
+ unless ($env{'request.course.id'}) { return 0; }
+ if ($env{'request.noversionuri'}=~m{^/priv/} ||
+ $env{'request.uri'}=~m{^/~}) { return 1; }
+
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
|| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.344 loncom/interface/lonmenu.pm:1.345
--- loncom/interface/lonmenu.pm:1.344 Tue Jan 18 19:52:46 2011
+++ loncom/interface/lonmenu.pm Tue Jan 18 22:59:06 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.344 2011/01/18 19:52:46 www Exp $
+# $Id: lonmenu.pm,v 1.345 2011/01/18 22:59:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -530,7 +530,7 @@
}
}
$editbutton=&switch
- ('','',6,1,'pcstr.png','edit[_1]','resource[_2]',
+ ('','',6,1,'pcstr.png','Edit','resource[_2]',
$bot,"Edit this resource");
$noeditbutton = 0;
}
@@ -546,7 +546,7 @@
my $cfile = &edit_course_upload($file,$cnum,$cdom);
if ($cfile) {
$editbutton=&switch
- ('','',6,1,'pcstr.png','edit[_1]',
+ ('','',6,1,'pcstr.png','Edit',
'resource[_2]',"go('".$cfile."');",
'Edit this resource');
}