--- loncom/interface/lonsyllabus.pm 2010/03/03 21:33:15 1.107 +++ loncom/interface/lonsyllabus.pm 2012/12/06 21:43:27 1.115 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.107 2010/03/03 21:33:15 droeschl Exp $ +# $Id: lonsyllabus.pm,v 1.115 2012/12/06 21:43:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,8 @@ sub handler { my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']); + ($ENV{'QUERY_STRING'},['register','forceedit', + 'folderpath','title']); # ----------------------------------------------------- Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { @@ -61,6 +62,12 @@ sub handler { &Apache::loncommon::simple_error_page($r,'No syllabus available', 'No syllabus available'); return OK; + } elsif (!&Apache::lonnet::is_course($cdom,$cnum)) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::loncommon::simple_error_page($r,'No syllabus available', + 'The course/community for which the syllabus was requested does not exist.'); + return OK; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); @@ -97,11 +104,11 @@ sub handler { 'kkk_textbook' => 'Textbook', 'lll_includeurl' => 'URLs To Include in Syllabus'); # --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } - + my ($forceedit,$forcestudent); + if ($env{'form.forceedit'}) { $forceedit=1; } + if (!$forceedit) { + $forcestudent=1; + } # ----------------------------------------------------------------- Make header if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); @@ -133,34 +140,47 @@ function getIndexByName(item) { ENDSCRIPT } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => undef, - 'domain' => $cdom, - 'force_register' => - $env{'form.register'},}); - - $r->print($start_page); + my $args = {'function' => undef, + 'domain' => $cdom}; + my $forcereg; + if ($env{'form.register'}) { + $forcereg = 1; + $args->{'force_register'} = $forcereg; + } if ($env{'form.backto'} eq 'coursecatalog') { &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog()", - text=>"Course/Community Catalog"}); + my $brcrum = [{href=>"javascript:ToCatalog();", + text=>&mt('Course/Community Catalog'), + no_mt=>1} + ]; if ($env{'form.coursenum'} ne '') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog('details')", - text=>"Course details"}); + push(@{$brcrum}, + {href=>"javascript:ToCatalog('details')", + text=>"Course details"}); + } + push(@{$brcrum}, + {href=>$r->uri, + text=>"Course syllabus"}); + $args->{'bread_crumbs'} = $brcrum; + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Syllabus'); + } + my $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>$r->uri, - text=>"Course syllabus"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs()); } + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); + $r->print($start_page); } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; - my $privileged=0; # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call @@ -170,13 +190,9 @@ ENDSCRIPT && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); - $privileged=$allowed; - if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; - } if ($forcestudent or $target eq 'tex') { $allowed=0; } } - #store what the user typed in +#store what the user typed in if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -225,85 +241,72 @@ ENDSCRIPT } } -#--------Functions - if( ($allowed || $privileged) && $target ne 'tex') { - my $functions=&Apache::lonhtmlcommon::start_funclist(); - if ($allowed) { - #if you have the register flag, keep it - if($env{'form.register'} == 1) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_PublicView')); - } else { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_PublicView')); - } - } elsif ($privileged) { - if($env{'form.register'} == 1) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Edit').''); - } else { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Edit').''); - } + if ($allowed) { +#---------------------------------- Print External URL Syllabus Info if editing + if ($target ne 'tex') { + my $protocol = $Apache::lonnet::protocol{$homeserver}; + $protocol = 'http' if ($protocol ne 'https'); + $r->print('
' + .&mt('This syllabus can be publicly viewed at [_1]' + ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') + .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') + .'
' + .'' + .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' + ,'','') + .'
' + .'' - .&mt('This syllabus can be publicly viewed at [_1]' - ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') - .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') - .'
' - .'' - .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' - ,'','') - .'
' - ); - #-Print Help Text - $r->print(&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_TextBoxes', - &mt('Help with filling in text boxes'))); - } - -#----------Print last update - my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - my $who = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}); - if ($target ne 'tex') { - $r->print('');} else {$r->print('\par ');} + if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('
');} } if ($target ne 'tex') { + $r->print('