version 1.160, 2006/07/19 15:31:05
|
version 1.164, 2006/08/04 22:16:38
|
Line 170 sub authordisplay {
|
Line 170 sub authordisplay {
|
my ($aname,$adom)=@_; |
my ($aname,$adom)=@_; |
return &Apache::loncommon::aboutmewrapper |
return &Apache::loncommon::aboutmewrapper |
(&Apache::loncommon::plainname($aname,$adom), |
(&Apache::loncommon::plainname($aname,$adom), |
$aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>'; |
$aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>'; |
} |
} |
|
|
# Pretty display |
# Pretty display |
Line 315 sub get_port_path_and_group {
|
Line 315 sub get_port_path_and_group {
|
$port_path = '/adm/portfolio'; |
$port_path = '/adm/portfolio'; |
} |
} |
if ($env{'form.group'} ne $group) { |
if ($env{'form.group'} ne $group) { |
$env{'form.group'} = $group) { |
$env{'form.group'} = $group; |
} |
} |
return ($port_path,$group); |
return ($port_path,$group); |
} |
} |
Line 716 sub handler {
|
Line 716 sub handler {
|
# |
# |
my ($resdomain,$resuser)= |
my ($resdomain,$resuser)= |
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); |
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); |
|
|
if ($uri=~m:/adm/bombs/(.*)$:) { |
if ($uri=~m:/adm/bombs/(.*)$:) { |
$r->print(&Apache::loncommon::start_page('Error Messages')); |
$r->print(&Apache::loncommon::start_page('Error Messages')); |
# Looking for all bombs? |
# Looking for all bombs? |
&report_bombs($r,$uri); |
&report_bombs($r,$uri); |
} elsif ($uri=~/\/portfolio\//) { |
} elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) { |
($resdomain,$resuser)= |
($resdomain,$resuser)= |
(&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|); |
(&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|); |
$r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information', |
$r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information', |
undef, |
undef, |
{'domain' => $resdomain,})); |
{'domain' => $resdomain,})); |
Line 732 sub handler {
|
Line 731 sub handler {
|
} else { |
} else { |
&pre_select_course($r,$uri); |
&pre_select_course($r,$uri); |
} |
} |
} elsif ($uri=~/^\/\~/) { |
} elsif ($uri=~m|^/~|) { |
# Construction space |
# Construction space |
$r->print(&Apache::loncommon::start_page('Edit Catalog nformation', |
$r->print(&Apache::loncommon::start_page('Edit Catalog nformation', |
undef, |
undef, |
Line 798 ENDCLEAR
|
Line 797 ENDCLEAR
|
sub present_uneditable_metadata { |
sub present_uneditable_metadata { |
my ($r,$uri) = @_; |
my ($r,$uri) = @_; |
# |
# |
|
my $uploaded = ($uri =~ m|/uploaded/|); |
my %content=(); |
my %content=(); |
# Read file |
# Read file |
foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { |
foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { |
Line 810 sub present_uneditable_metadata {
|
Line 810 sub present_uneditable_metadata {
|
my $disuri=&Apache::lonnet::clutter($uri); |
my $disuri=&Apache::lonnet::clutter($uri); |
$disuri=~s/^\/adm\/wrapper//; |
$disuri=~s/^\/adm\/wrapper//; |
# version |
# version |
my $currentversion=&Apache::lonnet::getversion($disuri); |
|
my $versiondisplay=''; |
my $versiondisplay=''; |
if ($thisversion) { |
if (!$uploaded) { |
$versiondisplay=&mt('Version').': '.$thisversion. |
my $currentversion=&Apache::lonnet::getversion($disuri); |
' ('.&mt('most recent version').': '. |
if ($thisversion) { |
($currentversion>0 ? |
$versiondisplay=&mt('Version').': '.$thisversion. |
$currentversion : |
' ('.&mt('most recent version').': '. |
&mt('information not available')).')'; |
($currentversion>0 ? |
} else { |
$currentversion : |
$versiondisplay='Version: '.$currentversion; |
&mt('information not available')).')'; |
|
} else { |
|
$versiondisplay='Version: '.$currentversion; |
|
} |
} |
} |
# crumbify displayed URL uri target prefix form size |
# crumbify displayed URL uri target prefix form size |
$disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1'); |
$disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1'); |
Line 839 sub present_uneditable_metadata {
|
Line 841 sub present_uneditable_metadata {
|
if (! defined($title)) { |
if (! defined($title)) { |
$title = 'Untitled Resource'; |
$title = 'Untitled Resource'; |
} |
} |
foreach ('title', |
my @fields; |
'author', |
if ($uploaded) { |
'subject', |
@fields = ('title','author','subject','keywords','notes','abstract', |
'keywords', |
'lowestgradelevel','highestgradelevel','standards','mime', |
'notes', |
'owner'); |
'abstract', |
} else { |
'lowestgradelevel', |
@fields = ('title', |
'highestgradelevel', |
'author', |
'standards', |
'subject', |
'mime', |
'keywords', |
'language', |
'notes', |
'creationdate', |
'abstract', |
'lastrevisiondate', |
'lowestgradelevel', |
'owner', |
'highestgradelevel', |
'copyright', |
'standards', |
'customdistributionfile', |
'mime', |
'sourceavail', |
'language', |
'sourcerights', |
'creationdate', |
'obsolete', |
'lastrevisiondate', |
'obsoletereplacement') { |
'owner', |
$table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}. |
'copyright', |
|
'customdistributionfile', |
|
'sourceavail', |
|
'sourcerights', |
|
'obsolete', |
|
'obsoletereplacement'); |
|
} |
|
foreach my $field (@fields) { |
|
$table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}. |
'</td><td bgcolor="#CCCCCC">'. |
'</td><td bgcolor="#CCCCCC">'. |
&prettyprint($_,$content{$_}).'</td></tr>'; |
&prettyprint($field,$content{$field}).'</td></tr>'; |
delete $content{$_}; |
delete($content{$field}); |
} |
} |
# |
# |
$r->print(<<ENDHEAD); |
$r->print(<<ENDHEAD); |
Line 876 $versiondisplay
|
Line 886 $versiondisplay
|
$table |
$table |
</table> |
</table> |
ENDHEAD |
ENDHEAD |
if ($env{'user.adv'}) { |
if (!$uploaded && $env{'user.adv'}) { |
&print_dynamic_metadata($r,$uri,\%content); |
&print_dynamic_metadata($r,$uri,\%content); |
} |
} |
return; |
return; |
Line 1161 ENDEDIT
|
Line 1171 ENDEDIT
|
my $output; |
my $output; |
my @fields; |
my @fields; |
if ($file_type eq 'portfolio') { |
if ($file_type eq 'portfolio') { |
@fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', |
@fields = ('author','title','subject','keywords','abstract', |
|
'notes','lowestgradelevel', |
'highestgradelevel','standards'); |
'highestgradelevel','standards'); |
} else { |
} else { |
@fields = ('author','title','subject','keywords','abstract','notes', |
@fields = ('author','title','subject','keywords','abstract','notes', |
Line 1180 ENDEDIT
|
Line 1191 ENDEDIT
|
} |
} |
if (! $Apache::lonpublisher::metadatafields{'copyright'}) { |
if (! $Apache::lonpublisher::metadatafields{'copyright'}) { |
$Apache::lonpublisher::metadatafields{'copyright'}= |
$Apache::lonpublisher::metadatafields{'copyright'}= |
'default'; |
'default'; |
} |
} |
if ($file_type eq 'portfolio') { |
if ($file_type eq 'portfolio') { |
|
if (! $Apache::lonpublisher::metadatafields{'mime'}) { |
|
($Apache::lonpublisher::metadatafields{'mime'}) = |
|
( $target=~/\.(\w+)$/ ); |
|
} |
|
if (! $Apache::lonpublisher::metadatafields{'owner'}) { |
|
$Apache::lonpublisher::metadatafields{'owner'} = |
|
$env{'user.name'}.':'.$env{'user.domain'}; |
|
} |
|
|
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') { |
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') { |
$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}. |
$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}. |
'</strong>').'<br />'); |
'</strong>').'<br />'); |