'.
- &mt('External URL unchanged.').
- '
');
- if ($uploaded) {
- my $prefix;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
- }
- unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
- &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
- $cdom,$cnum);
- undef($uploaded);
- }
- }
+ } else {
+ my %included;
+ map { $included{$_} = 1; } split(/,/,$syllabus{'uploaded.fields'});
+ foreach my $field (keys(%syllabusfields)) {
+ my ($prefix) = split(/_/,$field);
+ if ($included{$prefix}) {
+ $displayfields{$field} = ' style="display:block;"';
} else {
- $external=$env{'form.externalsyllabus'};
- $external =~ s/(`)//g;
- my $putres =
- &Apache::lonnet::put('environment',{externalsyllabus=>$external},
- $cdom,$cnum);
- if ($putres eq 'ok') {
- &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.externalsyllabus' => $external});
- $r->print(''.
- &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')).
- '
');
- if ($uploaded) {
- my $prefix;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
- }
- unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
- &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
- $cdom,$cnum);
- undef($uploaded);
- }
- }
- } else {
- $r->print(''.
- &mt('An error occurred storing the external URL: [_1]',$putres).
- '
');
- }
+ $displayfields{$field} = ' style="display:none;"';
+ $noshow{$field} = 1;
}
- } else {
- $r->print(''.
- &mt('External URL not saved -- invalid URL.').
- '
');
}
- } elsif ($env{'form.storefile'}) {
- # Process file upload - phase one - upload and parse primary file.
- my %allfiles = ();
- my %codebase = ();
- my ($upload_result,$upload_output,$uploadphase);
- if ($env{'form.syllabusfile.filename'}) {
- my ($url,$needlink) = &process_upload(\$upload_output,$cnum,$cdom,
- \%allfiles,\%codebase);
- $r->print($upload_output);
- if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
- my $exturl;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url;
- }
- my %storehash = (
- uploadedsyllabus => $url,
- );
- if ($exturl) {
- $storehash{'externalsyllabus'} = $exturl;
- if ($exturl =~ /\.(html?|txt|js|css)$/) {
- $exturl .= '?inhibitmenu=yes';
- }
- } else {
- $storehash{'externalsyllabus'} = '',
- }
- my $putres =
- &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
- if ($putres eq 'ok') {
- &Apache::lonnet::make_public_indefinitely($url);
- foreach my $key (keys(%storehash)) {
- &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
- }
- $uploaded = $url;
- if ($needlink) {
- $r->print(&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
- }
- }
- }
- }
- } elsif ($env{'form.phase'} eq 'upload_embedded') {
- # Process file upload - phase two - upload embedded objects
- my $uploadphase = 'check_embedded';
- my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
- my $state = &embedded_form_elems($uploadphase,$primaryurl);
- my $url_root = '/uploaded/'.$cdom.'/'.$cnum;
- my $actionurl = "/public/$cdom/$cnum/syllabus";
- my ($result,$flag,$numpathchgs) =
- &Apache::loncommon::upload_embedded('syllabus','portfolio/syllabus',
- $cnum,$cdom,'/userfiles',$url_root,undef,undef,undef,$state,
- $actionurl);
- unless ($numpathchgs) {
- my $modres =
- &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
- $cnum,$cdom,
- '/userfiles',$env{'form.primaryurl'});
- $result .= $modres;
- }
- $r->print($result.&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
- } elsif ($env{'form.phase'} eq 'check_embedded') {
- # Process file upload - phase three - modify references in HTML file
- my $uploadphase = 'modified_orightml';
- my $result =
- &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
- $cnum,$cdom,
- '/userfiles',$env{'form.primaryurl'});
- $r->print($result.&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
}
+ } else {
foreach my $field (keys(%syllabusfields)) {
if ($syllabus{$field} ne '') {
$displayfields{$field} = ' style="display:block;"';
@@ -520,17 +330,18 @@ ENDSCRIPT
if ($allowed) {
#---------------------------------- Print External URL Syllabus Info if editing
if ($target ne 'tex') {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
- $r->print(''.
'
'.$courseenv{'description'}.'
');
if ($allowed) {
- $r->print('
'.
- '
'.&Apache::lonnet::domain($cdom,'description').'
'.
- '');
+ $r->print('
'.
+ '
'.&Apache::lonnet::domain($cdom,'description').'
'.
+ '');
# Print Help Text if editing at right side of screen
- $r->print('
'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
- '
');
+ $r->print('
'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+ '
');
} else {
$r->print('
'.&Apache::lonnet::domain($cdom,'description').'
');
}
@@ -590,70 +401,85 @@ ENDSCRIPT
&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 $hidepersonnel;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /000/))) {
+ $hidepersonnel = 1;
}
- 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).' & ');
- }
- my @coursepersonlist;
- 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')) {
- push(@coursepersonlist,$courseperson);
- } else {
- push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
- $puname,$pudom));
- }
- } else {
- push(@coursepersonlist,&Apache::loncommon::plainname($puname,
- $pudom).' ');
+ if ($target ne 'tex') {
+ if ($allowed) {
+ my $display = ' style="display:block;"';
+ if ($hidepersonnel) {
+ $display = ' style="display:none;"';
}
- }
- $r->print(join(", ",@coursepersonlist));
- if ($target ne 'tex') {
- my $lastclose=$element eq $lastpers?1:0;
- $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box',
+ 'box_000_showpeople',$display);
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
+ &Apache::lontemplate::print_end_template($r);
} else {
- $r->print('\\\\ \hline');
+ unless ($hidepersonnel) {
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box');
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
+ &Apache::lontemplate::print_end_template($r);
+ }
}
- }
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('\end{tabular}\\\\');
+ unless ($hidepersonnel) {
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,%syllabus));
+ }
}
# -------------------------------------------------------------- Announcements?
my $day = &Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ my $hidefeeds;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /111/))) {
+ $hidefeeds = 1;
+ }
if ($target ne 'tex') {
if ($allowed) {
my $display = ' style="display:block;"';
- if ($syllabus{'000_showrssfeeds'} eq 'no') {
+ if ($hidefeeds) {
$display = ' style="display:none;"';
}
&Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box',
- 'box_000_showrssfeeds',$display);
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ 'box_111_showrssfeeds',$display);
+ my ($numfeeds,$hiddenfeeds,$rsslinktext);
+ my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds,
+ \$hiddenfeeds);
+ if ($numfeeds) {
+ $r->print($feeds);
+ $rsslinktext = &mt('New RSS Feed or Blog');
+ } else {
+ my $msg = '
'.
+ &mt("RSS Feeds and Blogs item is not included in a student's view of the syllabus.");
+ if ($hiddenfeeds) {
+ $r->print('
'.
+ &mt('All feeds currently hidden').
+ $msg.
+ '
');
+ } else {
+ $r->print('
'.
+ &mt('No current feeds').
+ $msg.
+ '
');
+ }
+ $rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
+ if ($crstype eq 'Community') {
+ $rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
+ }
+ }
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
- $r->print( '
'.&mt('New RSS Feed or Blog').'');
+ $r->print( '
'.$rsslinktext.'');
&Apache::lontemplate::print_end_template($r);
} else {
- unless ($syllabus{'000_showrssfeeds'} eq 'no') {
- if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+ unless ($hidefeeds) {
+ my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit);
+ if ($feeds ne '') {
&Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ $r->print($feeds);
&Apache::lontemplate::print_end_template($r);
}
}
@@ -663,11 +489,6 @@ ENDSCRIPT
}
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- if ($allowed) {
- $r->print('
'.
+ $r->print('