--- loncom/interface/londocs.pm 2012/12/13 02:45:27 1.484.2.15 +++ loncom/interface/londocs.pm 2012/12/13 04:15:30 1.484.2.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.15 2012/12/13 02:45:27 raeburn Exp $ +# $Id: londocs.pm,v 1.484.2.18 2012/12/13 04:15:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -312,61 +312,6 @@ sub group_import { return &storemap($coursenum, $coursedom, $folder.'.'.$container,1); } -sub breadcrumbs { - my ($allowed,$crstype)=@_; - &Apache::lonhtmlcommon::clear_breadcrumbs(); - my (@folders); - if ($env{'form.pagepath'}) { - @folders = split('&',$env{'form.pagepath'}); - } else { - @folders=split('&',$env{'form.folderpath'}); - } - my $folderpath; - my $plain=''; - my $randompick=-1; - my $isencrypted=0; - my $ishidden=0; - my $is_random_order=0; - while (@folders) { - my $folder=shift(@folders); - my $foldername=shift(@folders); - if ($folderpath) {$folderpath.='&';} - $folderpath.=$folder.'&'.$foldername; - my $url; - if ($allowed) { - $url = '/adm/coursedocs?folderpath='; - } else { - $url = '/adm/supplemental?folderpath='; - } - $url .= &escape($folderpath); - 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; } - if ($folder eq 'supplemental') { - $name = &mt('Supplemental '.$crstype.' Content'); - } - &Apache::lonhtmlcommon::add_breadcrumb( - {'href'=>$url, - 'title'=>$name, - 'text'=>$name, - 'no_mt'=>1, - }); - $plain.=$name.' > '; - } - $plain=~s/\>\;\s*$//; - return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', - undef, undef, 1 ),$randompick,$ishidden, - $isencrypted,$plain,$is_random_order); -} - sub log_docs { return &Apache::lonnet::write_log('course','docslog',@_); } @@ -454,7 +399,8 @@ sub docs_change_log { if ($folderpath eq '') { $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents')); } - $pathitem = ''; + $pathitem = ''; } my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; my $jumpto = $readfile; @@ -463,7 +409,8 @@ sub docs_change_log { if ($supplementalflag) { $tid = 2; } - my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); + my ($breadcrumbtrail) = + &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); $r->print($breadcrumbtrail. &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, $readfile)); @@ -1743,12 +1690,12 @@ sub handle_edit_cmd { sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, - $supplementalflag,$orderhash,$iconpath,$uploadtag)=@_; + $supplementalflag,$orderhash,$iconpath,$pathitem)=@_; my $container= ($env{'form.pagepath'}) ? 'page' : 'sequence'; my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) = - &breadcrumbs($allowed,$crstype); + &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); $r->print($breadcrumbtrail); my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container"; @@ -1912,7 +1859,7 @@ sub editor { unless ($name) { $idx++; next; } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, $coursenum,$coursedom,$crstype, - $uploadtag,$supplementalflag); + $pathitem,$supplementalflag); $idx++; $shown++; } @@ -1961,7 +1908,7 @@ sub editor { &Apache::lonhtmlcommon::add_item_funclist( ''. - ''.$funcname.''. + ''.$funcname.''. ''.$funcname.''). &Apache::lonhtmlcommon::end_funclist())); } @@ -2130,7 +2077,7 @@ sub is_supplemental_title { sub entryline { my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, - $crstype,$uploadtag,$supplementalflag)=@_; + $crstype,$pathitem,$supplementalflag)=@_; my ($foldertitle,$pagetitle,$renametitle); if (&is_supplemental_title($title)) { ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); @@ -2163,9 +2110,13 @@ sub entryline { $esc_path=&escape($env{'form.pagepath'}); $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); } + my $isexternal; if (!$supplementalflag && $residx) { my $currurl = $url; $currurl =~ s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; + if ($currurl =~ m{^/adm/wrapper/ext/}) { + $isexternal = 1; + } my $path = 'uploaded/'. $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. $env{'course.'.$env{'request.course.id'}.'.num'}.'/'; @@ -2270,9 +2221,7 @@ sub entryline { $nocopy=1; } } - my $copylink=' '; - my $cutlink=' '; - my $removelink=' '; + my ($copylink,$cutlink,$removelink,$renamelink); my $skip_confirm = 0; if ( $folder =~ /^supplemental/ @@ -2281,26 +2230,40 @@ sub entryline { |/aboutme$ |/navmaps$ |/bulletinboard$ - |\.html$ - |^/adm/wrapper/ext)}x)) { + |\.html$)}x) + || $isexternal) { $skip_confirm = 1; } - - if (!$nocopy) { - $copylink=(<$lt{'cp'} +ENDCOPY + } else { + $copylink=(<$lt{'cp'} ENDCOPY } - if (!$nocut) { - $cutlink=(<$lt{'ct'} +ENDCUT + } else { + $cutlink=(<$lt{'ct'} ENDCUT } - if (!$noremove) { + if ($noremove) { + $removelink=(<$lt{'rm'} +ENDREM + } else { $removelink=(<$lt{'rm'} ENDREM } + $renamelink=(<$lt{'rn'} +ENDREN $form_start = '
'; @@ -2330,11 +2293,12 @@ END $selectbox $form_end - + $removelink +$renamelink $cutlink - $lt{'rn'} $copylink + END @@ -2441,6 +2405,9 @@ $form_common."\n". $form_start. $form_common.'
'; + } elsif ($supplementalflag && !$allowed) { + $url .= ($url =~ /\?/) ? 'amp;':'?'; + $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); } if ($ispage) { my $pagename=&escape($pagetitle); @@ -2471,7 +2438,7 @@ $form_common.' $lt{'ti'}  - $uploadtag + $pathitem @@ -2481,7 +2448,15 @@ EXTLNK } else { my ($cfile,$home,$switchserver,$forceedit,$forceview) = &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url); - if (($cfile ne '') && ($symb ne '')) { + my $geteditlink; + if ($supplementalflag) { + if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") { + $geteditlink = 1; + } + } elsif (($cfile ne '') && ($symb ne '')) { + $geteditlink = 1; + } + if ($geteditlink) { my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home, $switchserver, @@ -3268,7 +3243,7 @@ sub handler { my $addentries = {}; my $container; my $containertag; - my $uploadtag; + my $pathitem; # Do we directly jump somewhere? @@ -3401,7 +3376,7 @@ sub handler { $container='page'; $containertag = ''. ''; - $uploadtag = + $pathitem = ''. ''. ''; @@ -3415,7 +3390,7 @@ sub handler { } } $containertag = ''; - $uploadtag = ''; + $pathitem = ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; @@ -3658,7 +3633,7 @@ IMSFORM
$lt{'title'}:
- $uploadtag + $pathitem
@@ -3689,7 +3664,7 @@ FUFORM SEDFFORM my @simpleeditdefaultforma = ( - { ''.$lt{srch}.'' => "$uploadtag$lt{'srch'}" }, + { ''.$lt{srch}.'' => "$pathitem$lt{'srch'}" }, { ''.$lt{impo}.'' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" }, { ''.$lt{lnks}.'' => "$lt{'lnks'}" }, { ''.$lt{impm}.'' => $importpubform } @@ -3707,7 +3682,7 @@ SEDFFORM
$lt{'title'}:
- $uploadtag + $pathitem
@@ -3732,8 +3707,8 @@ ERFORM HIDDENFORM - $r->print(&makesimpleeditform($uploadtag)."\n". - &makedocslogform($uploadtag."\n". + $r->print(&makesimpleeditform($pathitem)."\n". + &makedocslogform($pathitem."\n". ''."\n")); } @@ -3756,7 +3731,7 @@ HIDDENFORM $folder='default'; $savefolderpath = $env{'form.folderpath'}; $env{'form.folderpath'}='default&'.&escape(&mt('Content')); - $uploadtag = ''; } my $postexec=''; @@ -3783,7 +3758,7 @@ HIDDENFORM my $newnavform=(< - $uploadtag + $pathitem $lt{'navc'} @@ -3793,7 +3768,7 @@ NNFORM my $newsmppageform=(< - $uploadtag + $pathitem $lt{'sipa'} $help{'Simple Page'} @@ -3803,7 +3778,7 @@ NSPFORM my $newsmpproblemform=(< - $uploadtag + $pathitem $lt{'sipr'} $help{'Simple Problem'} @@ -3814,7 +3789,7 @@ NSPROBFORM my $newdropboxform=(< - $uploadtag + $pathitem $lt{'drbx'} @@ -3823,7 +3798,7 @@ NDBFORM my $newexuploadform=(< - $uploadtag + $pathitem $lt{'scuf'} $help{'Score_Upload_Form'} @@ -3833,7 +3808,7 @@ NEXUFORM my $newbulform=(< - $uploadtag + $pathitem $lt{'bull'} $help{'Bulletin Board'} @@ -3843,7 +3818,7 @@ NBFORM my $newaboutmeform=(< - $uploadtag + $pathitem $lt{'mypi'} @@ -3854,7 +3829,7 @@ NAMFORM my $newaboutsomeoneform=(< - $uploadtag + $pathitem $lt{'abou'} @@ -3864,7 +3839,7 @@ NASOFORM my $newrosterform=(< - $uploadtag + $pathitem $lt{'rost'} @@ -3906,7 +3881,7 @@ NFFORM my $newsylform=(< - $uploadtag + $pathitem $lt{'syll'} @@ -3918,7 +3893,7 @@ NSYLFORM my $newgroupfileform=(< - $uploadtag + $pathitem $lt{'grpo'} @@ -3973,7 +3948,7 @@ unless ($env{'form.pagepath'}) { $hadchanges=0; unless (($supplementalflag || $toolsflag)) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,\%orderhash,$iconpath,$uploadtag); + $supplementalflag,\%orderhash,$iconpath,$pathitem); if ($error) { $r->print('

'.$error.'

'); } @@ -3998,12 +3973,12 @@ unless ($env{'form.pagepath'}) { $env{'form.folderpath'} = $savefolderpath; } $env{'form.pagepath'} = ''; + $pathitem = ''; if ($allowed) { my $folderseq= '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence'; - my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - my $supupdocform=(< $lt{'upfi'} $help{'Uploading_From_Harddrive'} @@ -4021,7 +3996,7 @@ unless ($env{'form.pagepath'}) { $lt{'comment'}:

- + $pathitem @@ -4029,7 +4004,7 @@ unless ($env{'form.pagepath'}) { my $supnewfolderform=(< - + $pathitem $lt{'newf'} $help{'Adding_Folders'} @@ -4047,7 +4022,7 @@ SNFFORM
$lt{'title'}:
- $uploadtag + $pathitem
@@ -4098,14 +4073,14 @@ my %suporderhash = ( ); if ($supplementalflag) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,\%suporderhash,$iconpath,$uploadtag); + $supplementalflag,\%suporderhash,$iconpath,$pathitem); if ($error) { $r->print('

'.$error.'

'); } } } elsif ($supplementalflag) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,'',$iconpath,$uploadtag); + $supplementalflag,'',$iconpath,$pathitem); if ($error) { $r->print('

'.$error.'

'); }