--- loncom/interface/londocs.pm	2002/09/04 19:24:46	1.18
+++ loncom/interface/londocs.pm	2002/09/13 20:01:04	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.18 2002/09/04 19:24:46 www Exp $
+# $Id: londocs.pm,v 1.23 2002/09/13 20:01:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -211,9 +211,10 @@ END
 		$foldertitle;
 	}
     if ($isfolder) { $url.='&foldername='.$foldertitle; }
-    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="/adm/lonIcons/'.
+    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
+'"><img src="/adm/lonIcons/'.
         $icon.'.gif" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
+        "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
     return $line;
 }
 
@@ -232,9 +233,13 @@ sub handler {
     my $script='';
     my $allowed;
     my $events='';
+    my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-       ['folder','foldername','showdoc']);
-    unless ($ENV{'form.showdoc'}) { # got called from remote
+       ['folder','foldername']);
+    if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
+       $showdoc=$1;
+    }
+    unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
@@ -246,9 +251,7 @@ sub handler {
        }
     } else { # got called in sequence from course
        $allowed=0;
-       $forcestandard=1;
-       $forcesupplement=0;
-       $script=&Apache::lonxml::registerurl(1,undef);
+       $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonxml::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }
@@ -268,6 +271,8 @@ sub handler {
 
     $iconpath = $r->dir_config('lonIconsURL') . "/";
 
+    my $now=time;
+
 # print screen
     $r->print(<<ENDDOCUMENT);
 <html>
@@ -275,7 +280,11 @@ sub handler {
 <title>The LearningOnline Network with CAPA</title>
 <script>
 $script
-
+</script>
+ENDDOCUMENT
+   if ($allowed) {
+    $r->print(<<ENDNEWSCRIPT);
+<script>
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('Name of New Folder','New Folder');
     if (foldername) {
@@ -289,6 +298,20 @@ function makenewext(targetname) {
     window.open('/adm/rat/extpickframe.html');
 }
 
+function makesmppage() {
+    var title=prompt('Listed Title for the Page');
+    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');
+    this.document.forms.newbul.importdetail.value=
+	title+'=/adm/$udom/$uname/$now/bulletinboard';
+    this.document.forms.newbul.submit();
+}
+
 function finishpick() {
     var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;
@@ -298,9 +321,12 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 </script>
-</head>
-ENDDOCUMENT
-$r->print(&Apache::loncommon::bodytag('Course Documents','',$events));
+ENDNEWSCRIPT
+  }
+# -------------------------------------------------------------------- Body tag
+  $r->print('</head>'.
+            &Apache::loncommon::bodytag('Course Documents','',$events));
+  unless ($showdoc) {
 # --------------------------------------------------------- Standard documents
     if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<h2>Main Course Documents</h2>');
@@ -361,9 +387,25 @@ value="Syllabus=/public/$coursedom/$cour
 <input name="newsyl" type="submit" value="Syllabus" />
 </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">
-<input name="newsyl" type="submit" value="Navigate Content" />
+<input name="newnav" type="submit" value="Navigate Content" />
+</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="">
+<input name="newsmppg" type="button" value="Simple Page"
+onClick="javascript:makesmppage();" />
+</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="">
+<input name="newbulletin" type="button" value="Bulletin Board"
+onClick="javascript:makebulboard();" />
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">
@@ -454,8 +496,13 @@ ENDSUPFORM
     if ($allowed) {
 	$r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
     }
-    $r->print('</body></html>');
-    return OK;
+  } else {
+# -------------------------------------------------------- This is showdoc mode
+      $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
+         &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
+  }
+  $r->print('</body></html>');
+  return OK;
 } 
 
 1;
