--- loncom/interface/londocs.pm	2002/12/04 14:02:49	1.38
+++ loncom/interface/londocs.pm	2003/01/23 19:00:06	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.38 2002/12/04 14:02:49 www Exp $
+# $Id: londocs.pm,v 1.46 2003/01/23 19:00:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,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
@@ -60,6 +62,7 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
+    $hadchanges=1;
     return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
@@ -163,6 +166,7 @@ sub editor {
                         my $ext='false';
                         if ($url=~/^http\:\/\//) { $ext='true'; }
                         $url=~s/\:/\:/g;
+                        $name=~s/\:/\:/g;
                         $Apache::lonratedt::resources[$idx]=
                            $name.':'.$url.':'.$ext.':normal:res';
 	             }
@@ -272,7 +276,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;');
@@ -557,11 +561,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
@@ -570,6 +570,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" />
@@ -577,16 +586,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>
@@ -605,13 +620,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">
@@ -672,7 +685,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);
@@ -682,7 +695,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>
@@ -700,13 +713,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">