--- loncom/interface/londocs.pm 2002/09/04 13:06:20 1.16
+++ loncom/interface/londocs.pm 2002/09/04 14:50:53 1.17
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.16 2002/09/04 13:06:20 www Exp $
+# $Id: londocs.pm,v 1.17 2002/09/04 14:50:53 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,10 +60,17 @@ sub storemap {
sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
+ if ($ENV{'form.foldername'}) {
+ $r->print('
Folder: '.$ENV{'form.foldername'}.'
');
+ }
my $errtext='';
my $fatal=0;
($errtext,$fatal)=
&mapread($coursenum,$coursedom,$folder.'.sequence');
+ if ($#Apache::lonratedt::order<1) {
+ $Apache::lonratedt::order[0]=1;
+ $Apache::lonratedt::resources[1]='';
+ }
if ($fatal) {
$r->print(''.$errtext.'
');
} else {
@@ -84,6 +91,10 @@ sub editor {
$comment=~s/\\<\;/g;
$comment=~s/\>/\>\;/g;
$comment=~s/\:/\:/g;
+ if ($folder=~/^supplemental/) {
+ $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
+ $ENV{'user.domain'}.'___&&&___'.$comment;
+ }
my $newidx=$#Apache::lonratedt::resources+1;
$Apache::lonratedt::resources[$newidx]=
$comment.':'.$url.':'.$ext.':normal:res';
@@ -176,26 +187,32 @@ END
if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
$icon=$extension;
}
+ my $isfolder=0;
if ($uploaded) {
if ($extension eq 'sequence') {
$icon='folder_closed';
$url=~/\/(\w+)\.sequence/;
$url='/adm/coursedocs?folder='.$1;
+ $isfolder=1;
} else {
$url=&Apache::lonnet::tokenwrapper($url);
}
}
- $line.=' | ';
# Title
$title=&Apache::lonnet::unescape($title);
+ my $foldertitle=$title;
if ($title=~
/^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/
- ) { $title=''.localtime($1).' '.$2.' at '.$3.':
'.
- &Apache::lontexconvert::msgtexconverted($4);
+ ) {
+ $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ $title=''.localtime($1).' '.
+ &Apache::loncommon::plainname($2,$3).':
'.
+ $foldertitle;
}
- $line.="$title | ";
- $line.='';
+ if ($isfolder) { $url.='&foldername='.$foldertitle; }
+ $line.=' | '.
+ "$title | ";
return $line;
}
@@ -215,7 +232,7 @@ sub handler {
my $allowed;
my $events='';
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['folder','showdoc']);
+ ['folder','foldername','showdoc']);
unless ($ENV{'form.showdoc'}) { # got called from remote
$forcestandard=($ENV{'form.folder'}=~/^default_/);
$forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
@@ -272,7 +289,7 @@ function makenewext(targetform) {
ENDDOCUMENT
$r->print(&Apache::loncommon::bodytag('Course Documents','',$events));
-# --------------------------------------------------0------ Standard documents
+# --------------------------------------------------------- Standard documents
if (($standard) && ($allowed) && (!$forcesupplement)) {
$r->print('Main Course Documents
');
my $folder=$ENV{'form.folder'};
@@ -294,6 +311,7 @@ File:
Title:
+
@@ -310,6 +328,7 @@ Title:
-
|