--- loncom/interface/lonsyllabus.pm 2008/07/17 12:01:46 1.66 +++ loncom/interface/lonsyllabus.pm 2009/02/20 17:45:40 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.66 2008/07/17 12:01:46 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.79 2009/02/20 17:45:40 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; @@ -161,32 +162,27 @@ ENDSCRIPT text=>"Course syllabus"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs()); } - $r->print('
'); + $r->print(''); + $r->print(''. &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::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).' & '); } @@ -198,8 +194,8 @@ ENDSCRIPT ($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, @@ -207,13 +203,14 @@ ENDSCRIPT } } 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}\\\\'); } @@ -237,22 +234,14 @@ ENDSCRIPT 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}; @@ -269,7 +258,7 @@ ENDSCRIPT # 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 @@ -282,7 +271,7 @@ ENDSCRIPT } } # norm internal URLs - unless ($url=~/^http\:/) { + unless ($url=~/^https?\:/) { $url=&Apache::lonnet::clutter($url); } # re-assemble field @@ -299,74 +288,96 @@ ENDSCRIPT &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } } -# ---------------------------------------------------------------- Get syllabus - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; +#----------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') { + $syllabus{'uploaded.domain'}); + if ($target ne 'tex') { $r->print('
'.&mt('Last updated').': '. $lastmod.' '. ($who ? &mt('by').' '.$who : '' ). - ' '); + ''); } else { $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. ($who? &mt('by').'\\\\ '. &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) :'') .'\\\\'); - } + } +#--------Functions +if ($target ne 'tex') { + if($allowed || $privileged){ + &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); + } + } +# -------------------------------------------------------------- Announcements? + my $day = &Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); + if ($target ne 'tex') { + &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial'); + } 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 ');} $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('
');} } - if ($target ne 'tex') { + if ($target ne 'tex') { + $r->print('