--- loncom/interface/londocs.pm 2005/01/08 06:42:15 1.164
+++ loncom/interface/londocs.pm 2005/02/02 22:15:06 1.166
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.164 2005/01/08 06:42:15 albertel Exp $
+# $Id: londocs.pm,v 1.166 2005/02/02 22:15:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1006,7 +1006,8 @@ sub editor {
if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
# this is for a course, not a user, so set coursedoc flag
# probably the only place in the system where this should be "1"
- my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
+ my $newidx=$#Apache::lonratedt::resources+1;
+ my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
my $ext='false';
if ($url=~/^http\:\/\//) { $ext='true'; }
$url=~s/\:/\:/g;
@@ -1018,7 +1019,6 @@ sub editor {
$comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
$ENV{'user.domain'}.'___&&&___'.$comment;
}
- my $newidx=$#Apache::lonratedt::resources+1;
$Apache::lonratedt::resources[$newidx]=
$comment.':'.$url.':'.$ext.':normal:res';
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
@@ -1303,10 +1303,11 @@ END
$folderpath.=$folderarg.'&'.$foldername;
$url.='folderpath='.&Apache::lonnet::escape($folderpath);
$parameterset='';
+ '" />'.
+''.&mt('Store').'';
}
if ($ispage) {
@@ -1333,21 +1334,17 @@ END
if (($allowed) && ($folder!~/^supplemental/)) {
my %lt=&Apache::lonlocal::texthash(
'hd' => 'Hidden',
- 'ec' => 'URL hidden',
- 'sp' => 'Store Parameters');
+ 'ec' => 'URL hidden');
my $enctext=
((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
my $hidtext=
((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
$line.=(<
-
+
-
+
$parameterset
-
-
-
ENDPARMS
}
$line.="";
@@ -1960,16 +1957,20 @@ function makeabout() {
this.document.forms.newaboutsomeone.importdetail.value=
'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
this.document.forms.newaboutsomeone.submit();
- }
+ } else {
+ alert("Not a valid user\@domain");
+ }
+ } else {
+ alert("Please enter both user and domain in the format user\@domain");
}
}
}
function makeims() {
- var caller = document.forms.ims.folder.value
- var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"
- newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes")
- newWindow.location.href = newlocation
+ var caller = document.forms.ims.folder.value;
+ var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+ newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+ newWindow.location.href = newlocation;
}