-
+
-
+
@@ -2247,7 +2301,7 @@ END
$form_end
- $lt{'rm'}
+$removelink
$cutlink
$lt{'rn'}
$copylink
@@ -2341,7 +2395,7 @@ END
'parameter_encrypturl'))[0]=~/^yes$/i)
.':'.((&LONCAPA::map::getparameter($orderidx,
'parameter_randomorder'))[0]=~/^yes$/i);
- $url.='folderpath='.&escape($folderpath).$cpinfo;
+ $url.='folderpath='.&escape($folderpath);
my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0];
my $rpckchk;
@@ -2380,7 +2434,7 @@ $form_common.'
$path.$pagearg.'.page');
}
$url.='pagepath='.&escape($pagepath).
- '&pagesymb='.&escape($symb).$cpinfo;
+ '&pagesymb='.&escape($symb);
}
if (($external) && ($allowed)) {
my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
@@ -2808,7 +2862,8 @@ ENDHEADERS
' | '.&mt('History').' | '.
'');
foreach my $key (sort(keys(%changes))) {
- if ($changes{$key}>$starttime) {
+ #excludes not versionable problems from resource version history:
+ next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
my $currentversion=&Apache::lonnet::getversion($key);
if ($currentversion<0) {
@@ -3925,7 +3980,7 @@ my %suporderhash = (
} elsif ($showdoc) {
# -------------------------------------------------------- This is showdoc mode
$r->print("".&mt('Uploaded Document').' - '.
- &Apache::lonnet::gettitle($r->uri).'
'.
+ &Apache::lonnet::gettitle($r->uri).'
'.
&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."
".
&entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'
');
}
@@ -4205,7 +4260,6 @@ sub generate_edit_table {
$active = 'class="active"';
}
$form .= ''.&mt(${$orderhash{$name}}[0]).''."\n";
} else {
$form .= ''.${$orderhash{$name}}[1].''."\n";