--- loncom/interface/londocs.pm	2003/02/14 19:35:54	1.49
+++ loncom/interface/londocs.pm	2003/05/01 02:20:17	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.49 2003/02/14 19:35:54 www Exp $
+# $Id: londocs.pm,v 1.53 2003/05/01 02:20:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -179,6 +179,20 @@ sub editor {
 # Store the changed version
 		&storemap($coursenum,$coursedom,$folder.'.sequence');
             }
+# Loading a complete map
+	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
+              foreach
+(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+                   my $idx=$#Apache::lonratedt::resources;
+                   $idx++;
+                   $Apache::lonratedt::resources[$idx]=$_;
+                   $Apache::lonratedt::order
+                            [$#Apache::lonratedt::order+1]=$idx;
+                }
+
+# Store the changed version
+		&storemap($coursenum,$coursedom,$folder.'.sequence');
+           }
        }
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
@@ -188,7 +202,7 @@ sub editor {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed));
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
            $idx++;
         }
         $r->print('</table>');
@@ -198,7 +212,7 @@ sub editor {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
      &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
@@ -249,6 +263,16 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
+    if ($residx) {
+       $url.=(($url=~/\?/)?'&':'?').'symb='.
+       &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+          &Apache::lonnet::declutter('uploaded/'.
+           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
+           $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
+           '.sequence').
+           '___'.$residx.'___'.
+	   &Apache::lonnet::declutter($url)));
+    }
     if ($isfolder) { $url.='&foldername='.
        &Apache::lonnet::escape($foldertitle); }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
@@ -610,12 +634,20 @@ ENDCOURSEVERIFY
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }
+       my $postexec='';
+       if ($folder eq 'default') {
+	   $r->print('<script>this.window.name="loncapaclient";</script>');
+       } else {
+           $postexec='self.close();';
+       }
        $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($hadchanges) {
-	   $r->print('<form method="post" action="/adm/roles">'.
-'<input type=hidden name=orgurl value="/adm/coursedocs" /><input type=hidden name=selectrole value=1 /><h3><font color="red">Changes will become active for your current session after <input type="submit" name="'.
-$ENV{'request.role'}.'" value="re-initializing course" />, or the next time you log in.</font></h3></form>');
+	   $r->print(
+'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
+'<form method="post" action="/adm/roles" target="loncapaclient">'.
+'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
+$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.</font></h3></form>');
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
@@ -641,11 +673,18 @@ Title:<br />
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
-$help{'Importing_LON-CAPA_Resource'}</form>
+$help{'Importing_LON-CAPA_Resource'}<br />
+<input type="text" size="20" name="importmap">
+<input type=button 
+onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+value="Browse"><input type="submit" name="loadmap" value="Load Map">
+</form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folder" value="$folder">
@@ -736,11 +775,18 @@ ENDFORM
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
+<br />
+<input type="text" size="20" name="importmap">
+<input type=button 
+onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
+value="Browse"><input type="submit" name="loadmap" value="Load Map">
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">