--- loncom/interface/londocs.pm 2004/04/07 20:36:54 1.114 +++ loncom/interface/londocs.pm 2004/05/06 18:28:16 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.114 2004/04/07 20:36:54 albertel Exp $ +# $Id: londocs.pm,v 1.124 2004/05/06 18:28:16 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -261,45 +261,25 @@ sub group_import { sub breadcrumbs { my ($where)=@_; &Apache::lonhtmlcommon::clear_breadcrumbs(); - if ($where =~ /^default/) { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>'Main Course Documents', - 'text' =>'Main Course Documents'}); - } elsif ($where =~ /^supplemental/) { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>'Supplemental Course Documents', - 'text' =>'Supplemental Course Documents'}); - - } else { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>$where, - 'text' =>$where}); - } - if ($ENV{'form.foldername'}) { - my @folders; - if (defined($ENV{'form.folders'})) { - @folders=@{$ENV{'form.folders'}}; - } - @folders=(@folders,$ENV{'form.folder'}, - &Apache::lonnet::escape($ENV{'form.foldername'})); - - my $folderpath; - while (@folders) { - my $folder=shift(@folders); - my $foldername=shift(@folders); - if ($folderpath) {$folderpath.='&';} - $folderpath.=$folder.'&'.$foldername; - my $url='/adm/coursedocs?folderpath='. - &Apache::lonnet::escape($folderpath); + my (@folders)=split('&',$ENV{'form.folderpath'}); + my $folderpath; + while (@folders) { + my $folder=shift(@folders); + my $foldername=shift(@folders); + if ($folderpath) {$folderpath.='&';} + $folderpath.=$folder.'&'.$foldername; + my $url='/adm/coursedocs?folderpath='. + &Apache::lonnet::escape($folderpath); &Apache::lonhtmlcommon::add_breadcrumb( {'href'=>$url, 'title'=>&Apache::lonnet::unescape($foldername), - 'text'=>&Apache::lonnet::unescape($foldername)}); + 'text'=>''. + &Apache::lonnet::unescape($foldername).'' + }); - } } - return &Apache::lonhtmlcommon::breadcrumbs(); + return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0); } sub editor { @@ -318,8 +298,46 @@ sub editor { $r->print('

'.$errtext.'

'); } else { # ------------------------------------------------------------ Process commands + # ---------------- if they are for this folder and user allowed to make changes if (($allowed) && ($ENV{'form.folder'} eq $folder)) { +# set parameters and change order + if (defined($ENV{'form.setparms'})) { + my $idx=$ENV{'form.setparms'}; +# set parameters + if ($ENV{'form.randpick_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_randompick'); + } + if ($ENV{'form.hidprs_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource'); + } + if ($ENV{'form.encprs_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_encrypturl'); + } + + if ($ENV{'form.newpos'}) { +# change order + + my $newpos=$ENV{'form.newpos'}-1; + my $currentpos=$ENV{'form.currentpos'}-1; + $r->print('Sorting '.$idx.': '.$currentpos.' -> '.$newpos); + } +# store the changed version + + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } + + } + # upload a file, if present if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.cmd'}=~/^upload_(\w+)/)) { @@ -457,6 +475,7 @@ sub entryline { &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; + my $orderidx=$Apache::lonratedt::order[$index]; if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { $foldertitle=&Apache::lontexconvert::msgtexconverted($4); $renametitle=$4; @@ -467,29 +486,49 @@ sub entryline { $renametitle=~s/\"\;/\\\"/g; my $line=''; # Edit commands + my $folderpath; + if ($ENV{'form.folderpath'}) { + $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'}); + # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); + } if ($allowed) { - my %lt=('up' => 'Move Up', + my $incindex=$index+1; + my $selectbox=''; + if ($folder!~/^supplemental/) { + $selectbox= + ''. + ''; + } + my %lt=&Apache::lonlocal::texthash( + 'up' => 'Move Up', 'dw' => 'Move Down', 'rm' => 'Remove', 'rn' => 'Rename'); - my ($foldername,$htmlfoldername); - if ($ENV{'form.foldername'}) { - $foldername='&foldername='. - &Apache::lonnet::escape($ENV{'form.foldername'}); - $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); - } $line.=(< + + -
- + $lt{
- + $lt{
- + +$selectbox + + $lt{'rm'} - + $lt{'rn'} END } @@ -506,9 +545,7 @@ END $url='/adm/coursedocs?'; $folderarg=$1; $isfolder=1; - } else { - $url=&Apache::lonnet::tokenwrapper($url); - } + } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) { @@ -523,16 +560,41 @@ END $url=&Apache::lonnet::clutter($url); $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); } + my $parameterset=' '; if ($isfolder) { my $foldername=&Apache::lonnet::escape($foldertitle); my $folderpath=$ENV{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; $folderpath.=$folderarg.'&'.$foldername; $url.='folderpath='.&Apache::lonnet::escape($folderpath); + $parameterset=&mt('Randomly Pick: '). + ''; } $line.=''. - "$title"; + "$title"; + if (($allowed) && ($folder!~/^supplemental/)) { + my %lt=&Apache::lonlocal::texthash( + 'hd' => 'Hidden', + 'ec' => 'URL hidden', + 'sp' => 'Store Parameters'); + my $enctext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); + my $hidtext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); + $line.=(< + $lt{'hd'} + + $lt{'ec'} +$parameterset + + + +ENDPARMS + } + $line.=""; return $line; } @@ -696,7 +758,6 @@ sub checkversions { foreach (keys %ENV) { if ($_=~/^form\.set_version_(.+)$/) { my $src=$1; - &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_}); if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { $newsetversions{$src}=$ENV{$_}; } @@ -898,7 +959,9 @@ sub changewarning { $r->print( ''. '
'. -'

'. +'

'. &mt('Changes will become active for your current session after'). ' ENDNEWSCRIPT @@ -1151,17 +1212,24 @@ ENDNEWSCRIPT 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', ); + + my $folderpath=$ENV{'form.folderpath'}; + if (!$folderpath) { + if ($ENV{'form.folder'} eq '' || + $ENV{'form.folder'} eq 'supplemental') { + $folderpath='default&'. + &Apache::lonnet::escape(&mt('Main Course Documents')); + } + } $r->print(< - - +
- - +
@@ -1177,20 +1245,21 @@ ENDCOURSEVERIFY &mt('Editing the Table of Contents for your Course'))); } # --------------------------------------------------------- Standard documents - my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); $r->print('
'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('

'.&mt('Main Course Documents'). - ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); + $r->print('
'); +# '

'.&mt('Main Course Documents'). +# ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); my $folder=$ENV{'form.folder'}; - if ($folder eq '') { + if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; + $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); } my $postexec=''; if ($folder eq 'default') { $r->print(''); } else { - $postexec='self.close();'; + #$postexec='self.close();'; } $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -1212,8 +1281,7 @@ $lt{'file'}:

$lt{'title'}:
- - + @@ -1223,13 +1291,10 @@ $lt{'title'}:
 - - - + + - + $help{'Importing_LON-CAPA_Resource'}

@@ -1243,8 +1308,7 @@ $help{'Load_Map'}

- - + $help{'Adding_Fold
- - + $help{'Adding_Ext
- - + @@ -1272,8 +1334,7 @@ value="Syllabus=/public/$coursedom/$cour
- - + @@ -1282,8 +1343,7 @@ $help{'Navigate_Content'}
- - + $
- - +
- - +
- - +
- - + @@ -1330,8 +1386,7 @@ $help{'My Personal Info'}
- - + print( - '

'.&mt('Supplemental Course Documents'). - ($allowed?' '.$help{'Supplemental'}:'').'

'); + $r->print('
'); +# '

'.&mt('Supplemental Course Documents'). +# ($allowed?' '.$help{'Supplemental'}:'').'

'); my $folder=$ENV{'form.folder'}; - unless ($folder=~/supplemental/) { $folder='supplemental'; } + unless ($folder=~/^supplemental/) { + $folder='supplemental'; + } + if ($folder =~ /^supplemental$/ && + $ENV{'form.folderpath'} =~ /^default\&/) { + $ENV{'form.folderpath'}='supplemental&'. + &Apache::lonnet::escape(&mt('Supplemental Course Documents')); + } &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($allowed) { my $folderseq= @@ -1372,8 +1434,8 @@ ENDFORM
$lt{'comment'}:
- - +
+ @@ -1383,8 +1445,7 @@ ENDFORM 		- - + $help{'Adding_Fol
- - + $help{'Adding_Ext
- - + @@ -1413,8 +1472,7 @@ $help{'Syllabus'}
- - +