--- loncom/interface/londocs.pm 2002/09/04 20:33:38 1.19 +++ loncom/interface/londocs.pm 2002/10/09 20:16:12 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.19 2002/09/04 20:33:38 www Exp $ +# $Id: londocs.pm,v 1.24 2002/10/09 20:16:12 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -211,9 +211,10 @@ END $foldertitle; } if ($isfolder) { $url.='&foldername='.$foldertitle; } - $line.=''. - "$title"; + "$title"; return $line; } @@ -234,8 +235,11 @@ sub handler { 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_/); @@ -247,8 +251,7 @@ sub handler { } } else { # got called in sequence from course $allowed=0; - $showdoc=1; - $script=&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) { @@ -293,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; @@ -305,11 +324,13 @@ function finishpick() { ENDNEWSCRIPT } # -------------------------------------------------------------------- Body tag - $r->print(&Apache::loncommon::bodytag('Course Documents','',$events)); + $r->print(''. + &Apache::loncommon::bodytag('Course Documents','',$events)); unless ($showdoc) { # --------------------------------------------------------- Standard documents + $r->print(''); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('

Main Course Documents

'); + $r->print('

Main Course Documents

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -367,9 +388,25 @@ value="Syllabus=/public/$coursedom/$cour
+ + - + +
+
+ + + + +
+
+ + + +
@@ -381,11 +418,12 @@ value="$plainname=/adm/$udom/$uname/abou
ENDFORM - $r->print('
'); + $r->print(''); } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print('

Supplemental Course Documents

'); + $r->print( + '

Supplemental Course Documents

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -453,17 +491,18 @@ value="$plainname=/adm/$udom/$uname/abou - + ENDSUPFORM } } if ($allowed) { $r->print('
'); } + $r->print(''); } 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",$ENV{'form.showdoc'}).'

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

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