--- loncom/xml/londefdef.pm 2012/04/16 19:46:14 1.439 +++ loncom/xml/londefdef.pm 2013/06/04 22:20:20 1.444 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.439 2012/04/16 19:46:14 raeburn Exp $ +# $Id: londefdef.pm,v 1.444 2013/06/04 22:20:20 raeburn Exp $ # # # Copyright Michigan State University Board of Trustees @@ -572,7 +572,7 @@ sub start_body { if ($env{'request.state'} eq 'construct') { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); &Apache::lonhtmlcommon::add_breadcrumb({ - 'text' => 'Construction Space', + 'text' => 'Authoring Space', 'href' => &Apache::loncommon::authorspace($url), }); &Apache::lonhtmlcommon::add_breadcrumb({ @@ -599,7 +599,7 @@ sub start_body { $header=&Apache::lonmenu::constspaceform(); } if ($env{'request.state'} ne 'published') { - $header.=&Apache::londefdef::edit_controls(); + $header.=&edit_controls(); } if ($env{'request.state'} eq 'construct') { $currentstring.=&Apache::loncommon::head_subbox( @@ -633,20 +633,37 @@ sub edit_controls { if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); if ($url =~ /\.html?$/i) { - my ($symb,$itemtitle,$displayfile) = - &Apache::lonxml::get_courseupload_hierarchy($url); - if ($symb ne '') { + 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'}, + $cnum,$cdom)) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['folderpath','title']); + } + } + } + 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)."\n"; + &Apache::lonhtmlcommon::dependencycheck_js($symb, + $itemtitle,$url,$env{'form.folderpath'},$caller)."\n"; } } - my $viewtext = &mt('Course View'); - if (&Apache::loncommon::course_type() eq 'Community') { - $viewtext = &mt('Community View'); - } - $result .= (' ' x 3).''; } $result .= ' @@ -4476,7 +4493,7 @@ sub latex_header { "\\usepackage{xcolor}\n". '\usepackage{calc}'. '\usepackage{amsmath}'. - '\usepackage{soul}', + '\usepackage{soul}'. '\usepackage{amssymb}'. '\usepackage{amsfonts}'. '\usepackage{amsthm}'.