--- loncom/interface/londocs.pm	2005/11/17 19:37:30	1.213
+++ loncom/interface/londocs.pm	2006/01/27 23:14:20	1.220
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.213 2005/11/17 19:37:30 albertel Exp $
+# $Id: londocs.pm,v 1.220 2006/01/27 23:14:20 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);
@@ -1401,6 +1401,7 @@ sub entryline {
 	    $foldertitle;
     }
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/\\/\\\\/g;
     my $line='<tr>';
 # Edit commands
     my $container;
@@ -1555,7 +1556,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/'.
@@ -1588,7 +1589,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.='&' };
@@ -2263,6 +2264,15 @@ function makesmpproblem() {
    }
 }
 
+function makedropbox() {
+   var title=prompt('Listed Title for the Drop Box');
+   if (title) { 
+    this.document.forms.newdropbox.importdetail.value=
+        title+'=/res/lib/templates/DropBox.problem';
+    this.document.forms.newdropbox.submit();
+   }
+}
+
 function makebulboard() {
    var title=prompt('Listed Title for the Bulletin Board');
    if (title) {
@@ -2478,6 +2488,7 @@ ENDNEWSCRIPT
                 'navc' => 'Navigate Contents',
                 'sipa' => 'Simple Page',
                 'sipr' => 'Simple Problem',
+                'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
@@ -2530,9 +2541,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',
@@ -2634,7 +2645,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>
@@ -2644,7 +2655,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>
@@ -2653,7 +2664,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>
@@ -2662,7 +2673,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">
@@ -2671,7 +2682,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">
@@ -2680,7 +2691,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>
@@ -2688,7 +2699,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>
@@ -2696,7 +2707,15 @@ $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="newdropbox">
+$uploadtag      
+<input type=hidden name="importdetail" value="">
+<nobr>          
+<input name="newdropbox" type="button" value="$lt{'drbx'}"
+onClick="javascript:makedropbox();" />
+</nobr>         
+</form> 
+<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2705,7 +2724,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>
@@ -2714,7 +2733,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">
@@ -2723,7 +2742,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>
@@ -2743,7 +2762,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>
@@ -2816,7 +2835,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>
@@ -2825,7 +2844,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">
@@ -2834,7 +2853,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">