--- loncom/interface/lonsyllabus.pm 2013/05/10 17:49:11 1.122 +++ loncom/interface/lonsyllabus.pm 2013/05/16 20:03:51 1.127 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.122 2013/05/10 17:49:11 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.127 2013/05/16 20:03:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,6 +71,7 @@ sub handler { } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + my $crstype = &Apache::loncommon::course_type(); # ------------------------------------------------------------ Print the screen @@ -117,24 +118,26 @@ sub handler { } unless ($allowed && $forceedit) { my $file=&Apache::lonnet::filelocation("",$item); - if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) { - my $filetype; - if ($file =~ /\.(sty|css|js|txt|tex)$/) { - $filetype=$1; - } else { - $filetype='html'; - } - my $result = ''; + if ($file =~ /\.(tex|x?html?)$/) { + my $filetype = $1; my $filecontents=&Apache::lonnet::getfile($file); if ($filecontents eq -1) { $r->print(&mt('Syllabus file unavailable')); - } elsif ($filetype eq 'html') { + } elsif ($filetype eq 'tex') { + my $result = &Apache::lontexconvert::converted(\$filecontents, + $env{'form.texengine'}); + my %args; + &get_breadcrumbs($cdom,$cnum,$crstype,\%args); + $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args). + $result. + &Apache::loncommon::end_page()); + } else { my %mystyle; &Apache::structuretags::reset_problem_globals(); my $oldfile = $env{'request.filename'}; $env{'request.filename'} = $item; - $result = &Apache::lonxml::xmlparse($r,'web',$filecontents, - '',%mystyle); + my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents, + '',%mystyle); &Apache::structuretags::reset_problem_globals(); &Apache::lonhomework::finished_parsing(); $env{'request.filename'} = $oldfile; @@ -153,7 +156,6 @@ sub handler { } } - my $crstype = &Apache::loncommon::course_type(); # ------------------------------ The buck stops here: internal syllabus display # --------------------------------------------------------- The syllabus fields @@ -330,18 +332,18 @@ sub handler { } &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box', 'box_000_showpeople',$display); - $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed)); + $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus)); &Apache::lontemplate::print_end_template($r); } else { unless ($hidepersonnel) { &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box'); - $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed)); + $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus)); &Apache::lontemplate::print_end_template($r); } } } else { unless ($hidepersonnel) { - $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed)); + $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,%syllabus)); } } # -------------------------------------------------------------- Announcements? @@ -664,7 +666,26 @@ ENDSCRIPT {href=>$r->uri, text=>"Course syllabus"}); $args->{'bread_crumbs'} = $brcrum; - } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + } else { + &get_breadcrumbs($cdom,$cnum,$crstype,$args); + } + if ($allowed) { + my %loaditem = ( + onload => 'setTemplateBoxes();', + ); + $args->{'add_entries'} = \%loaditem; + } + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); + if ($start_page) { + $r->print($start_page); + } +} + +sub get_breadcrumbs{ + my ($cdom,$cnum,$crstype,$args) = @_; + return unless (ref($args) eq 'HASH'); + if ($env{'form.folderpath'} =~ /^supplemental/) { my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Syllabus'); @@ -685,17 +706,7 @@ ENDSCRIPT ]; } } - if ($allowed) { - my %loaditem = ( - onload => 'setTemplateBoxes();', - ); - $args->{'add_entries'} = \%loaditem; - } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); - if ($start_page) { - $r->print($start_page); - } + return; } sub chooser { @@ -817,8 +828,16 @@ sub syllabus_file_info { my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item; my ($filename) = ($item =~ m{([^/]+)$}); my $file=&Apache::lonnet::filelocation("",$item); - my $depbutton; - if ($file =~ /\.html?$/) { + my ($depbutton,$filetype,$editable); + if ($file =~ /\.(xhtml|xml|tex|html|htm)$/) { + $filetype=$1; + } + if ($filetype) { + unless ($filetype eq 'tex') { + $filetype='html'; + } + } + if ($filetype eq 'html') { my $filecontents=&Apache::lonnet::getfile($file); unless ($filecontents eq -1) { my $mm = new File::MMagic; @@ -833,12 +852,13 @@ sub syllabus_file_info { \%codebase, {'context' => 'rewrites', 'ignore_remote_references' => 1,}); - $depbutton = (' ' x 3). - &editfile_button($item,$context). - &editbutton_js(); + $editable = 1; } } } + $depbutton = (' ' x 3). + &editfile_button($item,$context,$editable). + &editbutton_js(); return ($absurl,$filename,$depbutton); } @@ -920,49 +940,121 @@ sub fields_check_uncheck { } sub get_personnel { - my ($r,$target,$cdom,$cnum,$allowed) = @_; + my ($r,$target,$cdom,$cnum,$allowed,$crstype,$syllabus) = @_; + my (%hiddenroles,%hiddenusers); + if (ref($syllabus) eq 'HASH') { + if (ref($syllabus->{'personnel'}) eq 'HASH') { + if ($syllabus->{'personnel'}{'hiderole'}) { + map { $hiddenroles{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hiderole'}); + } + if ($syllabus->{'personnel'}{'hideuser'}) { + map { $hiddenusers{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hideuser'}); + } + } + } my $output; - my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1); if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::start_pick_box()); + if ($allowed) { + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Role hidden?').''.&mt('Role').''. + ''.&mt('Personnel (hidden if checked)').''. + &Apache::loncommon::end_data_table_header_row()); + } else { + $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) { + unless ($allowed) { + next if ($hiddenroles{$element}) + } + my ($role,$sec); + if ($element =~ /:/) { + ($role,$sec) = split(/:/,$element); + } else { + $role = $element; + } + my $roletext = &Apache::lonnet::plaintext($role,$crstype); + if ($sec) { + $roletext .=' ('.&Apache::lonlocal::mt('Section [_1]',$sec).')'; + } if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::row_title($element)); + if ($allowed) { + my $checked; + if ($hiddenroles{$element}) { + $checked = ' checked="checked"'; + } + $r->print(&Apache::loncommon::start_data_table_row(). + ''. + ''. + ''.$roletext.''); + } else { + $r->print(&Apache::lonhtmlcommon::row_title($roletext)); + } } else { - $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); + $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$roletext).' & '); } my @coursepersonlist; foreach my $user (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$user); 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); + my $checked; + if ($hiddenusers{$element.'&'.$puname.':'.$pudom}) { + $checked = ' checked="checked"'; + } + if ($allowed) { + my $item = ''.(' 'x2).' '; + push(@coursepersonlist,$item); + } else { - push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson, - $puname,$pudom)); + next if ($hiddenusers{$element.'&'.$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).' '); } } - $r->print(join(", ",@coursepersonlist)); + if ($allowed) { + $r->print(join('',@coursepersonlist)); + } else { + $r->print(join(', ',@coursepersonlist)); + } if ($target ne 'tex') { - my $lastclose=$element eq $lastpers?1:0; - $r->print(&Apache::lonhtmlcommon::row_closure($lastclose)); + if ($allowed) { + $r->print(&Apache::loncommon::end_data_table_row()); + } else { + 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()); + if ($allowed) { + $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&Apache::lonhtmlcommon::end_pick_box()); + } } else { $r->print('\end{tabular}\\\\'); } @@ -1010,6 +1102,33 @@ sub save_changes { my ($prefix) = split(/_/,$field); $syllabus->{'uploaded.fields'} .= $prefix.','; } + if ($field eq '000_showpeople') { + my @hideusers = &Apache::loncommon::get_env_multiple('form.hideuser'); + my @hideroles = &Apache::loncommon::get_env_multiple('form.hiderole'); + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1); + my %personnel; + foreach my $key (keys(%coursepersonnel)) { + map { $personnel{$key}{$_} = 1; } split(/,/,$coursepersonnel{$key}); + } + %{$syllabus->{'personnel'}} = (); + $syllabus->{'personnel'}{'hideuser'} = ''; + $syllabus->{'personnel'}{'hiderole'} = ''; + foreach my $role (@hideroles) { + if (exists($personnel{$role})) { + $syllabus->{'personnel'}{'hiderole'} .= $role.','; + } + } + foreach my $item (@hideusers) { + my ($role,$user) = split(/\&/,$item); + if (ref($personnel{$role}) eq 'HASH') { + if ($personnel{$role}{$user}) { + $syllabus->{'personnel'}{'hideuser'} .= $item.','; + } + } + } + $syllabus->{'personnel'}{'hideuser'} =~ s/,$//; + $syllabus->{'personnel'}{'hiderole'} =~ s/,$//; + } } $syllabus->{'uploaded.fields'} =~ s/,$//; } @@ -1059,28 +1178,9 @@ sub save_changes { $syllabus->{'uploaded.lastmodified'} = $now; my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum); if ($putres eq 'ok') { - my %storehash; - if ($courseenv->{'uploadedsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); - $storehash{'uploadedsyllabus'} = ''; - } - if ($courseenv->{'externalsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); - $storehash{'externalsyllabus'} = ''; - } - if ($courseenv->{'minimalsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus'); - $storehash{'minimalsyllabus'} = ''; - } - $storehash{'updatedsyllabus'} = $now; - &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); - &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now}); - if (($courseenv->{'externalsyllabus'} || $courseenv->{'uploadedsyllabus'}) || - ($courseenv->{'minimalsyllabus'})) { - undef($uploaded); - undef($external); - undef($minimal); - } + ($uploaded,$minimal,$external) = + &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, + $minimal,$external); $output = '
'. &Apache::lonhtmlcommon::confirm_success(&mt('Template saved.')). '
'; @@ -1095,21 +1195,9 @@ sub save_changes { $output = '
'. &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); - } - } + ($uploaded,$minimal,$external) = + &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, + $minimal,$external); } else { $external=$env{'form.externalsyllabus'}; $external =~ s/(`)//g; @@ -1121,21 +1209,9 @@ sub save_changes { $output = '
'. &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); - } - } + ($uploaded,$minimal,$external) = + &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, + $minimal,$external); } else { $output = '
'. &mt('An error occurred storing the external URL: [_1]',$putres). @@ -1187,12 +1263,9 @@ END 'portfolio/syllabus/loncapa.html'); } 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 $exturl = &home_http_host($cdom,$cnum); + if ($exturl) { + $exturl .= $url; } my %storehash; if ($env{'form.choice'} eq 'minimal') { @@ -1224,6 +1297,9 @@ END $output .= &return_to_editor($cdom,$cnum); $earlyout = 1; } + ($uploaded,$minimal,$external) = + &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, + $minimal,$external); } else { $error = 1; $errormsg = $putres; @@ -1273,6 +1349,88 @@ END return ($earlyout,$uploaded,$external,$minimal,$output); } +sub update_syllabus_env { + my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_; + return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH'); + my $now = time; + my (@envkeys,%storehash); + if ($saved eq 'template') { + if ($uploaded) { + push(@envkeys,'uploaded'); + } + if ($minimal) { + push(@envkeys,'minimal'); + } + if ($external) { + push(@envkeys,'external'); + } + $storehash{'updatedsyllabus'} = $now; + &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now +}); + + } elsif ($saved eq 'url') { + my $prefix = &home_http_host($cdom,$cnum); + if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) { + my $file = $1; + if ($file eq 'loncapa.html') { + if ($uploaded) { + push(@envkeys,'uploaded'); + } + } elsif ($minimal) { + push(@envkeys,'minimal'); + } + } else { + if ($uploaded) { + push(@envkeys,'uploaded'); + } + if ($minimal) { + push(@envkeys,'minimal'); + } + } + } elsif ($saved eq 'file') { + if ($minimal) { + push(@envkeys,'minimal'); + } + } elsif ($saved eq 'minimal') { + if ($uploaded) { + push(@envkeys,'uploaded'); + } + } + if (@envkeys > 0) { + foreach my $item (@envkeys) { + my $key = $item.'syllabus'; + if ($courseenv->{$key}) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key); + $storehash{$key} = ''; + } + if ($item eq 'uploaded') { + undef($uploaded); + } + if ($item eq 'external') { + undef($external); + } + if ($item eq 'minimal') { + undef($minimal); + } + } + } + if (keys(%storehash) > 0) { + &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); + } + return ($uploaded,$minimal,$external); +} + +sub home_http_host { + my ($cdom,$cnum) = @_; + my $home=&Apache::lonnet::homeserver($cnum,$cdom); + if ($home ne 'no_host') { + my $protocol = $Apache::lonnet::protocol{$home}; + $protocol = 'http' if ($protocol ne 'https'); + return $protocol.'://'.$home; + } + return; +} + sub process_upload { my ($upload_output,$cnum,$cdom,$allfiles,$codebase) = @_; my ($parseaction,$showupload,$mimetype); @@ -1358,18 +1516,28 @@ sub return_to_editor { } sub editfile_button { - my ($url,$context) = @_; + my ($url,$context,$editable) = @_; my $edittext=&mt('Edit'); my $deltext=&mt('Delete'); - return <<"END"; - -     - + my $output; + if ($editable) { + $output = ' + +    '; + } + $output .= ' + -END + '; + return $output; } sub editbutton_js { + my %lt = &Apache::lonlocal::texthash( + min => 'Are you sure you want to delete the contents of the syllabus template?', + file => 'Are you sure you want to delete the uploaded syllabus file?', + noundo => 'This action cannot be reversed.' + ); return < //