--- loncom/interface/lonmeta.pm 2006/08/04 19:42:55 1.162
+++ loncom/interface/lonmeta.pm 2006/08/28 00:13:22 1.168.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.162 2006/08/04 19:42:55 albertel Exp $
+# $Id: lonmeta.pm,v 1.168.2.1 2006/08/28 00:13:22 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -170,7 +170,7 @@ sub authordisplay {
my ($aname,$adom)=@_;
return &Apache::loncommon::aboutmewrapper
(&Apache::loncommon::plainname($aname,$adom),
- $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+ $aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>';
}
# Pretty display
@@ -287,15 +287,22 @@ sub portfolio_linked_path {
if ($group) {
$start = "groups/$group/".$start;
}
- my $result = &Apache::portfolio::make_anchor($port_path,$start,'/');
-
+ my %anchor_fields = (
+ 'selectfile' => $start,
+ 'currentpath' => '/'
+ );
+ my $result = &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$start);
my $fullpath = '/';
my (undef,@tree) = split('/',$path);
my $filename = pop(@tree);
foreach my $dir (@tree) {
$fullpath .= $dir.'/';
$result .= '/';
- $result .= &Apache::portfolio::make_anchor($port_path,$dir,$fullpath);
+ my %anchor_fields = (
+ 'selectfile' => $dir,
+ 'currentpath' => $fullpath
+ );
+ $result .= &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$dir);
}
$result .= "/$filename";
return $result;
@@ -358,14 +365,18 @@ sub pre_select_course {
$r->print('<p>'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'','<tt>'.$res_uri.'</tt>').'</p>');
$output = &select_course();
$r->print($output.'<br /><input type="submit" name="store" value="'.
- &mt('Associate Resource With Selected Course').'">');
+ &mt('Associate Resource With Selected Course').'" />');
$r->print('</form>');
my ($port_path,$group) = &get_port_path_and_group($uri);
- $r->print('<br /><br /><form method="POST" action="'.$port_path.'">'.
+ my $group_input;
+ if ($group) {
+ $group_input = '<input type="hidden" name="group" value="'.$group.'" />';
+ }
+ $r->print('<br /><br /><form method="post" action="'.$port_path.'">'.
'<input type="hidden" name="currentpath" value="'.$path.'" />'.
- '<input type="hidden" name="group" value="'.$group.'" />'.
- '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
+ $group_input.
+ '<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
'</form>');
return;
@@ -713,7 +724,6 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
- #
my ($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
if ($uri=~m:/adm/bombs/(.*)$:) {
@@ -731,6 +741,11 @@ sub handler {
} else {
&pre_select_course($r,$uri);
}
+ } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
+ $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
+ &present_editable_metadata($r,$uri,'portfolio');
} elsif ($uri=~m|^/~|) {
# Construction space
$r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
@@ -841,30 +856,38 @@ sub present_uneditable_metadata {
if (! defined($title)) {
$title = 'Untitled Resource';
}
- foreach ('title',
- 'author',
- 'subject',
- 'keywords',
- 'notes',
- 'abstract',
- 'lowestgradelevel',
- 'highestgradelevel',
- 'standards',
- 'mime',
- 'language',
- 'creationdate',
- 'lastrevisiondate',
- 'owner',
- 'copyright',
- 'customdistributionfile',
- 'sourceavail',
- 'sourcerights',
- 'obsolete',
- 'obsoletereplacement') {
- $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
+ my @fields;
+ if ($uploaded) {
+ @fields = ('title','author','subject','keywords','notes','abstract',
+ 'lowestgradelevel','highestgradelevel','standards','mime',
+ 'owner');
+ } else {
+ @fields = ('title',
+ 'author',
+ 'subject',
+ 'keywords',
+ 'notes',
+ 'abstract',
+ 'lowestgradelevel',
+ 'highestgradelevel',
+ 'standards',
+ 'mime',
+ 'language',
+ 'creationdate',
+ 'lastrevisiondate',
+ 'owner',
+ 'copyright',
+ 'customdistributionfile',
+ 'sourceavail',
+ 'sourcerights',
+ 'obsolete',
+ 'obsoletereplacement');
+ }
+ foreach my $field (@fields) {
+ $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}.
'</td><td bgcolor="#CCCCCC">'.
- &prettyprint($_,$content{$_}).'</td></tr>';
- delete $content{$_};
+ &prettyprint($field,$content{$field}).'</td></tr>';
+ delete($content{$field});
}
#
$r->print(<<ENDHEAD);
@@ -1163,7 +1186,8 @@ ENDEDIT
my $output;
my @fields;
if ($file_type eq 'portfolio') {
- @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+ @fields = ('author','title','subject','keywords','abstract',
+ 'notes','lowestgradelevel',
'highestgradelevel','standards');
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
@@ -1182,9 +1206,18 @@ ENDEDIT
}
if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
$Apache::lonpublisher::metadatafields{'copyright'}=
- 'default';
+ 'default';
}
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') {
$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
'</strong>').'<br />');