--- loncom/interface/lonsyllabus.pm 2004/01/15 04:46:36 1.26
+++ loncom/interface/lonsyllabus.pm 2005/02/17 08:29:43 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.26 2004/01/15 04:46:36 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.39 2005/02/17 08:29:43 albertel 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;
@@ -44,11 +46,17 @@ sub handler {
return OK if $r->header_only;
# ------------------------------------------------------------ Print the screen
- $r->print(<<ENDDOCUMENT);
-<html>
+ my $target=$ENV{'form.grade_target'};
+ if ($target ne 'tex') {
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print(<<ENDDOCUMENT);
+$html
<head>
<title>The LearningOnline Network with CAPA</title>
ENDDOCUMENT
+ } else {
+ $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);
@@ -76,7 +84,7 @@ ENDDOCUMENT
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forcestudent','register']);
+ ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
# ----------------------------------------------------- Force menu registration
my $addentries='';
if ($ENV{'form.register'}) {
@@ -87,33 +95,69 @@ ENDDOCUMENT
# --------------------------------------------------------------- Force Student
my $forcestudent='';
if ($ENV{'form.forcestudent'}) { $forcestudent='student'; };
+ my $forceedit='';
+ if ($ENV{'form.forceedit'}) { $forceedit='edit'; }
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
- $r->print('</head>'.&Apache::loncommon::bodytag
- ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
- $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
- $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::htmlareaheaders().
+ '</head>'.&Apache::loncommon::bodytag
+ ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
+ $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
+ $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+ } else {
+ $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
+ $Apache::lonnet::domaindescription{$cdom}.'}\\\\');
+ }
# -------------------------------------------------------------- Announcements?
- $r->print(&Apache::lonannounce::showday(time,2,
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum)));
+ } 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);
- $r->print('<table border="2">');
- foreach (sort keys %coursepersonnel) {
- $r->print('<tr><td>'.$_.'</td><td>');
- foreach (split(/\,/,$coursepersonnel{$_})) {
+ if ($target ne 'tex') {
+ $r->print('<table border="2">');
+ } else {
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ }
+ foreach my $element (sort keys %coursepersonnel) {
+ if ($target ne 'tex') {
+ $r->print('<tr><td>'.$element.'</td><td>');
+ } else {
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+ }
+ foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
- $r->print(' '.&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($puname,
- $pudom),$puname,$pudom));
+ if ($target ne 'tex') {
+ $r->print(' '.&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($puname,
+ $pudom),$puname,$pudom));
+ } else {
+ $r->print(' '.&Apache::loncommon::plainname($puname,
+ $pudom).' ');
+ }
}
- $r->print('</td></tr>');
+ if ($target ne 'tex') {
+ $r->print('</td></tr>');
+ } else {
+ $r->print('\\\\ \hline');
+ }
+ }
+ if ($target ne 'tex') {
+ $r->print('</table>');
+ } else {
+ $r->print('\end{tabular}\\\\');
}
- $r->print('</table>');
# ---------------------------------------------------------- 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
@@ -121,7 +165,11 @@ ENDDOCUMENT
# does this user have privileges to post, etc?
if ($ENV{'request.course.id'}) {
$allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
- if ($forcestudent) { $allowed=0; }
+ $privileged=$allowed;
+ if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
+ $forcestudent='student';
+ }
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
if ($allowed) {
$r->print('<p>'.
@@ -129,15 +177,24 @@ ENDDOCUMENT
.' <tt>http://'.
$Apache::lonnet::hostname{$homeserver}.$r->uri.'</tt>'.
&Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
- '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'.
+ '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
+&mt('Show Public View').'</font></a>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
'</p>');
+ } elsif ($privileged) {
+ if ($target ne 'tex') {
+ $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
+ &mt('Edit').'</font></a>');
+ }
}
if (($allowed) && ($ENV{'form.storesyl'})) {
foreach (keys %syllabusfields) {
my $field=$ENV{'form.'.$_};
+ chomp($field);
$field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
$syllabus{$_}=$field;
if ($_ eq 'lll_includeurl') { # clean up included URLs
my $field='';
@@ -181,14 +238,22 @@ ENDDOCUMENT
&Apache::loncommon::plainname($syllabus{'uploaded.name'},
$syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
$syllabus{'uploaded.domain'});
- $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
- $lastmod.'</td><td>'.&mt('by').' '.$who.
- '</td></tr></table><p>');
+ if ($target ne 'tex') {
+ $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
+ $lastmod.'</td><td>'.&mt('by').' '.$who.
+ '</td></tr></table><p>');
+ } else {
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'}).'\\\\');
+ }
if ($allowed) {
- $r->print('<form method="post">');
+ $r->print('<form method="post">'.
+ '<input type="hidden" name="forceedit" value="edit" />');
}
+ 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;
@@ -205,12 +270,16 @@ 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{$_}.
&Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
- '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'.
+ '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
} else {
$r->print($message);
@@ -219,25 +288,38 @@ ENDDOCUMENT
$message=~s/\n/\<br \/\>/g;
$message
=~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+ if ($allowed) {
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
$message=&Apache::lontexconvert::msgtexconverted($message);
- $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
- $message.'</blockquote>');
+ if ($target ne 'tex') {
+ $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
+ $message.'</blockquote>');
+ } else {
+ $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
+ &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
+ }
+ push @htmlids,$_;
}
if ($allowed) {
- $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
+ $r->print(
+ '<br /><textarea cols="80" rows="12" name="'.$_.'" id="'.$_.'">'.
$syllabus{$_}.
- '</textarea><input type="submit" name="storesyl" value="Store" />');
+ '</textarea> <input type="submit" name="storesyl" value="Store" />');
}
}
}
if ($allowed) {
- $r->print('</form>');
+ $r->print('</form>'.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
}
- $r->print('</p>');
+ 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>');}
}
- $r->print('</body></html>');
+ if ($target ne 'tex') {$r->print('</body></html>');} else {$r->print('\end{document}');}
return OK;
}