--- loncom/interface/lonsyllabus.pm 2004/05/03 17:36:47 1.28 +++ loncom/interface/lonsyllabus.pm 2006/03/06 23:02:22 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.28 2004/05/03 17:36:47 sakharuk Exp $ +# $Id: lonsyllabus.pm,v 1.46 2006/03/06 23:02:22 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,8 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonannounce; use Apache::lonlocal; +use Apache::lonhtmlcommon; +use Apache::lonspeller(); sub handler { my $r = shift; @@ -43,25 +45,49 @@ sub handler { $r->send_http_header; return OK if $r->header_only; + my $target=$env{'form.grade_target'}; +# --------------------------------------------------- Get course info from URL + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); +# ------------------------------------------------------------ Get query string + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','headermode']); +# ----------------------------------------------------- Is this even a course? + my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); + if ($homeserver eq 'no_host') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(''.&mt('No syllabus available').''); + return OK; + } +# ------------------------------------- There is such a course, get environment + my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + # ------------------------------------------------------------ Print the screen - my $target=$ENV{'form.grade_target'}; - &Apache::lonnet::logthis("NOW TARGET IS DEFINIED AS $target"); + my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'; if ($target ne 'tex') { + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA + ENDDOCUMENT } else { - $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); -# Is this even a course? - my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); - if ($homeserver eq 'no_host') { - $r->print(''.&mt('No syllabus available').''); - return OK; +# ----------------------------------------------------- Force menu registration + my $addentries=''; + if ($env{'form.register'}) { + $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). + '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; + $r->print(&Apache::lonmenu::registerurl(1)); } +# -------------------------------------------------- Let's see who handles this + my $externalsyllabus=$courseenv{'course.'.$cdom.'_'.$cnum.'_externalsyllabus'}; + if ($externalsyllabus=~/\w/) { + } + +# ------------------------------ The buck stops here: internal syllabus display # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_instructorinfo' => 'Instructor Information', @@ -79,51 +105,47 @@ ENDDOCUMENT 'jjj_weblinks' => 'Web Links', 'kkk_textbook' => 'Textbook', 'lll_includeurl' => 'URLs To Include in Syllabus'); - -# ------------------------------------------------------------ Get query string - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($ENV{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); - } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; my $forceedit=''; - if ($ENV{'form.forceedit'}) { $forceedit='edit'; } + if ($env{'form.forceedit'}) { $forceedit='edit'; } -# ------------------------------------- There is such a course, get environment - my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); +# ----------------------------------------------------------------- Make header if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); + $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). + ''.&Apache::loncommon::bodytag + ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); $r->print('

'.$courseenv{'description'}.'

'. $Apache::lonnet::domaindescription{$cdom}.'

'); } else { - $r->print('\noindent\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. + $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. $Apache::lonnet::domaindescription{$cdom}.'}\\\\'); } # -------------------------------------------------------------- Announcements? - $r->print(&Apache::lonannounce::showday(time,2, - &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); + if ($target ne 'tex') { + $r->print(&Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)). + &Apache::lonrss::advertisefeeds($cnum,$cdom)); + } else { + $r->print(&Apache::lonxml::xmlparse($r,'tex', + &Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)))); + } # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { $r->print(''); } else { - $r->print('\begin{tabular}{|c|c|}\hline'); + $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } - foreach (sort keys %coursepersonnel) { + foreach my $element (sort keys %coursepersonnel) { if ($target ne 'tex') { - $r->print('
'.$_.''); + $r->print('
'.$element.''); } else { - $r->print(' '.$_.'\\\\ '); + $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } - foreach (split(/\,/,$coursepersonnel{$_})) { + foreach (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$_); if ($target ne 'tex') { $r->print(' '.&Apache::loncommon::aboutmewrapper( @@ -152,15 +174,15 @@ ENDDOCUMENT # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call - if ($ENV{'user.environment'}) { + if ($env{'user.environment'}) { # does this user have privileges to post, etc? - if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + if ($env{'request.course.id'}) { + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { $forcestudent='student'; } - if ($forcestudent) { $allowed=0; } + if ($forcestudent or $target eq 'tex') { $allowed=0; } } if ($allowed) { $r->print('

'. @@ -178,11 +200,14 @@ ENDDOCUMENT &mt('Edit').''); } } - if (($allowed) && ($ENV{'form.storesyl'})) { + if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; + my $field=$env{'form.'.$_}; + chomp($field); $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); + $field=~s/^\s+//s; + $field=~s/\$//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); $syllabus{$_}=$field; if ($_ eq 'lll_includeurl') { # clean up included URLs my $field=''; @@ -212,8 +237,8 @@ ENDDOCUMENT $syllabus{$_}=$field; } } - $syllabus{'uploaded.domain'}=$ENV{'user.domain'}; - $syllabus{'uploaded.name'}=$ENV{'user.name'}; + $syllabus{'uploaded.domain'}=$env{'user.domain'}; + $syllabus{'uploaded.name'}=$env{'user.name'}; $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } @@ -239,8 +264,9 @@ ENDDOCUMENT $r->print('

'. ''); } + my @htmlids=(); foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { + if (($syllabus{$_}=~/\w/) || ($allowed)) { my $message=$syllabus{$_}; if ($_ eq 'lll_includeurl') { # this is the "included" field my $urls=$message; @@ -257,7 +283,11 @@ ENDDOCUMENT # embed as an image $output=''; } - $message.='

'.$output.'

'; + if ($target ne 'tex') { + $message.='

'.$output.'

'; + } else { + $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; + } } if ($allowed) { $r->print('

'.$syllabusfields{$_}. @@ -268,31 +298,39 @@ ENDDOCUMENT $r->print($message); } } else { - $message=~s/\n/\
/g; + &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { $r->print('

'.$syllabusfields{$_}.'

'. $message.'
'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. - &Apache::lonxml::xmlparse($r,' ',$message).'\\\\'); + &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } + push @htmlids,$_; } if ($allowed) { - $r->print('
'); + ' '); } } } if ($allowed) { - $r->print(''); + $r->print(''. + &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} } else { - $r->print('

No syllabus information provided.

'); + if ($target ne 'tex') {$r->print('

');} else {$r->print('\par ');} + $r->print('No syllabus information provided.'); + if ($target ne 'tex') {$r->print('

');} } if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} return OK;