--- loncom/interface/lonsyllabus.pm 2004/06/03 14:28:39 1.33
+++ 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.33 2004/06/03 14:28:39 www Exp $
+# $Id: lonsyllabus.pm,v 1.46 2006/03/06 23:02:22 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@ use Apache::lonfeedback;
use Apache::lonannounce;
use Apache::lonlocal;
use Apache::lonhtmlcommon;
+use Apache::lonspeller();
sub handler {
my $r = shift;
@@ -44,24 +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('<html><body>'.&mt('No syllabus available').'</body></html>');
+ 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'};
+ my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
if ($target ne 'tex') {
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDDOCUMENT);
-<html>
+$html
<head>
<title>The LearningOnline Network with CAPA</title>
+<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$feedurl" />
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('</head><body>'.&mt('No syllabus available').'</body></html>');
- 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,29 +105,17 @@ 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::lonhtmlcommon::htmlareaheaders().
'</head>'.&Apache::loncommon::bodytag
- ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
+ ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'}));
$r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
$Apache::lonnet::domaindescription{$cdom}.'</h3>');
} else {
@@ -109,22 +123,29 @@ ENDDOCUMENT
$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('<table border="2">');
} 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('<tr><td>'.$_.'</td><td>');
+ $r->print('<tr><td>'.$element.'</td><td>');
} 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(
@@ -153,10 +174,10 @@ 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';
@@ -179,9 +200,9 @@ ENDDOCUMENT
&mt('Edit').'</font></a>');
}
}
- 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=~s/^\s+//s;
@@ -216,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);
}
@@ -262,7 +283,11 @@ ENDDOCUMENT
# embed as an image
$output='<img src="'.$filelink.'" />';
}
- $message.='<p>'.$output.'</p>';
+ if ($target ne 'tex') {
+ $message.='<p>'.$output.'</p>';
+ } else {
+ $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+ }
}
if ($allowed) {
$r->print('<h3>'.$syllabusfields{$_}.
@@ -273,9 +298,12 @@ ENDDOCUMENT
$r->print($message);
}
} else {
- $message=~s/\n/\<br \/\>/g;
+ &Apache::lonfeedback::newline_to_br(\$message);
$message
=~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+ if ($allowed) {
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
$message=&Apache::lontexconvert::msgtexconverted($message);
if ($target ne 'tex') {
$r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
@@ -300,7 +328,9 @@ ENDDOCUMENT
}
if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- $r->print('<p>No syllabus information provided.</p>');
+ if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
+ $r->print('No syllabus information provided.');
+ if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {$r->print('</body></html>');} else {$r->print('\end{document}');}
return OK;