--- loncom/interface/londocs.pm	2012/11/14 01:09:32	1.507
+++ loncom/interface/londocs.pm	2012/11/16 23:37:15	1.509
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.507 2012/11/14 01:09:32 raeburn Exp $
+# $Id: londocs.pm,v 1.509 2012/11/16 23:37:15 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/\&gt\;\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 = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+        $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($folderpath,'<>&"').'" />';
     }
     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++;
     }
@@ -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);
@@ -2287,7 +2234,7 @@ sub entryline {
 	    $skip_confirm = 1;
 	}
 
-        if ($nocopy) {
+	if ($nocopy) {
             $copylink=(<<ENDCOPY);
 <span style="visibility: hidden;">$lt{'cp'}</span>
 ENDCOPY
@@ -2296,7 +2243,7 @@ ENDCOPY
 <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
         }
-        if ($nocut) {
+	if ($nocut) {
             $cutlink=(<<ENDCUT);
 <span style="visibility: hidden;">$lt{'ct'}</span>
 ENDCUT
@@ -2458,6 +2405,9 @@ $form_common."\n".
 $form_start.
 $form_common.'
 <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';
+    } elsif ($supplementalflag && !$allowed) {
+        $url .= ($url =~ /\?/) ? 'amp;':'?';
+        $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -2488,17 +2438,25 @@ $form_common.'
             <span class="LC_nobreak">
             <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>
             <input type="text" size="40" name="exttitle" value="$title" />
-            $uploadtag
+            $pathitem
             <input type="hidden" name="importdetail" value="" />
             <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
             </span>
             </fieldset>
             </form>
 EXTLNK
-        } else { 
+        } 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,
@@ -3286,7 +3244,7 @@ sub handler {
     my $addentries = {};
     my $container;
     my $containertag;
-    my $uploadtag;
+    my $pathitem;
 
 # Do we directly jump somewhere?
 
@@ -3419,7 +3377,7 @@ sub handler {
             $container='page';
             $containertag = '<input type="hidden" name="pagepath" value="" />'.
 	                    '<input type="hidden" name="pagesymb" value="" />';
-            $uploadtag = 
+            $pathitem = 
                 '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
 	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
                 '<input type="hidden" name="folderpath" value="" />';
@@ -3433,7 +3391,7 @@ sub handler {
                 }
             }
             $containertag = '<input type="hidden" name="folderpath" value="" />';
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+            $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
         if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
            $showdoc='/'.$1;
@@ -3678,7 +3636,7 @@ IMSFORM
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
 	<span class="LC_nobreak" style="float:left">
@@ -3708,7 +3666,7 @@ FUFORM
 
 SEDFFORM
 	my @importpubforma = (
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
@@ -3726,7 +3684,7 @@ SEDFFORM
       <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
       $lt{'title'}:<br />
       <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-      $uploadtag
+      $pathitem
       <br />
       <input type="hidden" name="importdetail" value="" />
       <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
@@ -3751,8 +3709,8 @@ ERFORM
  </form>
 
 HIDDENFORM
-        $r->print(&makesimpleeditform($uploadtag)."\n".
-                  &makedocslogform($uploadtag."\n".
+        $r->print(&makesimpleeditform($pathitem)."\n".
+                  &makedocslogform($pathitem."\n".
                                    '<input type="hidden" name="folder" value="'.
                                    $env{'form.folder'}.'" />'."\n"));
     }
@@ -3775,7 +3733,7 @@ HIDDENFORM
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.
+           $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
@@ -3800,7 +3758,7 @@ HIDDENFORM
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
@@ -3810,7 +3768,7 @@ NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
 	$help{'Simple Page'}
@@ -3820,7 +3778,7 @@ NSPFORM
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
 	$help{'Simple Problem'}
@@ -3831,7 +3789,7 @@ NSPROBFORM
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
 	</form>
@@ -3840,7 +3798,7 @@ NDBFORM
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
@@ -3850,7 +3808,7 @@ NEXUFORM
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
@@ -3860,7 +3818,7 @@ NBFORM
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
@@ -3871,7 +3829,7 @@ NAMFORM
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
@@ -3881,7 +3839,7 @@ NASOFORM
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
@@ -3913,7 +3871,7 @@ NPFORM
 
 	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<input type="hidden" name="active" value="aa" />
 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
@@ -3923,7 +3881,7 @@ NFFORM
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
@@ -3935,7 +3893,7 @@ NSYLFORM
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
@@ -3989,7 +3947,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('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -4014,12 +3972,12 @@ unless ($env{'form.pagepath'}) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
        $env{'form.pagepath'} = '';
+       $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
 
-	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-
 	my $supupdocform=(<<SUPDOCFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
@@ -4037,7 +3995,7 @@ unless ($env{'form.pagepath'}) {
 	$lt{'comment'}:<br />
 	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_supplemental" />
         <input type='submit' value="$lt{'upld'}" />
         </form>
@@ -4046,7 +4004,7 @@ SUPDOCFORM
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
 	<input type="hidden" name="active" value="ee" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
 	$help{'Adding_Folders'}
@@ -4064,8 +4022,8 @@ SNFFORM
         <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
         $lt{'title'}:<br />
         <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-        $uploadtag
         <br />
+        $pathitem
         <input type="hidden" name="importdetail" value="" />
         <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
         </fieldset>
@@ -4075,7 +4033,7 @@ ERFORM
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
@@ -4086,7 +4044,7 @@ SNSFORM
 	my $supnewaboutmeform=(<<SNAMFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
@@ -4116,14 +4074,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('<p><span class="LC_error">'.$error.'</span></p>');
            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$uploadtag);
+                            $supplementalflag,'',$iconpath,$pathitem);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }