--- loncom/interface/lonsyllabus.pm 2008/01/16 17:13:57 1.63
+++ loncom/interface/lonsyllabus.pm 2008/12/24 07:55:54 1.75
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.63 2008/01/16 17:13:57 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.75 2008/12/24 07:55:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
package Apache::lonsyllabus;
use strict;
+use Apache::lontemplate;
use Apache::Constants qw(:common);
use Apache::loncommon;
use Apache::lonnet;
@@ -110,14 +111,58 @@ sub handler {
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $js;
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ $js .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+function ToCatalog(caller) {
+ numidx = getIndexByName('coursenum');
+ if (numidx > -1) {
+ if (caller != 'details') {
+ document.backtocat.elements[numidx].value = '';
+ }
+ }
+ document.backtocat.submit();
+}
+
+function getIndexByName(item) {
+ for (var i=0;i<document.backtocat.elements.length;i++) {
+ if (document.backtocat.elements[i].name == item) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+</script>
+
+ENDSCRIPT
+ }
my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link,
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
{'function' => $forcestudent,
'domain' => $cdom,
'force_register' =>
$env{'form.register'},});
- $r->print($start_page.'<h1>'.$courseenv{'description'}.'</h1><h3>'.
+ $r->print($start_page);
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:ToCatalog()",
+ text=>"Course Catalog"});
+ if ($env{'form.coursenum'} ne '') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>$r->uri,
+ text=>"Course syllabus"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs());
+ }
+ $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
&Apache::lonnet::domain($cdom,'description').'</h3>');
} else {
$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
@@ -135,36 +180,43 @@ sub handler {
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
} else {
$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
- foreach my $element (sort keys %coursepersonnel) {
+ my @personnel=sort(keys(%coursepersonnel));
+ my $lastpers=$personnel[$#personnel];
+ foreach my $element (@personnel) {
if ($target ne 'tex') {
- $r->print(&Apache::loncommon::start_data_table_row().
- '<td>'.$element.'</td><td>');
+ $r->print(&Apache::lonhtmlcommon::row_title($element));
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
if ($target ne 'tex') {
- $r->print(' '.&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($puname,
- $pudom),$puname,$pudom));
+ my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
+ if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
+ ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
+ $r->print(' '.$courseperson);
+ } else {
+ $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+ $puname,$pudom));
+ }
} else {
$r->print(' '.&Apache::loncommon::plainname($puname,
$pudom).' ');
}
}
if ($target ne 'tex') {
- $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+ my $lastclose=$element eq $lastpers?1:0;
+ $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
} else {
$r->print('\\\\ \hline');
}
}
if ($target ne 'tex') {
- $r->print(&Apache::loncommon::end_data_table());
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
$r->print('\end{tabular}\\\\');
}
@@ -188,16 +240,17 @@ sub handler {
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
if ($allowed) {
- $r->print('<p>'.
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ $r->print('<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><p>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
- .' <tt>http://'.
+ .' <tt>'.$protocol.'://'.
&Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
&Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
- '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>'.
- '<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>');
+ '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
} elsif ($privileged) {
if ($target ne 'tex') {
$r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
@@ -220,7 +273,7 @@ sub handler {
# get rid of leading and trailing spaces
$url=~s/^\s+//;
$url=~s/\s+$//;
- if ($url=~m|^http://([^/]+)/(.+)$|) {
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
my $host = $1;
my $remainder=$2;
# remove the hostname from internal URLs
@@ -233,7 +286,7 @@ sub handler {
}
}
# norm internal URLs
- unless ($url=~/^http\:/) {
+ unless ($url=~/^https?\:/) {
$url=&Apache::lonnet::clutter($url);
}
# re-assemble field
@@ -276,7 +329,9 @@ sub handler {
'<input type="hidden" name="forceedit" value="edit" />');
}
my @htmlids=();
- foreach my $field (sort(keys(%syllabusfields))) {
+ &Apache::lontemplate::start_columnSection($r);
+ &Apache::lontemplate::start_ContentBox($r, $allowed);
+ foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}=~/\w/) || ($allowed)) {
my $message=$syllabus{$field};
if ($field eq 'lll_includeurl') { # this is the "included" field
@@ -302,22 +357,22 @@ sub handler {
}
if ($allowed) {
$r->print('<h3>'.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
- '<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>');
+ &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
} else {
$r->print($message);
}
} else {
&Apache::lonfeedback::newline_to_br(\$message);
- $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|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);
if ($target ne 'tex') {
- $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
- $message.'</blockquote>');
+ if($allowed){
+ $r->print('<p>');
+ }
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -325,12 +380,19 @@ sub handler {
push(@htmlids,$field);
}
if ($allowed) {
- $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
- &HTML::Entities::encode($syllabus{$field},'"&<>').
- '</textarea> <input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+ if($target ne 'tex'){
+ $r->print('</p>');
+ }
+ &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
}
}
}
+ if ($allowed) {
+ $r->print('<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>');
+ }
+ &Apache::lontemplate::end_ContentBox($r);
+ &Apache::lontemplate::end_columnSection($r);
if ($allowed) {
$r->print('</form>'.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
@@ -342,6 +404,11 @@ sub handler {
if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ $r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
+ &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
+ '</form>');
+ }
$r->print(&Apache::loncommon::end_page());
} else {
$r->print('\end{document}');