--- loncom/interface/lonsyllabus.pm 2003/05/10 23:01:56 1.18 +++ loncom/interface/lonsyllabus.pm 2004/01/15 04:46:36 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.18 2003/05/10 23:01:56 www Exp $ +# $Id: lonsyllabus.pm,v 1.26 2004/01/15 04:46:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,10 +34,12 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; +use Apache::lonannounce; +use Apache::lonlocal; sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -51,11 +53,11 @@ ENDDOCUMENT # Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { - $r->print('No syllabus available'); + $r->print(''.&mt('No syllabus available').''); return OK; } # --------------------------------------------------------- The syllabus fields - my %syllabusfields=( + my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_instructorinfo' => 'Instructor Information', 'bbb_description' => 'Course Description', 'ccc_prereq' => 'Prerequisites', @@ -92,7 +94,9 @@ ENDDOCUMENT ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); $r->print('

'.$courseenv{'description'}.'

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

'); - +# -------------------------------------------------------------- Announcements? + $r->print(&Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); $r->print(''); @@ -116,15 +120,16 @@ ENDDOCUMENT if ($ENV{'user.environment'}) { # does this user have privileges to post, etc? if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); if ($forcestudent) { $allowed=0; } } if ($allowed) { $r->print('

'. -&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

This syllabus can be publicly viewed at http://'. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

'.&mt('This syllabus can be publicly viewed at') + .' http://'. $Apache::lonnet::hostname{$homeserver}.$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'

'. - '

Show Student View'. + '

Show Public View'. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). '

'); } @@ -171,16 +176,14 @@ ENDDOCUMENT # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?localtime($lastmod):'never'); - - $r->print('
Uploaded:'. - &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $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'}). - '
Last updated:'. - $lastmod. - '

'); + $syllabus{'uploaded.domain'}); + $r->print('
'.&mt('Last updated').':'. + $lastmod.''.&mt('by').' '.$who. + '

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

'); } @@ -207,7 +210,7 @@ ENDDOCUMENT if ($allowed) { $r->print('

'.$syllabusfields{$_}. &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'. - '

Show Student View'. + '

Show Public View'. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } else { $r->print($message); @@ -215,7 +218,7 @@ ENDDOCUMENT } else { $message=~s/\n/\
/g; $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; $message=&Apache::lontexconvert::msgtexconverted($message); $r->print('

'.$syllabusfields{$_}.'

'. $message.'
');