version 1.141, 2011/12/23 19:07:50
|
version 1.143, 2012/04/27 16:13:47
|
Line 458 sub putdirectory {
|
Line 458 sub putdirectory {
|
my $disfilename = $dirname; |
my $disfilename = $dirname; |
# Don't display directory itself, and there is no way up from root directory |
# Don't display directory itself, and there is no way up from root directory |
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
my $kaputt=0; |
my $kaputt=0; |
if (ref($bombs) eq 'HASH') { |
if (ref($bombs) eq 'HASH') { |
foreach my $key (keys(%{$bombs})) { |
foreach my $key (keys(%{$bombs})) { |
if ($key =~ m{^\Q$targetdir/$disfilename\E/}) { $kaputt=1; last; } |
my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename"); |
} |
if (($key) =~ m{^\Q$currentdir\E/}) { $kaputt=1; last; } |
|
} |
} |
} |
# |
# |
# Get the metadata from that directory's default.meta to display titles |
# Get the metadata from that directory's default.meta to display titles |
Line 522 sub putresource {
|
Line 523 sub putresource {
|
my $pubstatus = 'unpublished'; |
my $pubstatus = 'unpublished'; |
my $status=&mt('Unpublished'); |
my $status=&mt('Unpublished'); |
my $css_class='LC_browser_file'; |
my $css_class='LC_browser_file'; |
my $title=' '; |
my $title=''; |
my $publish_button=&mt('Publish'); |
my $publish_button=&mt('Publish'); |
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; |
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; |
my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
Line 590 sub putresource {
|
Line 591 sub putresource {
|
&mt('Diffs'),600,500); |
&mt('Diffs'),600,500); |
} |
} |
} |
} |
|
|
$title.="\n".'<br /><a href="'.$linkfilename.'.meta">'. |
|
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>'; |
|
|
|
if (!$meta_same) { |
if (!$meta_same) { |
$title = &mt('Metadata Modified').'<br />'.$title. |
$title = &mt('Metadata Modified').'<br />'.$title. |
'<br />'. |
'<br />'. |
Line 609 sub putresource {
|
Line 606 sub putresource {
|
&Apache::loncommon::modal_link( |
&Apache::loncommon::modal_link( |
'/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); |
'/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); |
} |
} |
|
# Allow editing metadata of published and unpublished resources |
|
$title .= "\n".'<br />' if ($title); |
|
$title .= '<a href="'.$linkfilename.'.meta">'. |
|
($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}? |
|
'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />': |
|
&mt('Edit Metadata')). |
|
'</a>'; |
|
|
my $editlink=''; |
my $editlink=''; |
my $editlink2=''; |
my $editlink2=''; |
if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { |
if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { |