--- loncom/interface/lonmeta.pm 2009/04/29 15:20:54 1.232
+++ loncom/interface/lonmeta.pm 2009/05/28 17:08:32 1.235
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.232 2009/04/29 15:20:54 bisitz Exp $
+# $Id: lonmeta.pm,v 1.235 2009/05/28 17:08:32 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -742,6 +742,13 @@ sub prettyinput {
$relatedvalue);
}
+# Create pageheader
+sub pageheader {
+ return &Apache::lonhtmlcommon::breadcrumbs()
+ .&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader());
+}
+
# Main Handler
sub handler {
my $r=shift;
@@ -755,16 +762,34 @@ sub handler {
return OK if $r->header_only;
my ($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//);
+
+ # Breadcrumbs
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Construction Space',
+ 'href' => &Apache::loncommon::authorspace(),
+ });
+
if ($uri=~m:/adm/bombs/(.*)$:) {
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Error Messages',
+ 'href' => '',
+ });
$r->print(&Apache::loncommon::start_page('Error Messages'));
+ $r->print(&pageheader());
# Looking for all bombs?
&report_bombs($r,$uri);
} elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Edit Portfolio File Metadata',
+ 'href' => '',
+ });
($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|);
$r->print(&Apache::loncommon::start_page('Edit Portfolio File Metadata',
undef,
{'domain' => $resdomain,}));
+ $r->print(&pageheader());
if ($env{'form.store'}) {
&present_editable_metadata($r,$uri,'portfolio');
} else {
@@ -781,22 +806,37 @@ sub handler {
}
}
} elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Edit Group Portfolio File Metadata',
+ 'href' => '',
+ });
$r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata',
undef,
{'domain' => $resdomain,}));
+ $r->print(&pageheader());
&present_editable_metadata($r,$uri,'groups');
} elsif ($uri=~m|^/~|) {
# Construction space
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Edit Metadata',
+ 'href' => '',
+ });
$r->print(&Apache::loncommon::start_page('Edit Metadata',
"\n".'<script type="text/javascript">'."\n".
&Apache::loncommon::browser_and_searcher_javascript().
"\n".'</script>',
{'domain' => $resdomain,}));
+ $r->print(&pageheader());
&present_editable_metadata($r,$uri);
} else {
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Metadata',
+ 'href' => '',
+ });
$r->print(&Apache::loncommon::start_page('Metadata',
undef,
{'domain' => $resdomain,}));
+ $r->print(&pageheader());
&present_uneditable_metadata($r,$uri);
}
$r->print(&Apache::loncommon::end_page());
@@ -1262,7 +1302,8 @@ ENDDEL
if ($disuri=~/\/default$/) {
my $dir=$disuri;
$dir=~s/default$//;
- $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
+ $displayfile=&mt('Default Metadata for Directory [_1]'
+ ,'<span class="LC_filename">'.$dir.'</span>');
}
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
@@ -1289,7 +1330,7 @@ ENDDEL
}
}
$r->print(<<ENDEDIT);
-<h1>$displayfile</h1>
+<p>$displayfile</p>
<form method="post" action="" name="defaultmeta">
ENDEDIT
my %lt=&fieldnames($file_type);
@@ -1381,9 +1422,11 @@ ENDEDIT
$lt{$field_name} = $$added_metadata_fields{$field_name};
}
}
- $output .= &Apache::loncommon::start_data_table();
- my $row_alt = 1;
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ my $last = $#fields + 1;
+ my $rowcount = 0;
foreach my $field_name (@fields) {
+ $rowcount++;
if (defined($env{'form.new_'.$field_name})) {
my @values = &Apache::loncommon::get_env_multiple('form.new_'.$field_name);
my $newvalue = '';
@@ -1402,31 +1445,32 @@ ENDEDIT
($field_name eq 'courserestricted'))&&
(!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){
- $output .= "\n".&Apache::loncommon::start_data_table_row();
- $output .= ('<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
- &prettyinput($field_name,
+ $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name})
+ .&prettyinput($field_name,
$Apache::lonpublisher::metadatafields{$field_name},
'new_'.$field_name,'defaultmeta',
undef,undef,undef,undef,
- $Apache::lonpublisher::metadatafields{'courserestricted'}).'</td>');
- $output .= &Apache::loncommon::end_data_table_row();
+ $Apache::lonpublisher::metadatafields{'courserestricted'});
+ $output .= &Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0);
}
} else {
- $output.=(&Apache::loncommon::start_data_table_row().'<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
- &prettyinput($field_name,
+ $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name})
+ .&prettyinput($field_name,
$Apache::lonpublisher::metadatafields{$field_name},
- 'new_'.$field_name,'defaultmeta').'</td>'.&Apache::loncommon::end_data_table_row());
+ 'new_'.$field_name,'defaultmeta')
+ .&Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0);
}
}
- $output .= &Apache::loncommon::end_data_table();
+ $output .= &Apache::lonhtmlcommon::end_pick_box();
if ($env{'form.store'}) {
my ($outcome,$result) = &store_metadata($fn,$uri,'store');
$r->print($result);
}
- $r->print($output.'<br /><input type="submit" title="'.&mt('Save Metadata').'" name="store" value="'.
- &mt('Save').'" />');
+ my $savebutton = '<p><input type="submit" name="store"'
+ .' value="'.&mt('Save').'" title="'.&mt('Save Metadata').'" /></p>';
+ $r->print($savebutton.$output.$savebutton);
if ($file_type eq 'portfolio' || $file_type eq 'groups') {
my ($port_path,$group) = &get_port_path_and_group($uri);
@@ -1499,14 +1543,15 @@ sub store_metadata {
print $mfh ($file_content);
close($mfh);
&update_metadata_table($uri);
- $output .= '<p class="LC_success">';
+ my $confirmtext;
if ($caller eq 'transfer') {
- $output .= &mt('Transferred data in added fields to notes');
+ $confirmtext = &mt('Transferred data in added fields to notes');
} else {
- $output .= &mt('Wrote Metadata');
+ $confirmtext = &mt('Wrote Metadata');
}
- $output .= ' '.&Apache::lonlocal::locallocaltime(time).
- '</p>';
+ $output .= &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ $confirmtext.' '.&Apache::lonlocal::locallocaltime(time)));
$outcome = 'ok';
}
}