--- loncom/interface/londocs.pm 2002/09/04 14:50:53 1.17 +++ loncom/interface/londocs.pm 2002/09/10 19:01:09 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.17 2002/09/04 14:50:53 www Exp $ +# $Id: londocs.pm,v 1.22 2002/09/10 19:01:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -198,6 +198,7 @@ END $url=&Apache::lonnet::tokenwrapper($url); } } + $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; # Title $title=&Apache::lonnet::unescape($title); my $foldertitle=$title; @@ -231,9 +232,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_/); @@ -245,9 +250,7 @@ sub handler { } } else { # got called in sequence from course $allowed=0; - $forcestandard=1; - $forcesupplement=0; - $script=&Apache::&Apache::lonxml::registerurl(1,undef); + $script=''.&Apache::lonxml::registerurl(1,undef).' +ENDDOCUMENT + if ($allowed) { + $r->print(< function makenewfolder(targetform,folderseq) { var foldername=prompt('Name of New Folder','New Folder'); if (foldername) { @@ -283,12 +292,40 @@ function makenewfolder(targetform,folder } } -function makenewext(targetform) { +function makenewext(targetname) { + this.document.forms.extimport.useform.value=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; + var form=this.document.forms.extimport.useform.value; + eval + ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+ + '";this.document.forms.'+form+'.submit();'); } - -ENDDOCUMENT -$r->print(&Apache::loncommon::bodytag('Course Documents','',$events)); +ENDNEWSCRIPT + } +# -------------------------------------------------------------------- Body tag + $r->print(''. + &Apache::loncommon::bodytag('Course Documents','',$events)); + unless ($showdoc) { # --------------------------------------------------------- Standard documents if (($standard) && ($allowed) && (!$forcesupplement)) { $r->print('

Main Course Documents

'); @@ -338,7 +375,7 @@ value="New Folder" /> -
@@ -349,9 +386,25 @@ value="Syllabus=/public/$coursedom/$cour
+ + - + +
+
+ + + + +
+
+ + + +
@@ -404,7 +457,7 @@ ENDFORM "javascript:groupimport();" value="Import">
-
+ @@ -412,21 +465,22 @@ ENDFORM onClick="javascript:makenewfolder(this.form,'$folderseq');" value="New Folder" />
-
+ -
-
+
-
+
'); + } + } else { +# -------------------------------------------------------- This is showdoc mode + $r->print("

Uploaded Document

It is recommended that you use an up-to-date virus scanner before handling this file.

". + &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'

'); + } + $r->print(''); + return OK; } 1;