--- loncom/interface/lonsyllabus.pm 2008/07/11 14:55:21 1.64
+++ loncom/interface/lonsyllabus.pm 2009/02/19 17:32:39 1.77
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.64 2008/07/11 14:55:21 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.77 2009/02/19 17:32:39 neumanie 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";
+
+
+
+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{'.
@@ -135,14 +180,15 @@ 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().
- ''.$element.' | ');
+ $r->print(&Apache::lonhtmlcommon::row_title($element));
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
@@ -154,8 +200,8 @@ sub handler {
($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
$r->print(' '.$courseperson);
} else {
- $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson),
- $puname,$pudom);
+ $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+ $puname,$pudom));
}
} else {
$r->print(' '.&Apache::loncommon::plainname($puname,
@@ -163,13 +209,14 @@ sub handler {
}
}
if ($target ne 'tex') {
- $r->print(' | '.&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}\\\\');
}
@@ -193,22 +240,14 @@ sub handler {
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
if ($allowed) {
- $r->print('
'.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at')
- .' http://'.
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ $r->print('
'.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at')
+ .' '.$protocol.'://'.
&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').
- '
');
- } elsif ($privileged) {
- if ($target ne 'tex') {
- $r->print(''.
- &mt('Edit').'');
- }
- }
+ '
'.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
');
+ }
if (($allowed) && ($env{'form.storesyl'})) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
@@ -225,7 +264,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
@@ -238,7 +277,7 @@ sub handler {
}
}
# norm internal URLs
- unless ($url=~/^http\:/) {
+ unless ($url=~/^https?\:/) {
$url=&Apache::lonnet::clutter($url);
}
# re-assemble field
@@ -276,12 +315,25 @@ sub handler {
:'')
.'\\\\');
}
+
+ if ($target ne 'tex') {
+ &Apache::lontemplate::print_start_page_functions($r);
+ if($allowed){
+ &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
+ }elsif($privileged){
+ &Apache::lontemplate::print_functions_content($r,''.&mt('Edit').'');
+ }
+ &Apache::lontemplate::print_end_page_functions($r);
+ }
+
if ($allowed) {
$r->print(''.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
@@ -347,6 +401,11 @@ sub handler {
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}');