--- loncom/interface/londocs.pm 2007/07/03 00:17:42 1.283 +++ loncom/interface/londocs.pm 2008/01/17 18:42:31 1.302 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.283 2007/07/03 00:17:42 albertel Exp $ +# $Id: londocs.pm,v 1.302 2008/01/17 18:42:31 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -908,9 +908,7 @@ sub group_import { my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; while (@files) { - my $name = shift(@files); - my $url = shift(@files); - #FIXME check if file exists before overwriting, might be restoring it + my ($name, $url, $residx) = @{ shift(@files) }; if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs') && (!&Apache::lonnet::stat_file($url))) { @@ -934,14 +932,17 @@ sub group_import { } } if ($url) { - my $idx = &LONCAPA::map::getresidx($url); - $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; + if (!$residx + || defined($LONCAPA::map::zombies[$residx])) { + $residx = &LONCAPA::map::getresidx($url,$residx); + push(@LONCAPA::map::order, $residx); + } my $ext = 'false'; if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } $url = &LONCAPA::map::qtunescape($url); $name = &LONCAPA::map::qtunescape($name); - $LONCAPA::map::resources[$idx] = - join ':', ($name, $url, $ext, 'normal', 'res'); + $LONCAPA::map::resources[$residx] = + join(':', ($name, $url, $ext, 'normal', 'res')); } } return &storemap($coursenum, $coursedom, $folder.'.'.$container); @@ -962,6 +963,7 @@ sub breadcrumbs { my $randompick=-1; my $isencrypted=0; my $ishidden=0; + my $is_random_order=0; while (@folders) { my $folder=shift(@folders); my $foldername=shift(@folders); @@ -969,16 +971,17 @@ sub breadcrumbs { $folderpath.=$folder.'&'.$foldername; my $url='/adm/coursedocs?folderpath='. &escape($folderpath); - my $name=&unescape($foldername); -# randompick number, hidden, encrypted is appended with ":"s to the foldername - $name=~s/\:(\d*)\:(\w*)\:(\w*)$//; - if ($1 ne '') { + my $name=&unescape($foldername); +# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername + $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//; + if ($1 ne '') { $randompick=$1; } else { $randompick=-1; } if ($2) { $ishidden=1; } if ($3) { $isencrypted=1; } + if ($4 ne '') { $is_random_order = 1; } &Apache::lonhtmlcommon::add_breadcrumb( {'href'=>$url.$cpinfo, 'title'=>$name, @@ -990,7 +993,7 @@ sub breadcrumbs { } $plain=~s/\>\;\s*$//; return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', - 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain); + 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); } sub log_docs { @@ -1081,6 +1084,7 @@ sub docs_change_log { my %lt=('hiddenresource' => 'Resources hidden', 'encrypturl' => 'URL hidden', 'randompick' => 'Randomly pick', + 'randomorder' => 'Randomly ordered', 'set' => 'set to', 'del' => 'deleted'); $r->print(&Apache::loncommon::display_filter(). @@ -1163,7 +1167,7 @@ sub docs_change_log { $r->print('</ul>'); if ($docslog{$id}{'logentry'}{'parameter_res'}) { $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); - foreach my $parameter ('randompick','hiddenresource','encrypturl') { + foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { $r->print('<li>'. &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]', @@ -1199,6 +1203,8 @@ sub update_paste_buffer { if (&is_supplemental_title($title)) { ($title) = &parse_supplemental_title($title); } + $url=~s{http(:|:)//https(:|:)//}{https$2//}; + &Apache::lonnet::appenv('docs.markedcopy_title' => $title, 'docs.markedcopy_url' => $url); delete($env{'form.markcopy'}); @@ -1209,43 +1215,170 @@ sub print_paste_buffer { return if (!defined($env{'docs.markedcopy_url'})); $r->print(<<ENDPASTE); -<p><form name="pasteform" action="/adm/coursedocs" method="post"> +<form name="pasteform" action="/adm/coursedocs" method="post"><p> ENDPASTE $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); my $type; - if ($env{'docs.markedcopy_url'} =~ m{^/adm/wrapper/ext}) { + if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { $type = &mt('External Resource'); - $r->print($type.': '.&Apache::map::qtescape($env{'docs.markedcopy_title'})); + $r->print($type.': '. + &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. + &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); } else { my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; - my $type = &Apache::loncommon::filedescription($extension); - my $icon = '<img src="'.&Apache::loncommon::icon($extension). - '" class="LC_icon" />'; - $r->print($icon.$type.': '. &parse_supplemental_title($env{'docs.markedcopy_title'})); + my $icon = &Apache::loncommon::icon($extension); + if ($extension eq 'sequence' && + $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { + $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + $icon .= '/folder_closed.gif'; + } + $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; + $r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); } if ($container eq 'page') { - $r->print(<<PAGEINFO); - <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" /> - <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" /> -PAGEINFO + $r->print(' + <input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" /> + <input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" /> +'); + } else { + $r->print(' + <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /> +'); + } + $r->print('</p></form>'); +} + +sub do_paste_from_buffer { + my ($coursenum,$coursedom) = @_; + + return 0 if (!$env{'form.pastemarked'}); + +# paste resource to end of list + my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); + my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); +# Maps need to be copied first + if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) { + $title=&mt('Copy of').' '.$title; + my $newid=$$.time; + $url=~/^(.+)\.(\w+)$/; + my $newurl=$1.$newid.'.'.$2; + my $storefn=$newurl; + $storefn=~s{^/\w+/$match_domain/$match_username/}{}; + &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, + &Apache::lonnet::getfile($url)); + $url = $newurl; + } +# published maps can only exists once, so remove it from paste buffer when done + if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) { + &Apache::lonnet::delenv('docs\\.markedcopy'); + } + if ($url=~ m{/smppg$}) { + my $db_name = &Apache::lonsimplepage::get_db_name($url); + if ($db_name =~ /^smppage_/) { + #simple pages, need to copy the db contents to a new one. + my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); + my $now = time(); + $db_name =~ s{_\d*$ }{_$now}x; + my $result=&Apache::lonnet::put($db_name,\%contents, + $coursedom,$coursenum); + $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; + $title=&mt('Copy of').' '.$title; + } + } + $title = &LONCAPA::map::qtunescape($title); + my $ext='false'; + if ($url=~m{^http(|s)://}) { $ext='true'; } + $url = &LONCAPA::map::qtunescape($url); +# Now insert the URL at the bottom + my $newidx = &LONCAPA::map::getresidx($url); + $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; + push(@LONCAPA::map::order, $newidx); +# Store the result +} + +my %parameter_type = ( 'randompick' => 'int_pos', + 'hiddenresource' => 'string_yesno', + 'encrypturl' => 'string_yesno', + 'randomorder' => 'string_yesno',); +my $valid_parameters_re = join('|',keys(%parameter_type)); +# set parameters +sub update_parameter { + + return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); + + my $which = $env{'form.changeparms'}; + my $idx = $env{'form.setparms'}; + if ($env{'form.'.$which.'_'.$idx}) { + my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx} + : 'yes'; + &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value, + $parameter_type{$which}); + &remember_parms($idx,$which,'set',$value); + } else { + &LONCAPA::map::delparameter($idx,'parameter_'.$which); + + &remember_parms($idx,$which,'del'); + } + return 1; +} + + +sub handle_edit_cmd { + my ($coursenum,$coursedom) =@_; + + my ($cmd,$idx)=split('_',$env{'form.cmd'}); + + my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]; + my ($title, $url, @rrest) = split(':', $ratstr); + + if ($cmd eq 'del') { + if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && + ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) { + &Apache::lonnet::removeuploadedurl($url); + } else { + &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); + } + splice(@LONCAPA::map::order, $idx, 1); + + } elsif ($cmd eq 'cut') { + &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); + splice(@LONCAPA::map::order, $idx, 1); + + } elsif ($cmd eq 'up' + && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) { + @LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1]; + + } elsif ($cmd eq 'down' + && defined($LONCAPA::map::order[$idx+1])) { + @LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1]; + + } elsif ($cmd eq 'rename') { + + my $comment = &LONCAPA::map::qtunescape($env{'form.title'}); + if ($comment=~/\S/) { + $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]= + $comment.':'.join(':', $url, @rrest); + } +# Devalidate title cache + my $renamed_url=&LONCAPA::map::qtescape($url); + &Apache::lonnet::devalidate_title_cache($renamed_url); } else { - $r->print(<<FOLDERINFO); - <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> -FOLDERINFO + return 0; } - $r->print('</form></p>'); + return 1; } sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_; - my $errtext=''; - my $fatal=0; - my $container='sequence'; - if ($env{'form.pagepath'}) { - $container='page'; - } - ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container); + + my $container= ($env{'form.pagepath'}) ? 'page' + : 'sequence'; + + my ($errtext,$fatal) = &mapread($coursenum,$coursedom, + $folder.'.'.$container); + return $errtext if ($fatal); + if ($#LONCAPA::map::order<1) { my $idx=&LONCAPA::map::getresidx(); if ($idx<=0) { $idx=1; } @@ -1253,262 +1386,112 @@ sub editor { $LONCAPA::map::resources[$idx]=''; } - my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder); + my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)= + &breadcrumbs($folder); $r->print($breadcrumbtrail); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - } else { + # ------------------------------------------------------------ Process commands # ---------------- if they are for this folder and user allowed to make changes - if (($allowed) && ($env{'form.folder'} eq $folder)) { + if (($allowed) && ($env{'form.folder'} eq $folder)) { # set parameters and change order - &snapshotbefore(); - if ($env{'form.changeparms'}) { - my $idx=$env{'form.setparms'}; -# set parameters - if ($env{'form.changeparms'} eq 'randompick') { - if ($env{'form.randpick_'.$idx}) { - &LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos'); - &remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx}); - } else { - &LONCAPA::map::delparameter($idx,'parameter_randompick'); - &remember_parms($idx,'randompick','del'); - } - } - if ($env{'form.changeparms'} eq 'hiddenresource') { - if ($env{'form.hidprs_'.$idx}) { - &LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); - &remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx}); - } else { - &LONCAPA::map::delparameter($idx,'parameter_hiddenresource'); - &remember_parms($idx,'hiddenresource','del'); - } - } - if ($env{'form.changeparms'} eq 'encrypturl') { - if ($env{'form.encprs_'.$idx}) { - &LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); - &remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx}); - } else { - &LONCAPA::map::delparameter($idx,'parameter_encrypturl'); - &remember_parms($idx,'encrypturl','del'); - } - } -# store the changed version - ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; - } - } + &snapshotbefore(); - if ($env{'form.newpos'}) { + if (&update_parameter()) { + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } + + if ($env{'form.newpos'} && $env{'form.currentpos'}) { # change order - my $newpos=$env{'form.newpos'}-1; - my $currentpos=$env{'form.currentpos'}-1; - my $i; - my @neworder=(); - if ($newpos>$currentpos) { -# moving stuff up - for ($i=0;$i<$currentpos;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i]; - } - for ($i=$currentpos;$i<$newpos;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i+1]; - } - $neworder[$newpos]=$LONCAPA::map::order[$currentpos]; - for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i]; - } - } else { -# moving stuff down - for ($i=0;$i<$newpos;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i]; - } - $neworder[$newpos]=$LONCAPA::map::order[$currentpos]; - for ($i=$newpos+1;$i<$currentpos+1;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i-1]; - } - for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) { - $neworder[$i]=$LONCAPA::map::order[$i]; - } - } - @LONCAPA::map::order=@neworder; -# store the changed version - ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; - } - } + my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1); + splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res); + + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } - if ($env{'form.pastemarked'}) { -# paste resource to end of list - my $url=$env{'docs.markedcopy_url'}; - my $title=$env{'docs.markedcopy_title'}; -# Maps need to be copied first - if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { - $title=&mt('Copy of').' '.$title; - my $newid=$$.time; - $url=~/^(.+)\.(\w+)$/; - my $newurl=$1.$newid.'.'.$2; - my $storefn=$newurl; - $storefn=~s{^/\w+/$match_domain/$match_username/}{}; - &Apache::lonclonecourse::writefile - ($env{'request.course.id'},$storefn, - &Apache::lonnet::getfile($url)); - $url=$newurl; - } - $title = &LONCAPA::map::qtunescape($title); - my $ext='false'; - if ($url=~/^http\:\/\//) { $ext='true'; } - $url = &LONCAPA::map::qtunescape($url); -# Now insert the URL at the bottom - my $newidx=&LONCAPA::map::getresidx($url); - $LONCAPA::map::resources[$newidx]= - $title.':'.$url.':'.$ext.':normal:res'; - $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx; -# Store the result - ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; - } + if ($env{'form.pastemarked'}) { + &do_paste_from_buffer($coursenum,$coursedom); + ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } - } - $r->print($upload_output); - if ($env{'form.cmd'}) { - my ($cmd,$idx)=split(/\_/,$env{'form.cmd'}); - if ($cmd eq 'del') { - my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); - if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && - ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) { - &Apache::lonnet::removeuploadedurl($url); - } else { - &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); - } - for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) { - $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1]; - } - $#LONCAPA::map::order--; - } elsif ($cmd eq 'cut') { - my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); - &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); - for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) { - $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1]; - } - $#LONCAPA::map::order--; - } elsif ($cmd eq 'up') { - if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) { - my $i=$LONCAPA::map::order[$idx-1]; - $LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx]; - $LONCAPA::map::order[$idx] = $i; - } - } elsif ($cmd eq 'down') { - if (defined($LONCAPA::map::order[$idx+1])) { - my $i=$LONCAPA::map::order[$idx+1]; - $LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx]; - $LONCAPA::map::order[$idx] = $i; - } - } elsif ($cmd eq 'rename') { - my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]; - my ($rtitle,@rrest)=split(/\:/, - $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); - my $comment=$env{'form.title'}; - $comment = &LONCAPA::map::qtunescape($comment); - if ($comment=~/\S/) { - $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]= - $comment.':'.join(':',@rrest); - } -# Devalidate title cache - my $renamed_url=&LONCAPA::map::qtescape($rrest[0]); - &Apache::lonnet::devalidate_title_cache($renamed_url); - } -# Store the changed version - ($errtext,$fatal)=&storemap($coursenum,$coursedom, - $folder.'.'.$container); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; - } - } + $r->print($upload_output); + + if (&handle_edit_cmd()) { + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } # Group import/search - if ($env{'form.importdetail'}) { - my @imports; -# &Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'}); - foreach (split(/\&/,$env{'form.importdetail'})) { - if (defined($_)) { - my ($name,$url)=split(/\=/,$_); - $name=&unescape($name); - $url=&unescape($url); - push @imports, $name, $url; - } - } -# Store the changed version - ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, - $container,'londocs',@imports); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; + if ($env{'form.importdetail'}) { + my @imports; + foreach (split(/\&/,$env{'form.importdetail'})) { + if (defined($_)) { + my ($name,$url,$residx)= + map {&unescape($_)} split(/\=/,$_); + push(@imports, [$name, $url, $residx]); } - } + } + ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, + $container,'londocs',@imports); + return $errtext if ($fatal); + } # Loading a complete map - if ($env{'form.loadmap'}) { - if ($env{'form.importmap'}=~/\w/) { - foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { - my ($title,$url,$ext,$type)=split(/\:/,$_); - my $idx=&LONCAPA::map::getresidx($url); - $LONCAPA::map::resources[$idx]=$_; - $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; - } -# Store the changed version - ($errtext,$fatal)=&storemap($coursenum,$coursedom, - $folder.'.'.$container); - if ($fatal) { - $r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); - return; - } - } else { - $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); - - } - } - &log_differences($plain); + if ($env{'form.loadmap'}) { + if ($env{'form.importmap'}=~/\w/) { + foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { + my ($title,$url,$ext,$type)=split(/\:/,$res); + my $idx=&LONCAPA::map::getresidx($url); + $LONCAPA::map::resources[$idx]=$res; + $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; + } + ($errtext,$fatal)=&storemap($coursenum,$coursedom, + $folder.'.'.$container); + return $errtext if ($fatal); + } else { + $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); + + } } + &log_differences($plain); + } # ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen - my $idx=0; - my $shown=0; - if (($ishidden) || ($isencrypted) || ($randompick>=0)) { - $r->print('<p>'.&mt('Parameters').':<ul>'. - ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':''). - ($ishidden?'<li>'.&mt('contents hidden').'</li>':''). - ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). - '</ul></p>'); - } - if ($randompick>=0) { - $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>'); - } - $r->print('<table>'); - foreach my $res (@LONCAPA::map::order) { - my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); - $name=&LONCAPA::map::qtescape($name); - $url=&LONCAPA::map::qtescape($url); - unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { $idx++; next; } - $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res, - $coursenum)); - $idx++; - $shown++; - } - unless ($shown) { - $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); - } - $r->print("\n</table>\n"); - - &print_paste_buffer($r,$container); - + my $idx=0; + my $shown=0; + if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) { + $r->print('<p>'.&mt('Parameters').':<ul>'. + ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':''). + ($ishidden?'<li>'.&mt('contents hidden').'</li>':''). + ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). + '</ul></p>'); + } + if ($randompick>=0) { + $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>'); + } + if ($is_random_order) { + $r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>'); + } + $r->print('<table class="LC_docs_editor">'); + foreach my $res (@LONCAPA::map::order) { + my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); + $name=&LONCAPA::map::qtescape($name); + $url=&LONCAPA::map::qtescape($url); + unless ($name) { $name=(split(/\//,$url))[-1]; } + unless ($name) { $idx++; next; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res, + $coursenum)); + $idx++; + $shown++; + } + unless ($shown) { + $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); } + $r->print("\n</table>\n"); + + &print_paste_buffer($r,$container); + return; } sub process_file_upload { @@ -1556,7 +1539,7 @@ sub process_file_upload { $parseaction,$allfiles, $codebase); my $ext='false'; - if ($url=~/^http\:\/\//) { $ext='true'; } + if ($url=~m{^http://}) { $ext='true'; } $url = &LONCAPA::map::qtunescape($url); my $comment=$env{'form.comment'}; $comment = &LONCAPA::map::qtunescape($comment); @@ -1715,9 +1698,10 @@ sub entryline { $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; + $renametitle=~s/ /%20/g; my $line='<tr>'; + my ($form_start,$form_end); # Edit commands - my $container; my ($container, $type, $esc_path, $path, $symb); if ($env{'form.folderpath'}) { $type = 'folder'; @@ -1766,11 +1750,16 @@ sub entryline { my $nocopy=0; my $nocut=0; if ($url=~/\.(page|sequence)$/) { - foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) { - my ($title,$url,$ext,$type)=split(/\:/,$_); - if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { - $nocopy=1; - last; + if ($url =~ m{/res/}) { + # no copy for published maps + $nocopy = 1; + } else { + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { + my ($title,$url,$ext,$type)=split(/\:/,$_); + if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { + $nocopy=1; + last; + } } } } @@ -1781,45 +1770,60 @@ sub entryline { my $copylink=' '; my $cutlink=' '; + my $skip_confirm = 0; + if ( $folder =~ /^supplemental/ + || ($url =~ m{( /smppg$ + |/syllabus$ + |/aboutme$ + |/navmaps$ + |/bulletinboard$ + |\.html$ + |^/adm/wrapper/ext)}x)) { + $skip_confirm = 1; + } + if (!$nocopy) { $copylink=(<<ENDCOPY); -<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");'> -<font size="-2" color="#000099">$lt{'cp'}</font></a> +<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a> ENDCOPY } if (!$nocut) { $cutlink=(<<ENDCUT); -<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");'> -<font size="-2" color="#550044">$lt{'ct'}</font></a> +<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a> ENDCUT } - $line.=(<<END); - <form name="entry_$index" action="/adm/coursedocs" method="post"> + $form_start = (<<END); + <form action="/adm/coursedocs" method="post"> <input type="hidden" name="${type}path" value="$path" /> <input type="hidden" name="${type}symb" value="$symb" /> <input type="hidden" name="setparms" value="$orderidx" /> <input type="hidden" name="changeparms" value="0" /> +END + $form_end = '</form>'; + $line.=(<<END); <td> - <table border='0' cellspacing='2' cellpadding='0'> + <table class="LC_docs_entry_move"> <tr> - <td bgcolor="#DDDDDD"> + <td> <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a> </td> </tr> <tr> - <td bgcolor="#DDDDDD"> + <td> <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a> </td> </tr> </table> </td> <td> + $form_start $selectbox + $form_end </td> -<td bgcolor="#DDDDDD"> - <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");'><font size="-2" color="#990000">$lt{'rm'}</font></a> +<td class="LC_docs_entry_commands"> + <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a> $cutlink - <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");'><font size="-2" color="#009900">$lt{'rn'}</font></a> + <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a> $copylink </td> END @@ -1851,7 +1855,9 @@ END &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); } } - $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-; + + my $orig_url = $url; + my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}); if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { my $symb=&Apache::lonnet::symbclean( &Apache::lonnet::declutter('uploaded/'. @@ -1874,6 +1880,7 @@ END } } elsif ($url=~m|^/ext/|) { $url='/adm/wrapper'.$url; + $external = 1; } if (&Apache::lonnet::symbverify($symb,$url)) { $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); @@ -1887,7 +1894,7 @@ END $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); } } - my $parameterset=' '; + my ($parameterset,$rand_order_text) = (' ', ' '); if ($isfolder || $extension eq 'sequence') { my $foldername=&escape($foldertitle); my $folderpath=$env{'form.folderpath'}; @@ -1899,15 +1906,20 @@ END .':'.((&LONCAPA::map::getparameter($orderidx, 'parameter_hiddenresource'))[0]=~/^yes$/i) .':'.((&LONCAPA::map::getparameter($orderidx, - 'parameter_encrypturl'))[0]=~/^yes$/i); + 'parameter_encrypturl'))[0]=~/^yes$/i) + .':'.((&LONCAPA::map::getparameter($orderidx, + 'parameter_randomorder'))[0]=~/^yes$/i); $url.='folderpath='.&escape($folderpath).$cpinfo; $parameterset='<label>'.&mt('Randomly Pick: '). - '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'. + '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'. (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]. '" />'. -'<font size="-2"><a href="javascript:void(0)">'.&mt('Save').'</a></font></label>'; - +'<a href="javascript:void(0)">'.&mt('Save').'</a></label>'; + my $ro_set= + ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':''); + $rand_order_text =' +<nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>'; } if ($ispage) { my $pagename=&escape($pagetitle); @@ -1927,10 +1939,19 @@ END $url.='pagepath='.&escape($pagepath). '&pagesymb='.&escape($symb).$cpinfo; } - $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon. - '" class="LC_icon" /></a></td>'. - "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title. - ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>"; + if ($external) { + my $form = ($folder =~ /^default/)? 'newext' : 'supnewext'; + $external = ' <a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>'; + } else { + undef($external); + } + $line.=' + <td class="LC_docs_entry_icon"> + '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').' + </td> + <td class="LC_docs_entry_title"> + '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external." + </td>"; if (($allowed) && ($folder!~/^supplemental/)) { my %lt=&Apache::lonlocal::texthash( 'hd' => 'Hidden', @@ -1940,14 +1961,21 @@ END my $hidtext= ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(<<ENDPARMS); -<td bgcolor="#BBBBFF"><font size='-2'> -<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td> -<td bgcolor="#BBBBFF"><font size='-2'> -<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td> -<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td> + <td class="LC_docs_entry_parameter"> + $form_start + <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> + $form_end + </td> + <td class="LC_docs_entry_parameter"> + $form_start + <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> + $form_end + </td> + <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td> + <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td> ENDPARMS } - $line.="</form></tr>"; + $line.="</tr>"; return $line; } @@ -2274,10 +2302,10 @@ ENDHEADERS 'lastrevisiondate') ). '</td>'. - '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '. + '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '. '<font size="+1">'.$currentversion.'</font>'. - '</nobr></td>'. - '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '. + '</span></td>'. + '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '. '<font size="+1">'); # Used in course my $usedversion=$hash{'version_'.$linkurl}; @@ -2286,8 +2314,8 @@ ENDHEADERS } else { $r->print($currentversion); } - $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'. - '<nobr>Use: '); + $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'. + '<span class="LC_nobreak">Use: '); # Set version $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, 'set_version_'.$linkurl, @@ -2296,7 +2324,7 @@ ENDHEADERS '' => '', 'mostrecent' => 'most recent', map {$_,$_} (1..$currentversion)))); - $r->print('</nobr></td></tr><tr><td></td>'); + $r->print('</span></td></tr><tr><td></td>'); my $lastold=1; for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; @@ -2320,7 +2348,7 @@ ENDHEADERS my $cols_output = 1; for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print('<nobr><a href="'.&Apache::lonnet::clutter($url). + $r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url). '">'.&mt('Version').' '.$prevvers.'</a> ('. &Apache::lonlocal::locallocaltime( &Apache::lonnet::metadata($url, @@ -2333,7 +2361,7 @@ ENDHEADERS '&versionone='.$prevvers. '">'.&mt('Diffs').'</a>'); } - $r->print('</nobr><br />'); + $r->print('</span><br />'); if (++$entries_count % $entries_per_col == 0) { $r->print('</font></td>'); if ($cols_output != 4) { @@ -2395,7 +2423,7 @@ sub changewarning { $message='Changes will become active for your current session after [_1], or the next time you log in.'; } $r->print("\n\n". -'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". +'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. '<input type="hidden" name="orgurl" value="'.$url. '" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'. @@ -2411,7 +2439,7 @@ sub init_breadcrumbs { my ($form,$text)=@_; &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs", - text=>&Apache::loncommon::course_type()." Documents", + text=>"Edit ".&Apache::loncommon::course_type(), faq=>273, bug=>'Instructor Interface', help => 'Docs_Adding_Course_Doc'}); @@ -2546,9 +2574,13 @@ sub handler { if (($env{'form.uploaddoc.filename'}) && ($env{'form.cmd'}=~/^upload_(\w+)/)) { # Process file upload - phase one - upload and parse primary file. + undef($hadchanges); $upload_result = &process_file_upload(\$upload_output,$coursenum, $coursedom,\%allfiles, \%codebase,$1); + if ($hadchanges) { + &mark_hash_old(); + } if ($upload_result eq 'phasetwo') { $r->print($upload_output); } @@ -2650,6 +2682,7 @@ sub handler { 'bull' => 'Bulletin Board', 'mypi' => 'My Personal Info', 'grpo' => 'Group Files', + 'rost' => 'Course Roster', 'abou' => 'About User', 'imsf' => 'Import IMS package', 'file' => 'File', @@ -2720,24 +2753,31 @@ ENDCOURSEVERIFY &mt('Editing the Table of Contents for your '.$type))); } # --------------------------------------------------------- Standard documents - $r->print('<table border=2 cellspacing=4 cellpadding=4>'); + $r->print('<table class="LC_docs_documents">'); + if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#BBBBBB">'); + $r->print('<tr><td class="LC_docs_document">'); # '<h2>'.&mt('Main Course Documents'). # ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); my $folder=$env{'form.folder'}; if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents')); + $uploadtag = '<input type="hidden" name="folderpath" value="'. + &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; } my $postexec=''; if ($folder eq 'default') { - $r->print('<script>this.window.name="loncapaclient";</script>'); + $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>'); } else { #$postexec='self.close();'; } $hadchanges=0; - &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output); + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed, + $upload_output); + if ($error) { + $r->print('<p><span class="LC_error">'.$error.'</span></p>'); + } if ($hadchanges) { &mark_hash_old() } @@ -2752,54 +2792,56 @@ ENDCOURSEVERIFY } my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; $r->print(<<ENDFORM); -<table cellspacing=4 cellpadding=4><tr> -<th bgcolor="#DDDDDD">$lt{'uplm'}</th> -<th bgcolor="#DDDDDD">$lt{'impp'}</th> -<th bgcolor="#DDDDDD">$lt{'spec'}</th> +<table class="LC_docs_adddocs"> +<tr> +<th>$lt{'uplm'}</th> +<th>$lt{'impp'}</th> +<th>$lt{'spec'}</th> </tr> -<tr><td bgcolor="#DDDDDD"> +<tr> +<td> $lt{'file'}:<br /> <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="40"> +<input type="file" name="uploaddoc" size="40" /> <br /> $lt{'title'}:<br /> -<input type="text" size="50" name="comment"> +<input type="text" size="50" name="comment" /> $uploadtag -<input type="hidden" name="cmd" value="upload_default"> +<input type="hidden" name="cmd" value="upload_default" /> <br /> -<nobr> +<span class="LC_nobreak"> <label>$lt{'parse'}? <input type="checkbox" name="parserflag" /> </label> -</nobr> +</span> <br /> <br /> -<nobr> -<input type="submit" value="$lt{'upld'}"> +<span class="LC_nobreak"> +<input type="submit" value="$lt{'upld'}" /> $help{'Uploading_From_Harddrive'} -</nobr> +</span> </form> </td> -<td bgcolor="#DDDDDD"> +<td> <form action="/adm/coursedocs" method="post" name="simpleeditdefault"> $lt{'pubd'}<br /> $uploadtag -<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" /> +<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" /> <br /> -<nobr> -<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" /> +<span class="LC_nobreak"> +<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" /> $help{'Importing_LON-CAPA_Resource'} -</nobr> +</span> <br /> -<input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" /> -<p> +<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" /> <hr /> +<p> $lt{'copm'}<br /> <input type="text" size="40" name="importmap" /><br /> -<nobr><input type=button +<span class="LC_nobreak"><input type="button" onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" /> -$help{'Load_Map'}</nobr> +$help{'Load_Map'}</span> </p> </form> <hr /> @@ -2813,10 +2855,10 @@ ENDFORM <form action="/adm/coursedocs" method="post" name="newext"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newext" type="button" onClick="javascript:makenewext('newext');" value="$lt{'extr'}" /> $help{'Adding_External_Resource'} -</nobr> +</span> </form> <br /><form action="/adm/imsimportdocs" method="post" name="ims"> <input type="hidden" name="folder" value="$folder" /> @@ -2824,113 +2866,122 @@ value="$lt{'extr'}" /> $help{'Adding_Ext </form> ENDFORM } - $r->print('</td><td bgcolor="#DDDDDD">'); + $r->print('</td><td>'); unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); $r->print(<<ENDFORM); <br /><form action="/adm/coursedocs" method="post" name="newfolder"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" value="$lt{'newf'}" />$help{'Adding_Folders'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newpage"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newpage" type="button" onClick="javascript:makenewpage(this.form,'$pageseq');" value="$lt{'newp'}" />$help{'Adding_Pages'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newsyl"> $uploadtag <input type="hidden" name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> -<nobr> +<span class="LC_nobreak"> <input name="newsyl" type="submit" value="$lt{'syll'}" /> $help{'Syllabus'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newnav"> $uploadtag <input type="hidden" name="importdetail" value="Navigate Content=/adm/navmaps" /> -<nobr> +<span class="LC_nobreak"> <input name="newnav" type="submit" value="$lt{'navc'}" /> $help{'Navigate_Content'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newsmppg"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newsmppg" type="button" value="$lt{'sipa'}" onClick="javascript:makesmppage();" /> $help{'Simple Page'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newsmpproblem" type="button" value="$lt{'sipr'}" onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newdropbox"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newdropbox" type="button" value="$lt{'drbx'}" onClick="javascript:makedropbox();" /> -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newexamupload"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newexamupload" type="button" value="$lt{'scuf'}" onClick="javascript:makeexamupload();" /> $help{'Score_Upload_Form'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newbul"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newbulletin" type="button" value="$lt{'bull'}" onClick="javascript:makebulboard();" /> $help{'Bulletin Board'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newaboutme"> $uploadtag <input type="hidden" name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme" /> -<nobr> +<span class="LC_nobreak"> <input name="newaboutme" type="submit" value="$lt{'mypi'}" /> $help{'My Personal Info'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newaboutsomeone" type="button" value="$lt{'abou'}" onClick="javascript:makeabout();" /> -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles"> $uploadtag <input type="hidden" name="importdetail" value="Group Files=/adm/$coursedom/$coursenum/aboutme" /> -<nobr> +<span class="LC_nobreak"> <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> $help{'Group Files'} -</nobr> +</span> +</form> +<br /><form action="/adm/coursedocs" method="post" name="newroster"> +$uploadtag +<input type="hidden" name="importdetail" +value="Course Roster=/adm/viewclasslist" /> +<span class="LC_nobreak"> +<input name="newroster" type="submit" value="$lt{'rost'}" /> +$help{'Course Roster'} +</span> </form> ENDFORM } @@ -2939,19 +2990,19 @@ ENDFORM <form action="/adm/coursedocs" method="post" name="newsmpproblem"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newsmpproblem" type="button" value="$lt{'sipr'}" onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="newexamupload"> $uploadtag <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newexamupload" type="button" value="$lt{'scuf'}" onClick="javascript:makeexamupload();" /> $help{'Score_Upload_Form'} -</nobr> +</span> </form> ENDBLOCK } @@ -2961,7 +3012,7 @@ ENDBLOCK } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print('<tr><td bgcolor="#BBBBBB">'); + $r->print('<tr><td class="LC_docs_document">'); # '<h2>'.&mt('Supplemental Course Documents'). # ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); my $folder=$env{'form.folder'}; @@ -2973,7 +3024,10 @@ ENDBLOCK $env{'form.folderpath'}='supplemental&'. &escape(&mt('Supplemental '.$type.' Documents')); } - &editor($r,$coursenum,$coursedom,$folder,$allowed); + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed); + if ($error) { + $r->print('<p><span class="LC_error">'.$error.'</span></p>'); + } if ($allowed) { my $folderseq= '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. @@ -2981,86 +3035,92 @@ ENDBLOCK my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); $r->print(<<ENDSUPFORM); -<table cellspacing=4 cellpadding=4><tr> -<th bgcolor="#DDDDDD">$lt{'upls'}</th> -<th bgcolor="#DDDDDD">$lt{'spec'}</th> +<table class="LC_docs_adddocs"><tr> +<th>$lt{'upls'}</th> +<th>$lt{'spec'}</th> </tr> -<tr><td bgcolor="#DDDDDD"> +<tr><td> <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="40"> +<input type="file" name="uploaddoc" size="40" /> <br /> <br /> -<nobr> +<span class="LC_nobreak"> <label>$lt{'parse'}? <input type="checkbox" name="parserflag" /> </label> -</nobr> +</span> <br /><br /> $lt{'comment'}:<br /> <textarea cols=50 rows=4 name='comment'> </textarea> <br /> <input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="cmd" value="upload_supplemental"> -<nobr> -<input type="submit" value="$lt{'upld'}"> +<input type="hidden" name="cmd" value="upload_supplemental" /> +<span class="LC_nobreak"> +<input type="submit" value="$lt{'upld'}" /> $help{'Uploading_From_Harddrive'} -</nobr> +</span> </form> </td> -<td bgcolor="#DDDDDD"> +<td> <form action="/adm/coursedocs" method="post" name="supnewfolder"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" value="$lt{'newf'}" /> $help{'Adding_Folders'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="supnewext"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="" /> -<nobr> +<span class="LC_nobreak"> <input name="newext" type="button" onClick="javascript:makenewext('supnewext');" value="$lt{'extr'}" /> $help{'Adding_External_Resource'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="supnewsyl"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> -<nobr> +<span class="LC_nobreak"> <input name="newsyl" type="submit" value="$lt{'syll'}" /> $help{'Syllabus'} -</nobr> +</span> </form> <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme"> <input type="hidden" name="folderpath" value="$path" /> <input type="hidden" name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme" /> -<nobr> +<span class="LC_nobreak"> <input name="newaboutme" type="submit" value="$lt{'mypi'}" /> $help{'My Personal Info'} -</nobr> +</span> </form> </td></tr> </table></td></tr> ENDSUPFORM } } + $r->print('</table>'); if ($allowed) { - $r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>'); + $r->print(' +<form method="post" name="extimport" action="/adm/coursedocs"> + <input type="hidden" name="title" /> + <input type="hidden" name="url" /> + <input type="hidden" name="useform" /> + <input type="hidden" name="residx" /> +</form>'); } - $r->print('</table>'); } else { unless ($upload_result eq 'phasetwo') { # -------------------------------------------------------- This is showdoc mode $r->print("<h1>".&mt('Uploaded Document').' - '. &Apache::lonnet::gettitle($r->uri).'</h1><p>'. -&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>". - &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>'); +&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>". + &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>'); } } } @@ -3072,10 +3132,32 @@ ENDSUPFORM sub editing_js { my ($udom,$uname) = @_; my $now = time(); + my %lt = &Apache::lonlocal::texthash( + p_mnf => 'Name of New Folder', + t_mnf => 'New Folder', + p_mnp => 'Name of New Page', + t_mnp => 'New Page', + p_mxu => 'Listed Title for the Uploaded Score', + p_msp => 'Listed Title for the Page', + p_msb => 'Listed Title for the Problem', + p_mdb => 'Listed Title for the Drop Box', + p_mbb => 'Listed Title for the Bulletin Board', + p_mab => "Enter user:domain for User's 'About Me' Page", + p_mab2 => "About [_99]", + p_mab_alrt1 => 'Not a valid user:domain', + p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', + p_chn => 'New Title', + p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!', + p_rmr2a => 'Remove[_99]', + p_rmr2b => '?[_99]', + p_ctr1 => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.', + p_ctr2a => 'Cut[_98]', + p_ctr2b => '?[_98]' + ); return <<ENDNEWSCRIPT; function makenewfolder(targetform,folderseq) { - var foldername=prompt('Name of New Folder','New Folder'); + var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}'); if (foldername) { targetform.importdetail.value=escape(foldername)+"="+folderseq; targetform.submit(); @@ -3083,7 +3165,7 @@ function makenewfolder(targetform,folder } function makenewpage(targetform,folderseq) { - var pagename=prompt('Name of New Page','New Page'); + var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}'); if (pagename) { targetform.importdetail.value=escape(pagename)+"="+folderseq; targetform.submit(); @@ -3092,11 +3174,22 @@ function makenewpage(targetform,folderse function makenewext(targetname) { this.document.forms.extimport.useform.value=targetname; + this.document.forms.extimport.title.value=''; + this.document.forms.extimport.url.value=''; + this.document.forms.extimport.residx.value=''; + window.open('/adm/rat/extpickframe.html'); +} + +function edittext(targetname,residx,title,url) { + this.document.forms.extimport.useform.value=targetname; + this.document.forms.extimport.residx.value=residx; + this.document.forms.extimport.url.value=url; + this.document.forms.extimport.title.value=title; window.open('/adm/rat/extpickframe.html'); } function makeexamupload() { - var title=prompt('Listed Title for the Uploaded Score'); + var title=prompt('$lt{"p_mxu"}'); if (title) { this.document.forms.newexamupload.importdetail.value= escape(title)+'=/res/lib/templates/examupload.problem'; @@ -3105,7 +3198,7 @@ function makeexamupload() { } function makesmppage() { - var title=prompt('Listed Title for the Page'); + var title=prompt('$lt{"p_msp"}'); if (title) { this.document.forms.newsmppg.importdetail.value= escape(title)+'=/adm/$udom/$uname/$now/smppg'; @@ -3114,7 +3207,7 @@ function makesmppage() { } function makesmpproblem() { - var title=prompt('Listed Title for the Problem'); + var title=prompt('$lt{"p_msb"}'); if (title) { this.document.forms.newsmpproblem.importdetail.value= escape(title)+'=/res/lib/templates/simpleproblem.problem'; @@ -3123,7 +3216,7 @@ function makesmpproblem() { } function makedropbox() { - var title=prompt('Listed Title for the Drop Box'); + var title=prompt('$lt{"p_mdb"}'); if (title) { this.document.forms.newdropbox.importdetail.value= escape(title)+'=/res/lib/templates/DropBox.problem'; @@ -3132,7 +3225,7 @@ function makedropbox() { } function makebulboard() { - var title=prompt('Listed Title for the Bulletin Board'); + var title=prompt('$lt{"p_mbb"}'); if (title) { this.document.forms.newbul.importdetail.value= escape(title)+'=/adm/$udom/$uname/$now/bulletinboard'; @@ -3141,20 +3234,20 @@ function makebulboard() { } function makeabout() { - var user=prompt("Enter user:domain for User's 'About Me' Page"); + var user=prompt('$lt{"p_mab"}'); if (user) { var comp=new Array(); comp=user.split(':'); if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { if ((comp[0]) && (comp[1])) { this.document.forms.newaboutsomeone.importdetail.value= - 'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; + '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; this.document.forms.newaboutsomeone.submit(); } else { - alert("Not a valid user:domain"); + alert("$lt{'p_mab_alrt1'}"); } } else { - alert("Please enter both user and domain in the format user:domain"); + alert("$lt{'p_mab_alrt2'}"); } } } @@ -3171,13 +3264,12 @@ function finishpick() { var title=this.document.forms.extimport.title.value; var url=this.document.forms.extimport.url.value; var form=this.document.forms.extimport.useform.value; - eval - ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+ - '";this.document.forms.'+form+'.submit();'); + var residx=this.document.forms.extimport.residx.value; + eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();'); } function changename(folderpath,index,oldtitle,container,pagesymb) { - var title=prompt('New Title',oldtitle); + var title=prompt('$lt{"p_chn"}',oldtitle); if (title) { this.document.forms.renameform.markcopy.value=-1; this.document.forms.renameform.title.value=title; @@ -3193,8 +3285,8 @@ function changename(folderpath,index,old } } -function removeres(folderpath,index,oldtitle,container,pagesymb) { - if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { +function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) { + if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { this.document.forms.renameform.markcopy.value=-1; this.document.forms.renameform.cmd.value='del_'+index; if (container == 'sequence') { @@ -3208,8 +3300,8 @@ function removeres(folderpath,index,oldt } } -function cutres(folderpath,index,oldtitle,container,pagesymb,folder) { - if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { +function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) { + if (skip_confirm || confirm('$lt{"p_ctr1"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { this.document.forms.renameform.cmd.value='cut_'+index; this.document.forms.renameform.markcopy.value=index; this.document.forms.renameform.copyfolder.value=folder+'.'+container;