$lt{'rn'}
+ENDREN
$form_start = '
';
+ } elsif ($supplementalflag && !$allowed) {
+ $url .= ($url =~ /\?/) ? 'amp;':'?';
+ $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
}
if ($ispage) {
my $pagename=&escape($pagetitle);
@@ -2471,7 +2438,7 @@ $form_common.'
$lt{'ti'}
- $uploadtag
+ $pathitem
@@ -2481,7 +2448,15 @@ EXTLNK
} else {
my ($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
- if (($cfile ne '') && ($symb ne '')) {
+ my $geteditlink;
+ if ($supplementalflag) {
+ if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
+ $geteditlink = 1;
+ }
+ } elsif (($cfile ne '') && ($symb ne '')) {
+ $geteditlink = 1;
+ }
+ if ($geteditlink) {
my $jscall =
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
$switchserver,
@@ -3268,7 +3243,7 @@ sub handler {
my $addentries = {};
my $container;
my $containertag;
- my $uploadtag;
+ my $pathitem;
# Do we directly jump somewhere?
@@ -3401,7 +3376,7 @@ sub handler {
$container='page';
$containertag = ''.
'';
- $uploadtag =
+ $pathitem =
''.
''.
'';
@@ -3415,7 +3390,7 @@ sub handler {
}
}
$containertag = '';
- $uploadtag = '';
+ $pathitem = '';
}
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
$showdoc='/'.$1;
@@ -3658,7 +3633,7 @@ IMSFORM
$lt{'title'}:
- $uploadtag
+ $pathitem
@@ -3689,7 +3664,7 @@ FUFORM
SEDFFORM
my @simpleeditdefaultforma = (
- { '
' => "$uploadtag" },
+ { '
' => "$pathitem" },
{ '
' => "$help{'Importing_LON-CAPA_Resource'}" },
{ '
' => "" },
{ '
' => $importpubform }
@@ -3707,7 +3682,7 @@ SEDFFORM
$lt{'title'}:
- $uploadtag
+ $pathitem
@@ -3732,8 +3707,8 @@ ERFORM
HIDDENFORM
- $r->print(&makesimpleeditform($uploadtag)."\n".
- &makedocslogform($uploadtag."\n".
+ $r->print(&makesimpleeditform($pathitem)."\n".
+ &makedocslogform($pathitem."\n".
''."\n"));
}
@@ -3756,7 +3731,7 @@ HIDDENFORM
$folder='default';
$savefolderpath = $env{'form.folderpath'};
$env{'form.folderpath'}='default&'.&escape(&mt('Content'));
- $uploadtag = '';
}
my $postexec='';
@@ -3783,7 +3758,7 @@ HIDDENFORM
my $newnavform=(<
- $uploadtag
+ $pathitem
@@ -3793,7 +3768,7 @@ NNFORM
my $newsmppageform=(<
- $uploadtag
+ $pathitem
$help{'Simple Page'}
@@ -3803,7 +3778,7 @@ NSPFORM
my $newsmpproblemform=(<
- $uploadtag
+ $pathitem
$help{'Simple Problem'}
@@ -3814,7 +3789,7 @@ NSPROBFORM
my $newdropboxform=(<
- $uploadtag
+ $pathitem
@@ -3823,7 +3798,7 @@ NDBFORM
my $newexuploadform=(<
- $uploadtag
+ $pathitem
$help{'Score_Upload_Form'}
@@ -3833,7 +3808,7 @@ NEXUFORM
my $newbulform=(<
- $uploadtag
+ $pathitem
$help{'Bulletin Board'}
@@ -3843,7 +3818,7 @@ NBFORM
my $newaboutmeform=(<
- $uploadtag
+ $pathitem
@@ -3854,7 +3829,7 @@ NAMFORM
my $newaboutsomeoneform=(<
- $uploadtag
+ $pathitem
@@ -3864,7 +3839,7 @@ NASOFORM
my $newrosterform=(<
- $uploadtag
+ $pathitem
@@ -3906,7 +3881,7 @@ NFFORM
my $newsylform=(<
- $uploadtag
+ $pathitem
@@ -3918,7 +3893,7 @@ NSYLFORM
my $newgroupfileform=(<
- $uploadtag
+ $pathitem
@@ -3973,7 +3948,7 @@ unless ($env{'form.pagepath'}) {
$hadchanges=0;
unless (($supplementalflag || $toolsflag)) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
- $supplementalflag,\%orderhash,$iconpath,$uploadtag);
+ $supplementalflag,\%orderhash,$iconpath,$pathitem);
if ($error) {
$r->print(''.$error.'
');
}
@@ -3998,12 +3973,12 @@ unless ($env{'form.pagepath'}) {
$env{'form.folderpath'} = $savefolderpath;
}
$env{'form.pagepath'} = '';
+ $pathitem = '';
if ($allowed) {
my $folderseq=
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
- my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-
my $supupdocform=(<