--- loncom/interface/londocs.pm 2004/02/05 15:19:41 1.103
+++ loncom/interface/londocs.pm 2004/04/26 16:56:26 1.121
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.103 2004/02/05 15:19:41 matthew Exp $
+# $Id: londocs.pm,v 1.121 2004/04/26 16:56:26 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,10 +68,13 @@ sub mapread {
sub storemap {
my ($coursenum,$coursedom,$map)=@_;
- $hadchanges=1;
- return
+ my ($outtext,$errtext)=
&Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
$map,1);
+ if ($errtext) { return ($errtext,2); }
+
+ $hadchanges=1;
+ return ($errtext,0);
}
# ----------------------------------------- Return hash with valid author names
@@ -94,13 +97,15 @@ sub authorhosts {
} else {
($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
}
- if (&Apache::lonnet::homeserver($ca,$cd) eq
- $Apache::lonnet::perlvar{'lonHostID'}) {
+ my $allowed=0;
+ my $myhome=&Apache::lonnet::homeserver($ca,$cd);
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
+ if ($allowed) {
$home++;
$outhash{'home_'.$ca.'@'.$cd}=1;
} else {
- $outhash{'otherhome_'.$ca.'@'.$cd}=
- &Apache::lonnet::homeserver($ca,$cd);
+ $outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
$other++;
}
}
@@ -250,14 +255,37 @@ sub group_import {
join ':', ($name, $url, $ext, 'normal', 'res');
}
}
- &storemap($coursenum, $coursedom, $folder.'.sequence');
+ return &storemap($coursenum, $coursedom, $folder.'.sequence');
+}
+
+sub breadcrumbs {
+ my ($where)=@_;
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ my (@folders)=split('&',$ENV{'form.folderpath'});
+ my $folderpath;
+ while (@folders) {
+ my $folder=shift(@folders);
+ my $foldername=shift(@folders);
+ if ($folderpath) {$folderpath.='&';}
+ $folderpath.=$folder.'&'.$foldername;
+ my $url='/adm/coursedocs?folderpath='.
+ &Apache::lonnet::escape($folderpath);
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {'href'=>$url,
+ 'title'=>&Apache::lonnet::unescape($foldername),
+ 'text'=>'<font size="+1">'.
+ &Apache::lonnet::unescape($foldername).'</font>'
+ });
+
+
+ }
+ return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0);
}
sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
- if ($ENV{'form.foldername'}) {
- $r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
- }
+
+ $r->print(&breadcrumbs($folder));
my $errtext='';
my $fatal=0;
($errtext,$fatal)=
@@ -270,12 +298,38 @@ sub editor {
$r->print('<p><font color="red">'.$errtext.'</font></p>');
} else {
# ------------------------------------------------------------ Process commands
+
# ---------------- if they are for this folder and user allowed to make changes
if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
+# set parameters
+ if (defined($ENV{'form.setparms'})) {
+ my $idx=$ENV{'form.setparms'};
+ if ($ENV{'form.randpick_'.$idx}) {
+ &Apache::lonratedt::storeparameter($idx,'randompick',$ENV{'form.randpick_'.$idx},'int_pos');
+ } else {
+ &Apache::lonratedt::delparameter($idx,'randompick');
+ }
+ if ($ENV{'form.hidprs_'.$idx}) {
+ &Apache::lonratedt::storeparameter($idx,'hiddenresource','yes','string_yesno');
+ } else {
+ &Apache::lonratedt::delparameter($idx,'hiddenresource');
+ }
+ if ($ENV{'form.encprs_'.$idx}) {
+ &Apache::lonratedt::storeparameter($idx,'encrypturl','yes','string_yesno');
+ } else {
+ &Apache::lonratedt::delparameter($idx,'encrypturl');
+ }
+
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+ if ($fatal) {
+ $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ return;
+ }
+ }
# upload a file, if present
if (($ENV{'form.uploaddoc.filename'}) &&
($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
- if ($folder=~/^$1/) {
+ 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);
@@ -295,7 +349,12 @@ sub editor {
$comment.':'.$url.':'.$ext.':normal:res';
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
$newidx;
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+ if ($fatal) {
+ $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ return;
+ }
}
}
if ($ENV{'form.cmd'}) {
@@ -335,7 +394,12 @@ sub editor {
}
# Store the changed version
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ $folder.'.sequence');
+ if ($fatal) {
+ $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ return;
+ }
}
# Group import/search
if ($ENV{'form.importdetail'}) {
@@ -349,21 +413,30 @@ sub editor {
}
}
# Store the changed version
- group_import($coursenum, $coursedom, $folder, @imports);
+ ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
+ @imports);
+ if ($fatal) {
+ $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ return;
+ }
}
# Loading a complete map
if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
- foreach
-(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
my $idx=$#Apache::lonratedt::resources;
$idx++;
$Apache::lonratedt::resources[$idx]=$_;
$Apache::lonratedt::order
- [$#Apache::lonratedt::order+1]=$idx;
- }
+ [$#Apache::lonratedt::order+1]=$idx;
+ }
# Store the changed version
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ $folder.'.sequence');
+ if ($fatal) {
+ $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ return;
+ }
}
}
# ---------------------------------------------------------------- End commands
@@ -373,8 +446,8 @@ sub editor {
foreach (@Apache::lonratedt::order) {
my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
- unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
- $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
+ unless ($name) { next; }
+ $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
$idx++;
}
$r->print('</table>');
@@ -384,41 +457,48 @@ sub editor {
# --------------------------------------------------------------- An entry line
sub entryline {
- my ($index,$title,$url,$folder,$allowed,$residx)=@_;
+ my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
$title=~s/\&colon\;/\:/g;
$title=&HTML::Entities::encode(&HTML::Entities::decode(
- &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
+ &Apache::lonnet::unescape($title)),'"<>&\'');
my $renametitle=$title;
my $foldertitle=$title;
- if ($title=~
- /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/
- ) {
- $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
- $renametitle=$4;
- $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
- &Apache::loncommon::plainname($2,$3).': <br />'.
- $foldertitle;
- }
+ if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) {
+ $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ $renametitle=$4;
+ $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
+ &Apache::loncommon::plainname($2,$3).': <br />'.
+ $foldertitle;
+ }
$renametitle=~s/\"\;/\\\"/g;
my $line='<tr>';
# Edit commands
- if ($allowed) {
- my %lt=('up' => 'Move Up',
- 'dw' => 'Move Down',
- 'rm' => 'Remove',
- 'rn' => 'Rename');
- $line.=(<<END);
+ my $folderpath;
+ if ($ENV{'form.folderpath'}) {
+ $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
+ # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
+ }
+ if ($allowed) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'up' => 'Move Up',
+ 'dw' => 'Move Down',
+ 'rm' => 'Remove',
+ 'rn' => 'Rename');
+ $line.=(<<END);
+<form name="entry_$index" action="/adm/coursedocs" method="post">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="setparms" value="$index" />
<td><table border='0' cellspacing='2' cellpadding='0'>
<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
+<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
+<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
</table></td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folder","$index","$renametitle");'>
+<a href='javascript:removeres("$folderpath","$index","$renametitle");'>
<font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:changename("$folder","$index","$renametitle");'>
+<a href='javascript:changename("$folderpath","$index","$renametitle");'>
<font size="-2" color="#009900">$lt{'rn'}</font></a></td>
END
}
@@ -427,32 +507,60 @@ END
my $uploaded=($url=~/^\/*uploaded\//);
my $icon=&Apache::loncommon::icon($url);
my $isfolder=0;
+ my $folderarg;
if ($uploaded) {
if ($extension eq 'sequence') {
$icon=$iconpath.'/folder_closed.gif';
- $url=~/\/(\w+)\.sequence/;
- $url='/adm/coursedocs?folder='.$1;
+ $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+ $url='/adm/coursedocs?';
+ $folderarg=$1;
$isfolder=1;
- } else {
- $url=&Apache::lonnet::tokenwrapper($url);
- }
+ }
}
$url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
- if (($residx) && ($folder!~/supplemental/)) {
- $url.=(($url=~/\?/)?'&':'?').'symb='.
- &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+ if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
+ my $symb=&Apache::lonnet::symbclean(
&Apache::lonnet::declutter('uploaded/'.
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
'.sequence').
'___'.$residx.'___'.
- &Apache::lonnet::declutter($url)));
+ &Apache::lonnet::declutter($url));
+ (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+ $url=&Apache::lonnet::clutter($url);
+ $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+ }
+ my $parameterset=' ';
+ if ($isfolder) {
+ my $foldername=&Apache::lonnet::escape($foldertitle);
+ my $folderpath=$ENV{'form.folderpath'};
+ if ($folderpath) { $folderpath.='&' };
+ $folderpath.=$folderarg.'&'.$foldername;
+ $url.='folderpath='.&Apache::lonnet::escape($folderpath);
+ $parameterset=&mt('Randomly Pick: ').
+ '<input type="text" size="4" name="randpick_'.$index.'" value="'.
+ &Apache::lonratedt::getparameter($index,'randompick').'" />';
+ }
+ $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+ '" border="0"></a></td>'.
+ "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+ if (($allowed) && ($folder!~/^supplemental/)) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'hd' => 'Hidden',
+ 'ec' => 'URL hidden',
+ 'sp' => 'Store Parameters');
+ $line.=(<<ENDPARMS);
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="checkbox" name="hidprs_$index" /> $lt{'hd'}</td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="checkbox" name="encprs_$index" /> $lt{'ec'}</td>
+<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="submit" value="$lt{'sp'}" />
+</font></td>
+ENDPARMS
}
- if ($isfolder) { $url.='&foldername='.
- &Apache::lonnet::escape($foldertitle); }
- $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
- '"><img src="'.$icon.'" border="0"></a></td>'.
- "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
+ $line.="</form></tr>";
return $line;
}
@@ -480,7 +588,7 @@ sub checkonthis {
$alreadyseen{$url}=1;
$r->rflush();
if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
- $r->print('<br />');
+ $r->print("\n<br />");
for (my $i=0;$i<=$level*5;$i++) {
$r->print(' ');
}
@@ -568,7 +676,8 @@ sub verifycontent {
}
}
&untiehash();
- $r->print('<h1>'.&mt('Done').'.</h1>');
+ $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
+ &mt('Return to DOCS').'</a>');
}
# -------------------------------------------------------------- Check Versions
@@ -615,7 +724,6 @@ sub checkversions {
foreach (keys %ENV) {
if ($_=~/^form\.set_version_(.+)$/) {
my $src=$1;
- &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
$newsetversions{$src}=$ENV{$_};
}
@@ -817,7 +925,9 @@ sub changewarning {
$r->print(
'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'.
'<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+'<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
+&Apache::lonnet::escape($ENV{'form.folderpath'}).
+'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
&mt('Changes will become active for your current session after').
' <input type="hidden" name="'.
$ENV{'request.role'}.'" value="1" /><input type="button" value="'.
@@ -870,7 +980,12 @@ sub handler {
my $events='';
my $showdoc=0;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['folder','foldername']);
+ ['folderpath']);
+ if ($ENV{'form.folderpath'}) {
+ my (@folderpath)=split('&',$ENV{'form.folderpath'});
+ $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
+ $ENV{'form.folder'}=pop(@folderpath);
+ }
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
$showdoc=$1;
}
@@ -984,6 +1099,14 @@ function makeabout() {
}
}
+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
+}
+
+
function finishpick() {
var title=this.document.forms.extimport.title.value;
var url=this.document.forms.extimport.url.value;
@@ -993,23 +1116,24 @@ function finishpick() {
'";this.document.forms.'+form+'.submit();');
}
-function changename(folder,index,oldtitle) {
+function changename(folderpath,index,oldtitle) {
var title=prompt('New Title',oldtitle);
if (title) {
this.document.forms.renameform.title.value=title;
this.document.forms.renameform.cmd.value='rename_'+index;
- this.document.forms.renameform.folder.value=folder;
+ this.document.forms.renameform.folderpath.value=folderpath;
this.document.forms.renameform.submit();
}
}
-function removeres(folder,index,oldtitle) {
- if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
+function removeres(folderpath,index,oldtitle) {
+ if (confirm('Remove "'+oldtitle+'"?')) {
this.document.forms.renameform.cmd.value='del_'+index;
- this.document.forms.renameform.folder.value=folder;
+ this.document.forms.renameform.folderpath.value=folderpath;
this.document.forms.renameform.submit();
}
}
+
</script>
ENDNEWSCRIPT
@@ -1042,6 +1166,7 @@ ENDNEWSCRIPT
'bull' => 'Bulletin Board',
'mypi' => 'My Personal Info',
'abou' => 'About User',
+ 'imsf' => 'Import IMS package',
'file' => 'File',
'title' => 'Title',
'comment' => 'Comment'
@@ -1053,15 +1178,24 @@ ENDNEWSCRIPT
'vc' => 'Verify Content',
'cv' => 'Check/Set Resource Versions',
);
+
+ my $folderpath=$ENV{'form.folderpath'};
+ if (!$folderpath) {
+ if ($ENV{'form.folder'} eq '' ||
+ $ENV{'form.folder'} eq 'supplemental') {
+ $folderpath='default&'.
+ &Apache::lonnet::escape(&mt('Main Course Documents'));
+ }
+ }
$r->print(<<ENDCOURSEVERIFY);
<form name="renameform" method="post" action="/adm/coursedocs">
<input type="hidden" name="title" />
<input type="hidden" name="cmd" />
-<input type="hidden" name="folder" />
+<input type="hidden" name="folderpath" />
</form>
<form name="simpleedit" method="post" action="/adm/coursedocs">
<input type=hidden name="importdetail" value="">
-<input type="hidden" name="folder" />
+<input type="hidden" name="folderpath" value="$folderpath" />
</form>
<form action="/adm/coursedocs" method="post" name="courseverify">
<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
@@ -1079,15 +1213,19 @@ ENDCOURSEVERIFY
# --------------------------------------------------------- Standard documents
$r->print('<table border=2 cellspacing=4 cellpadding=4>');
if (($standard) && ($allowed) && (!$forcesupplement)) {
- $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
- ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
+ $r->print('<tr><td bgcolor="#BBBBBB">');
+# '<h2>'.&mt('Main Course Documents').
+# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
my $folder=$ENV{'form.folder'};
- unless ($folder=~/^default/) { $folder='default'; }
+ if ($folder eq '' || $folder eq 'supplemental') {
+ $folder='default';
+ $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
+ }
my $postexec='';
if ($folder eq 'default') {
$r->print('<script>this.window.name="loncapaclient";</script>');
} else {
- $postexec='self.close();';
+ #$postexec='self.close();';
}
$hadchanges=0;
&editor($r,$coursenum,$coursedom,$folder,$allowed);
@@ -1109,8 +1247,7 @@ $lt{'file'}:<br />
<br />
$lt{'title'}:<br />
<input type="text" size="50" name="comment">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type="hidden" name="cmd" value="upload_default">
<input type="submit" value="$lt{'upld'}">
<nobr>
@@ -1120,13 +1257,10 @@ $lt{'title'}:<br />
</td>
<td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
<nobr>
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">
+<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
$help{'Importing_LON-CAPA_Resource'}
</nobr>
<p>
@@ -1140,8 +1274,7 @@ $help{'Load_Map'}</nobr>
</form>
</td><td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newfolder" type="button"
@@ -1150,8 +1283,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newext" type="button" onClick="javascript:makenewext('newext');"
@@ -1159,8 +1291,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus">
<nobr>
@@ -1169,8 +1300,7 @@ value="Syllabus=/public/$coursedom/$cour
</nobr>
</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="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail"
value="Navigate Content=/adm/navmaps">
<nobr>
@@ -1179,8 +1309,7 @@ $help{'Navigate_Content'}
</nobr>
</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="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newsmppg" type="button" value="$lt{'sipa'}"
@@ -1188,8 +1317,7 @@ onClick="javascript:makesmppage();" /> $
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newsmpproblem">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
@@ -1197,8 +1325,7 @@ onClick="javascript:makesmpproblem();" /
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newexamupload">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newexamupload" type="button" value="$lt{'scuf'}"
@@ -1207,8 +1334,7 @@ $help{'Score_Upload_Form'}
</nobr>
</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="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newbulletin" type="button" value="$lt{'bull'}"
@@ -1217,8 +1343,7 @@ $help{'Bulletin Board'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme">
<nobr>
@@ -1227,14 +1352,18 @@ $help{'My Personal Info'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newaboutsomeone" type="button" value="$lt{'abou'}"
onClick="javascript:makeabout();" />
</nobr>
</form>
+<form action="/adm/imsimportdocs" method="post" name="ims">
+<input type="hidden" name="folder" value="$folder" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+</nobr>
+</form>
</td></tr>
</table>
ENDFORM
@@ -1242,11 +1371,18 @@ ENDFORM
}
# ----------------------------------------------------- Supplemental documents
if (!$forcestandard) {
- $r->print(
- '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').
- ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+ $r->print('<tr><td bgcolor="#BBBBBB">');
+# '<h2>'.&mt('Supplemental Course Documents').
+# ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
my $folder=$ENV{'form.folder'};
- unless ($folder=~/supplemental/) { $folder='supplemental'; }
+ unless ($folder=~/^supplemental/) {
+ $folder='supplemental';
+ }
+ if ($folder =~ /^supplemental$/ &&
+ $ENV{'form.folderpath'} =~ /^default\&/) {
+ $ENV{'form.folderpath'}='supplemental&'.
+ &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
+ }
&editor($r,$coursenum,$coursedom,$folder,$allowed);
if ($allowed) {
my $folderseq=
@@ -1256,7 +1392,6 @@ ENDFORM
$r->print(<<ENDSUPFORM);
<table cellspacing=4 cellpadding=4><tr>
<th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
<th bgcolor="#DDDDDD">$lt{'spec'}</th>
</tr>
<tr><td bgcolor="#DDDDDD">
@@ -1265,8 +1400,8 @@ ENDFORM
<br />$lt{'comment'}:<br />
<textarea cols=50 rows=4 name='comment'>
</textarea>
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<br />
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type="hidden" name="cmd" value="upload_supplemental">
<nobr>
<input type="submit" value="$lt{'upld'}">
@@ -1275,26 +1410,8 @@ ENDFORM
</form>
</td>
<td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=hidden name="importdetail" value="">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
-<p>
-<hr />
-<input type="text" size="20" name="importmap">
-<input type=button
-onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="$lt{'selm'}"><input type="submit" name="loadmap" value="$lt{'load'}">$help{'Load_Map'}
-</p>
-</form>
-</td><td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newfolder" type="button"
@@ -1303,8 +1420,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newext" type="button"
@@ -1313,8 +1429,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus">
<nobr>
@@ -1323,8 +1438,7 @@ $help{'Syllabus'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
<input type=hidden name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme">
<nobr>