--- loncom/interface/londocs.pm	2005/11/04 21:39:26	1.210
+++ loncom/interface/londocs.pm	2006/01/16 23:42:39	1.218
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.210 2005/11/04 21:39:26 albertel Exp $
+# $Id: londocs.pm,v 1.218 2006/01/16 23:42:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1373,7 +1373,7 @@ sub process_secondary_uploads {
     if (($folder eq 'default') || ($folder eq 'supplemental')) {
         $destination .= 'default/';
     } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
-        $destination .=  $1.'/';
+        $destination .=  $2.'/';
     }
     $destination .= $newidx;
     my ($url,$filename);
@@ -1453,7 +1453,24 @@ sub entryline {
                 'ct' => 'Cut',
 		'rn' => 'Rename',
 		'cp' => 'Copy');
+	my $nocopy=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;
+		}
+	    }
+	}
+        my $copylink=' ';
         if ($env{'form.pagepath'}) {
+           unless ($nocopy) {
+               $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ENDCOPY
+            }
             $line.=(<<END);
 <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
@@ -1477,10 +1494,15 @@ sub entryline {
 <font size="-2" color="#550044">$lt{'ct'}</font></a>
 <a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a>
-<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+$copylink
 END
         } else {
+           unless ($nocopy) {
+               $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ENDCOPY
+            }
             $line.=(<<END); 
 <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
@@ -1503,8 +1525,7 @@ END
 <font size="-2" color="#550044">$lt{'ct'}</font></a>
 <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a>
-<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+$copylink
 END
         }
     }
@@ -1534,7 +1555,7 @@ END
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
-    $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
+    $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
@@ -1567,7 +1588,7 @@ END
 	}
     }
     my $parameterset='&nbsp;';
-    if ($isfolder) {
+    if ($isfolder || $extension eq 'sequence') {
 	my $foldername=&Apache::lonnet::escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
@@ -1601,7 +1622,7 @@ END
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+        "<td bgcolor='#FFFFBB'><a href=\"$url\">$title</a></td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
@@ -2509,9 +2530,9 @@ $uploadtag
     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
 $exportbut
-</td><!-- <td bgcolor="#DDDDCC">
+</td><td bgcolor="#DDDDCC">
     <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-</td>--></tr></table>
+</td></tr></table>
 </form>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
@@ -2613,7 +2634,7 @@ $uploadtag
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
-<form action="/adm/imsimportdocs" method="post" name="ims">
+<br /><form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$folder" />
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
 </nobr>
@@ -2623,7 +2644,7 @@ ENDFORM
        $r->print('</td><td bgcolor="#DDDDDD">');
        unless ($env{'form.pagepath'}) {
            $r->print(<<ENDFORM);
-<form action="/adm/coursedocs" method="post" name="newfolder">
+<br /><form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2632,7 +2653,7 @@ onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newpage">
+<br /><form action="/adm/coursedocs" method="post" name="newpage">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2641,7 +2662,7 @@ onClick="javascript:makenewpage(this.for
 value="$lt{'newp'}" />$help{'Adding_Pages'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsyl">
+<br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
@@ -2650,7 +2671,7 @@ value="Syllabus=/public/$coursedom/$cour
  $help{'Syllabus'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newnav">
+<br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
@@ -2659,7 +2680,7 @@ value="Navigate Content=/adm/navmaps">
 $help{'Navigate_Content'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsmppg">
+<br /><form action="/adm/coursedocs" method="post" name="newsmppg">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2667,7 +2688,7 @@ $uploadtag
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2675,7 +2696,7 @@ $uploadtag
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newexamupload">
+<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2684,7 +2705,7 @@ onClick="javascript:makeexamupload();" /
 $help{'Score_Upload_Form'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newbul">
+<br /><form action="/adm/coursedocs" method="post" name="newbul">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2693,7 +2714,7 @@ onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newaboutme">
+<br /><form action="/adm/coursedocs" method="post" name="newaboutme">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
@@ -2702,7 +2723,7 @@ value="$plainname=/adm/$udom/$uname/abou
 $help{'My Personal Info'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2722,7 +2743,7 @@ $uploadtag
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newexamupload">
+<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2795,7 +2816,7 @@ onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" /> $help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="supnewext">
+<br /><form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2804,7 +2825,7 @@ onClick="javascript:makenewext('supnewex
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="supnewsyl">
+<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
@@ -2813,7 +2834,7 @@ value="Syllabus=/public/$coursedom/$cour
 $help{'Syllabus'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">