--- loncom/xml/londefdef.pm 2013/01/04 05:30:52 1.442 +++ loncom/xml/londefdef.pm 2013/05/05 00:10:16 1.443 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.442 2013/01/04 05:30:52 raeburn Exp $ +# $Id: londefdef.pm,v 1.443 2013/05/05 00:10:16 raeburn Exp $ # # # Copyright Michigan State University Board of Trustees @@ -633,25 +633,35 @@ sub edit_controls { if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); if ($url =~ /\.html?$/i) { + my ($cdom,$cnum); if ($env{'request.course.id'}) { + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) { if (&Apache::lonnet::is_course_upload($env{'request.filename'}, - $env{'course.'.$env{'request.course.id'}.'.num'}, - $env{'course.'.$env{'request.course.id'}.'.domain'})) { + $cnum,$cdom)) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folderpath','title']); } } } - my ($symb,$itemtitle,$displayfile) = - &Apache::lonxml::get_courseupload_hierarchy($url, - $env{'form.folderpath'}, - $env{'form.title'}); - if (($symb ne '') || ($env{'httpref.'.$url} ne '')) { + my ($symb,$itemtitle,$displayfile,$caller); + if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) { + $itemtitle = &mt('Syllabus'); + $caller = "/public/$cdom/$cnum/syllabus"; + } else { + $caller = $url; + ($symb,$itemtitle,$displayfile) = + &Apache::lonxml::get_courseupload_hierarchy($url, + $env{'form.folderpath'}, + $env{'form.title'}); + } + if (($symb ne '') || ($env{'httpref.'.$url} ne '') || + ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) { $result .= (' ' x 3). &Apache::lonhtmlcommon::dependencies_button()."\n". &Apache::lonhtmlcommon::dependencycheck_js($symb, - $itemtitle,$url,$env{'form.folderpath'},$url)."\n"; + $itemtitle,$url,$env{'form.folderpath'},$caller)."\n"; } } }