--- loncom/interface/londocs.pm	2002/11/18 15:21:31	1.37
+++ loncom/interface/londocs.pm	2003/01/20 17:30:31	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.37 2002/11/18 15:21:31 www Exp $
+# $Id: londocs.pm,v 1.45 2003/01/20 17:30:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
 use Apache::lonxml;
+use HTML::Entities;
 use GDBM_File;
 
 my $iconpath;
@@ -44,6 +45,8 @@ my %hash;
 my $hashtied;
 my %alreadyseen=();
 
+my $hadchanges;
+
 # Mapread read maps into lonratedt::global arrays 
 # @order and @resources, determines status
 # sets @order - pointer to resources in right order
@@ -59,6 +62,7 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
+    $hadchanges=1;
     return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
@@ -118,20 +122,25 @@ sub editor {
                     }
                     $#Apache::lonratedt::order--;
                 } elsif ($cmd eq 'up') {
+		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
                     my $i=$Apache::lonratedt::order[$idx-1];
                     $Apache::lonratedt::order[$idx-1]=
 			$Apache::lonratedt::order[$idx];
                     $Apache::lonratedt::order[$idx]=$i;
+		   }
                 } elsif ($cmd eq 'down') {
+		   if (defined($Apache::lonratedt::order[$idx+1])) {
                     my $i=$Apache::lonratedt::order[$idx+1];
                     $Apache::lonratedt::order[$idx+1]=
 			$Apache::lonratedt::order[$idx];
                     $Apache::lonratedt::order[$idx]=$i;
+		   }
                 } elsif ($cmd eq 'rename') {
                     my ($rtitle,@rrest)=split(/\:/,
                        $Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]);
-                    my $comment=$ENV{'form.title'};
+                    my $comment=
+                     &HTML::Entities::decode($ENV{'form.title'});
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
@@ -185,6 +194,21 @@ sub editor {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed)=@_;
+    $title=~s/\&colon\;/\:/g;
+    $title=&HTML::Entities::encode(&HTML::Entities::decode(
+     &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
+    my $renametitle=$title;
+    my $foldertitle=$title;
+    if ($title=~
+ /^(\d+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(.*)$/
+	) { 
+            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+            $renametitle=$4;
+            $title='<i>'.localtime($1).'</i> '.
+                &Apache::loncommon::plainname($2,$3).': <br>'.
+		$foldertitle;
+	}
+    $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
     if ($allowed) {
@@ -197,7 +221,7 @@ sub entryline {
 </table></td><td>
 <a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>
 <font size="-2">Remove</font></a>
-<a href='javascript:changename("$folder","$index","$title");'>
+<a href='javascript:changename("$folder","$index","$renametitle");'>
 <font size="-2">Rename</font></a></td>
 END
     }
@@ -220,17 +244,6 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-# Title
-    $title=&Apache::lonnet::unescape($title);
-    my $foldertitle=$title;
-    if ($title=~
- /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/
-	) { 
-            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-            $title='<i>'.localtime($1).'</i> '.
-                &Apache::loncommon::plainname($2,$3).': <br>'.
-		$foldertitle;
-	}
     if ($isfolder) { $url.='&foldername='.$foldertitle; }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
 '"><img src="/adm/lonIcons/'.
@@ -262,7 +275,7 @@ sub checkonthis {
     my ($r,$url,$level,$title)=@_;
     $alreadyseen{$url}=1;
     $r->rflush();
-    if ($url) {
+    if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
        $r->print('<br />');
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
@@ -511,17 +524,21 @@ function makenewext(targetname) {
 }
 
 function makesmppage() {
-    var title=prompt('Listed Title for the Page');
+   var title=prompt('Listed Title for the Page');
+   if (title) { 
     this.document.forms.newsmppg.importdetail.value=
 	title+'=/adm/$udom/$uname/$now/smppg';
     this.document.forms.newsmppg.submit();
+   }
 }
 
 function makebulboard() {
-    var title=prompt('Listed Title for the Bulletin Board');
+   var title=prompt('Listed Title for the Bulletin Board');
+   if (title) {
     this.document.forms.newbul.importdetail.value=
 	title+'=/adm/$udom/$uname/$now/bulletinboard';
     this.document.forms.newbul.submit();
+   }
 }
 
 function finishpick() {
@@ -543,11 +560,7 @@ function changename(folder,index,oldtitl
     }
 }
 </script>
-<form name="renameform" method="post" action="/adm/coursedocs">
-<input type="hidden" name="title" />
-<input type="hidden" name="cmd" />
-<input type="hidden" name="folder" />
-</form>
+
 ENDNEWSCRIPT
   }
 # -------------------------------------------------------------------- Body tag
@@ -556,6 +569,15 @@ ENDNEWSCRIPT
   unless ($showdoc) {
     if ($allowed) {
        $r->print(<<ENDCOURSEVERIFY);
+<form name="renameform" method="post" action="/adm/coursedocs">
+<input type="hidden" name="title" />
+<input type="hidden" name="cmd" />
+<input type="hidden" name="folder" />
+</form>
+<form name="simpleedit" method="post" action="/adm/coursedocs">
+<input type=hidden name="importdetail" value="">
+<input type="hidden" name="folder" />
+</form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
 <input type="submit" name="verify" value="Verify Content" />
 <input type="submit" name="versions" value="Check Resource Versions" />
@@ -563,16 +585,22 @@ ENDNEWSCRIPT
 ENDCOURSEVERIFY
     }
 # --------------------------------------------------------- Standard documents
-    $r->print('<table>');
+    $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       $r->print('<tr><td bgcolor="#FFFFBB"><h2>Main Course Documents</h2>');
+       $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }
+       $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>');
+       }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        $r->print(<<ENDFORM);
-<table cellspacing=2><tr>
+<table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">Upload a new main course document</th>
 <th bgcolor="#DDDDDD">Import a published document</th>
 <th bgcolor="#DDDDDD">Special documents</th>
@@ -591,13 +619,11 @@ Title:<br />
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
-<input type=hidden name="importdetail" value="">
+<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type=button onClick=
-"javascript:groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
-"javascript:groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
@@ -658,7 +684,7 @@ ENDFORM
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
        $r->print(
-  '<tr><td bgcolor="#BBFFFF"><h2>Supplemental Course Documents</h2>');
+  '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
@@ -668,7 +694,7 @@ ENDFORM
                      '.sequence';
 
           $r->print(<<ENDSUPFORM);
-<table cellspacing=2><tr>
+<table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
 <th bgcolor="#DDDDDD">Import a published document</th>
 <th bgcolor="#DDDDDD">Special documents</th>
@@ -686,13 +712,12 @@ ENDFORM
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
+<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
 <input type=hidden name="importdetail" value="">
 <input type=button onClick=
-"javascript:groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
-"javascript:groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">