--- loncom/interface/lonsyllabus.pm 2008/11/19 11:51:49 1.70 +++ loncom/interface/lonsyllabus.pm 2009/02/19 18:55:53 1.78 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.70 2008/11/19 11:51:49 amueller Exp $ +# $Id: lonsyllabus.pm,v 1.78 2009/02/19 18:55:53 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -168,15 +168,6 @@ ENDSCRIPT $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') { @@ -184,7 +175,7 @@ ENDSCRIPT } else { $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } - my @personnel=sort keys %coursepersonnel; + my @personnel=sort(keys(%coursepersonnel)); my $lastpers=$personnel[$#personnel]; foreach my $element (@personnel) { if ($target ne 'tex') { @@ -220,6 +211,14 @@ ENDSCRIPT } else { $r->print('\end{tabular}\\\\'); } +# -------------------------------------------------------------- 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)); + } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; @@ -240,22 +239,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}; @@ -272,7 +263,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 @@ -285,7 +276,7 @@ ENDSCRIPT } } # norm internal URLs - unless ($url=~/^http\:/) { + unless ($url=~/^https?\:/) { $url=&Apache::lonnet::clutter($url); } # re-assemble field @@ -323,12 +314,25 @@ ENDSCRIPT :'') .'\\\\'); } + + 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('
'. ''); } my @htmlids=(); - foreach my $field (sort(keys(%syllabusfields))) { + + 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 @@ -354,23 +358,22 @@ ENDSCRIPT } if ($allowed) { $r->print('

'.$syllabusfields{$field}. - &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'. - '

'.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + &Apache::loncommon::help_open_topic('Syllabus_URLs').''); } else { $r->print($message); } } else { &Apache::lonfeedback::newline_to_br(\$message); - $message =~s|(https*://[^\s]+)|$1|g; + $message =~s|(https?\://[^\s]+)|$1|g; if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message); -# $r->print('

'.$syllabusfields{$field}.'

'. -# $message.'
'); + if($allowed){ + $r->print('

'); + } + &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); @@ -378,13 +381,14 @@ ENDSCRIPT push(@htmlids,$field); } if ($allowed) { - &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); -# $r->print('
'); + if($target ne 'tex'){ + $r->print('

'); + } + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); } } - } + } + if ($allowed) { $r->print('
'. &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));