--- loncom/interface/londocs.pm	2003/02/14 19:35:54	1.49
+++ loncom/interface/londocs.pm	2003/06/08 01:46:41	1.59
@@ -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.59 2003/06/08 01:46:41 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)),'\"\<\>\&\'');
@@ -218,16 +232,18 @@ sub entryline {
 # Edit commands
     if ($allowed) {
        $line.=(<<END);
-<td><table border='0' cellspacing='0' cellpadding='0'>
-<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
+<td><table border='0' cellspacing='2' cellpadding='0'>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
 <img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
-<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
 <img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
-</table></td><td>
-<a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>
-<font size="-2">Remove</font></a>
+</table></td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$folder","$index","$renametitle");'>
+<font size="-2" color="#990000">Remove</font></a>
 <a href='javascript:changename("$folder","$index","$renametitle");'>
-<font size="-2">Rename</font></a></td>
+<font size="-2" color="#009900">Rename</font></a></td>
 END
     }
 # Figure out what kind of a resource this is
@@ -249,6 +265,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.
@@ -513,7 +539,13 @@ ENDHEADERS
     $iconpath = $r->dir_config('lonIconsURL') . "/";
 
     my $now=time;
-
+#
+# FIXME: hack to disable new problem
+#
+    my $noeggforyou='';
+    unless ($ENV{'user.debug'}) {
+	$noeggforyou='alert("Sorry, not implemented yet."); return 0;';
+    }
 # print screen
     $r->print(<<ENDDOCUMENT);
 <html>
@@ -548,6 +580,16 @@ function makesmppage() {
    }
 }
 
+function makesmpproblem() {
+   $noeggforyou
+   var title=prompt('Listed Title for the Problem');
+   if (title) { 
+    this.document.forms.newsmpproblem.importdetail.value=
+	title+'=/adm/wrapper/uploaded/$udom/$uname/$now.problem';
+    this.document.forms.newsmpproblem.submit();
+   }
+}
+
 function makebulboard() {
    var title=prompt('Listed Title for the Bulletin Board');
    if (title) {
@@ -575,6 +617,14 @@ function changename(folder,index,oldtitl
         this.document.forms.renameform.submit();
     }
 }
+
+function removeres(folder,index,oldtitle) {
+    if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
+	this.document.forms.renameform.cmd.value='del_'+index;
+	this.document.forms.renameform.folder.value=folder;
+        this.document.forms.renameform.submit();
+    }
+}
 </script>
 
 ENDNEWSCRIPT
@@ -610,12 +660,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';
@@ -629,75 +687,115 @@ $ENV{'request.role'}.'" value="re-initia
 <tr><td bgcolor="#DDDDDD">
 File:<br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="50">
+<input type="file" name="uploaddoc" size="40">
 <br />
-Title:<br /> 
+Title:<br />
 <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">
+<nobr>
  $help{'Uploading_From_Harddrive'}</form>
+</nobr>
 </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">
+<nobr>
 <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'}
+</nobr>
+<p>
+<hr />
+<input type="text" size="20" name="importmap">
+<input type=button 
+onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+value="Browse for Map"><input type="submit" name="loadmap" value="Load Map">
+</p>
+</form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" /> $help{'Adding_Folders'}
+value="New Folder" />$help{'Adding_Folders'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newext">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="External Resource" /> $help{'Adding_External_Resource'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<nobr>
 <input name="newsyl" type="submit" value="Syllabus" /> 
- $help{'Creating_From_Template'}</form>
+ $help{'Creating_From_Template'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
+<nobr>
 <input name="newnav" type="submit" value="Navigate Content" />
 $help{'Navigate_Content'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newsmppg" type="button" value="Simple Page"
 onClick="javascript:makesmppage();" /> $help{'Creating_From_Template'}
+</nobr>
+</form>
+<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newsmpproblem" type="button" value="Simple Problem"
+onClick="javascript:makesmpproblem();" />$help{'Creating_From_Template'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newbulletin" type="button" value="Bulletin Board"
 onClick="javascript:makebulboard();" />
-$help{'Creating_From_Template'}</form>
+$help{'Creating_From_Template'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
+<nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}</form>
+$help{'Creating_From_Template'}
+</nobr>
+</form>
 </td></tr>
 </table>
 ENDFORM
@@ -724,55 +822,77 @@ ENDFORM
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="50">
+<input type="file" name="uploaddoc" size="40">
 <br />Comment:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_supplemental">
+<nobr>
 <input type="submit" value="Upload Document">
- $help{'Uploading_From_Harddrive'}</form>
+ $help{'Uploading_From_Harddrive'}
+</nobr>
+</form>
 </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'}
+<p>
+<hr />
+<input type="text" size="20" name="importmap">
+<input type=button 
+onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
+value="Browse for Map"><input type="submit" name="loadmap" value="Load Map">
+</p>
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="New Folder" /> $help{'Adding_Folders'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
 value="External Resource" /> $help{'Adding_External_Resource'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<nobr>
 <input name="newsyl" type="submit" value="Syllabus" />
-$help{'Creating_From_Template'}</form>
+$help{'Creating_From_Template'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
+<nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}</form>
+$help{'Creating_From_Template'}
+</nobr>
+</form>
 </td></tr>
 </table></td></tr>
 ENDSUPFORM