--- loncom/interface/lonsyllabus.pm 2009/02/13 17:26:55 1.76
+++ loncom/interface/lonsyllabus.pm 2009/05/11 13:34:10 1.89
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.76 2009/02/13 17:26:55 neumanie Exp $
+# $Id: lonsyllabus.pm,v 1.89 2009/05/11 13:34:10 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,20 +69,20 @@ sub handler {
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
- }
+ }
# -------------------------------------------------- Let's see who handles this
my $externalsyllabus=$courseenv{'externalsyllabus'};
if ($externalsyllabus=~/\w/) {
-
+
if ($env{'form.wrapperdisplay'} eq 'menu') {
$r->print(&Apache::lonwrapper::simple_menu());
- } else {
+ } else {
$r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
$externalsyllabus));
}
return OK;
- }
+ }
# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
@@ -107,8 +107,8 @@ sub handler {
if ($env{'form.forcestudent'}) { $forcestudent='student'; };
my $forceedit='';
if ($env{'form.forceedit'}) { $forceedit='edit'; }
-
-# ----------------------------------------------------------------- Make header
+
+# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $js;
@@ -139,7 +139,7 @@ function getIndexByName(item) {
ENDSCRIPT
}
- my $start_page =
+ my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link.$js,
{'function' => $forcestudent,
'domain' => $cdom,
@@ -162,63 +162,7 @@ ENDSCRIPT
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{'.
- &Apache::lonnet::domain($cdom,'description').'}\\\\');
- }
-# -------------------------------------------------------------- Announcements?
- my $day = &Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
- if ($target ne 'tex') {
- $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- } else {
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
- }
-# -------------------------------------------------------- Get course personnel
- my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
- } else {
- $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
- }
- my @personnel=sort(keys(%coursepersonnel));
- my $lastpers=$personnel[$#personnel];
- foreach my $element (@personnel) {
- if ($target ne 'tex') {
- $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') {
- 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') {
- 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::lonhtmlcommon::end_pick_box());
- } else {
- $r->print('\end{tabular}\\\\');
}
# ---------------------------------------------------------- Load syllabus info
my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
@@ -239,24 +183,6 @@ ENDSCRIPT
}
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
- if ($allowed) {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
- $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')
- .' '.$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').'').'
');
- } elsif ($privileged) {
- if ($target ne 'tex') {
- $r->print(''.
- &mt('Edit').'');
- }
- }
if (($allowed) && ($env{'form.storesyl'})) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
@@ -303,20 +229,43 @@ ENDSCRIPT
&Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
}
}
-# ---------------------------------------------------------------- Get syllabus
- if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- my $lastmod=$syllabus{'uploaded.lastmodified'};
+
+#---------------------Print External URL Syllabus Info
+if( ($allowed) && ($target ne 'tex') ) {
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ $r->print('
'
+ .&mt('This syllabus can be publicly viewed at [_1]'
+ ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'')
+ .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
+ .'
'
+ .''
+ .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Parameters[_2].'
+ ,'','')
+ .'
'
+ );
+}
+
+#-Print Help Text
+if ($target ne 'tex') {
+ if ($allowed) {
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
+}
+#----------Print last update
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
$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'});
- if ($target ne 'tex') {
- $r->print(''.&mt('Last updated').': | '.
- $lastmod.' | '.
+ if ($target ne 'tex') {
+ $r->print(' '.&mt('Last updated').': '.
+ $lastmod . ' '.
($who ? &mt('by').' '.$who
- : '' ).
- ' |
');
+ : '' ) .
+ '' );
+
} else {
$r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
($who? &mt('by').'\\\\ '.
@@ -324,13 +273,99 @@ ENDSCRIPT
:'')
.'\\\\');
}
+#--------Functions
+if ($target ne 'tex') {
+ if( $allowed || $privileged) {
+ $r->print(&Apache::lontemplate::start_functionslist());
+ if ($allowed) {
+ $r->print(&Apache::lontemplate::item_functionslist(
+ ''.&mt('Show Public View').''
+ .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
+ } elsif ($privileged) {
+ $r->print(&Apache::lontemplate::item_functionslist(
+ ''.&mt('Edit').''));
+ }
+ $r->print(&Apache::lontemplate::end_functionslist());
+ }
+ }
+#----------------------------Print Headtitle
+if ($target ne 'tex') {
+ $r->print('
'.$courseenv{'description'}.'
');
+ $r->print(''. &Apache::lonnet::domain($cdom,'description').'
');
+} else {
+ $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
+ &Apache::lonnet::domain($cdom,'description').'}\\\\');
+}
+# -------------------------------------------------------- Get course personnel
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ } else {
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ }
+ my @personnel=sort(keys(%coursepersonnel));
+ my $lastpers=$personnel[$#personnel];
+ foreach my $element (@personnel) {
+ if ($target ne 'tex') {
+ $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') {
+ 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') {
+ 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::lonhtmlcommon::end_pick_box());
+ } else {
+ $r->print('\end{tabular}\\\\');
+ }
+# -------------------------------------------------------------- Announcements?
+ my $day = &Apache::lonannounce::showday(time,2,
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ if ($target ne 'tex') {
+ if ($allowed) {
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
+ $r->print( ''.&mt('New RSS Feed or Blog').'');
+ &Apache::lontemplate::print_end_template($r);
+ } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ &Apache::lontemplate::print_end_template($r);
+ }
+
+ } else {
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
+ }
+# ---------------------------------------------------------------- Get syllabus
+ if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
$r->print(''.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
}
- if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');}
+ # if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');}
} else {
- if ($target ne 'tex') {$r->print('');} else {$r->print('\par ');}
+ if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');}
$r->print(&mt('No syllabus information provided.'));
if ($target ne 'tex') {$r->print('
');}
}
@@ -414,7 +445,7 @@ ENDSCRIPT
$r->print('\end{document}');
}
return OK;
-}
+}
1;
__END__