--- loncom/interface/lonsyllabus.pm 2007/07/27 00:17:17 1.60
+++ loncom/interface/lonsyllabus.pm 2008/12/17 00:44:53 1.74
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.60 2007/07/27 00:17:17 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.74 2008/12/17 00:44:53 ehlerst 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,15 +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";
+
+
+
+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.''.$courseenv{'description'}.'
'.
+ $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(''.$courseenv{'description'}.'
'.
&Apache::lonnet::domain($cdom,'description').'
');
} else {
$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
@@ -136,35 +180,43 @@ sub handler {
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
- $r->print('
');
+ $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('| '.$element.' | ');
+ $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(' |
');
+ my $lastclose=$element eq $lastpers?1:0;
+ $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
} else {
$r->print('\\\\ \hline');
}
}
if ($target ne 'tex') {
- $r->print('
');
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
$r->print('\end{tabular}\\\\');
}
@@ -188,16 +240,15 @@ sub handler {
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
if ($allowed) {
- $r->print(''.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('This syllabus can be publicly viewed at')
+ $r->print('
'.
+&mt('Show Public View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
+ '
'.
+&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('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').'
'.
- ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'.
- ''.
-&mt('Show Public View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
- '
');
+ ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
');
} elsif ($privileged) {
if ($target ne 'tex') {
$r->print(''.
@@ -260,19 +311,25 @@ sub handler {
$syllabus{'uploaded.domain'});
if ($target ne 'tex') {
$r->print('| '.&mt('Last updated').': | '.
- $lastmod.' | '.&mt('by').' '.$who.
+ $lastmod.' | '.
+ ($who ? &mt('by').' '.$who
+ : '' ).
' |
');
} else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}).'\\\\');
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
}
if ($allowed) {
$r->print('
'.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
@@ -334,10 +398,15 @@ sub handler {
if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');}
} else {
if ($target ne 'tex') {$r->print('');} else {$r->print('\par ');}
- $r->print('No syllabus information provided.');
+ $r->print(&mt('No syllabus information provided.'));
if ($target ne 'tex') {$r->print('
');}
}
if ($target ne 'tex') {
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ $r->print('');
+ }
$r->print(&Apache::loncommon::end_page());
} else {
$r->print('\end{document}');