--- loncom/interface/lonmeta.pm	2008/12/10 18:43:32	1.218
+++ loncom/interface/lonmeta.pm	2011/10/24 22:39:18	1.242
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.218 2008/12/10 18:43:32 bisitz Exp $
+# $Id: lonmeta.pm,v 1.242 2011/10/24 22:39:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,7 +164,7 @@ sub evalgraph {
     my $val=int($value*10.+0.5)-10;
     my $output='<table border="0" cellpadding="0" cellspacing="0"><tr>';
     if ($val>=20) {
-	$output.='<td width="20" bgcolor="#555555">&nbsp&nbsp;</td>';
+	$output.='<td width="20" bgcolor="#555555">'.('&nbsp;' x2).'</td>';
     } else {
         $output.='<td width="'.($val).'" bgcolor="#555555">&nbsp;</td>'.
                  '<td width="'.(20-$val).'" bgcolor="#FF3333">&nbsp;</td>';
@@ -174,7 +174,7 @@ sub evalgraph {
 	$output.='<td width="'.($val-20).'" bgcolor="#33FF33">&nbsp;</td>'.
                  '<td width="'.(40-$val).'" bgcolor="#555555">&nbsp;</td>';
     } else {
-        $output.='<td width="20" bgcolor="#555555">&nbsp&nbsp;</td>';
+        $output.='<td width="20" bgcolor="#555555">'.('&nbsp;' x2).'</td>';
     }
     $output.='<td> ('.sprintf("%5.2f",$value).') </td></tr></table>';
     return $output;
@@ -338,7 +338,7 @@ sub pre_select_course {
         &Apache::lonpublisher::metaeval($result);
     }
     $r->print('<hr /><form method="post" action="" >');
-    $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>');
+    $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').'" />');
@@ -425,14 +425,14 @@ sub select_course {
 # Pretty printing of metadata field
 
 sub prettyprint {
-    my ($type,$value,$target,$prefix,$form,$noformat)=@_;
+    my ($type,$value,$target,$prefix,$form)=@_;
 # $target,$prefix,$form are optional and for filecrumbs only
     if (! defined($value)) { 
         return '&nbsp;'; 
     }
     # Title
     if ($type eq 'title') {
-	return '<font size="+1" face="arial">'.$value.'</font>';
+	return $value;
     }
     # Dates
     if (($type eq 'creationdate') ||
@@ -482,7 +482,7 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list') ||
 	($type eq 'dependencies')) {
-	return '<font size="-1"><ul>'.join("\n",map {
+	return '<ul class="LC_fontsize_medium">'.join("\n",map {
             my $url = &Apache::lonnet::clutter_with_no_wrapper($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -500,9 +500,9 @@ sub prettyprint {
                 } 
             }
             $_ = '<li>'.$title.' '.
-		&Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'-1',$noformat).
-                '</li>'
-	    } split(/\s*\,\s*/,$value)).'</ul></font>';
+                 &Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form).
+                 '</li>'
+	    } split(/\s*\,\s*/,$value)).'</ul>';
     }
     # Evaluations
     if (($type eq 'clear') ||
@@ -519,7 +519,7 @@ sub prettyprint {
     # List of courses
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
-        my $Str='<font size="-1"><ul>';
+        my $Str='<ul class="LC_fontsize_medium">';
 	my %descriptions;
         foreach my $course (@Courses) {
             my %courseinfo =
@@ -538,7 +538,7 @@ sub prettyprint {
 	    $Str .= $descriptions{$course};
 	}
 
-	return $Str.'</ul></font>';
+	return $Str.'</ul>';
     }
     # No pretty print found
     return $value;
@@ -555,12 +555,13 @@ sub selectbox {
         $functionref=\&direct;
     }
     my $selout='<select name="'.$name.'">';
-    foreach (@idlist) {
-        $selout.='<option value=\''.$_.'\'';
-        if ($_ eq $value) {
-	    $selout.=' selected>'.&{$functionref}($_).'</option>';
-	}
-        else {$selout.='>'.&{$functionref}($_).'</option>';}
+    foreach my $id (@idlist) {
+        $selout.='<option value="'.$id.'"';
+        if ($id eq $value) {
+	    $selout.=' selected="selected">'.&{$functionref}($id).'</option>';
+        } else {
+            $selout.='>'.&{$functionref}($id).'</option>';
+        }
     }
     return $selout.'</select>';
 }
@@ -577,7 +578,7 @@ sub relatedfield {
         return $relatedsep.'&nbsp;';
     }
     return $relatedsep.'<input type="checkbox" name="'.$fieldname.'_related"'.
-	($relatedvalue?' checked="1"':'').' />';
+	($relatedvalue?' checked="checked"':'').' />';
 }
 
 sub prettyinput {
@@ -637,7 +638,7 @@ sub prettyinput {
             
             if ($values) {
                 if ($only_one) {
-                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
+                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,\%meta_options));
                 } else {
                     $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
                 }
@@ -690,7 +691,7 @@ sub prettyinput {
     # Obsolete
     if ($type eq 'obsolete') {
 	return '<input type="checkbox" name="'.$fieldname.'"'.
-	    ($value?' checked="1"':'').' />'.
+	    ($value?' checked="checked"':'').' />'.
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
     # Obsolete replacement file
@@ -741,6 +742,23 @@ sub prettyinput {
                       $relatedvalue); 
 }
 
+# Create pageheader
+sub pageheader {
+    my $output = '';
+    # No CSTR? Include breadcrumbs
+    if ($env{'request.state'} ne 'construct') {
+        # loncommon::bodytag already includes breadcrumbs for CSTR
+        # by calling lonmenu::innerregister
+        $output = &Apache::lonhtmlcommon::breadcrumbs();
+    }
+    # CSTR? Include CSTR header
+    if ($env{'request.state'} eq 'construct') {
+          $output .= &Apache::loncommon::head_subbox(
+                         &Apache::loncommon::CSTR_pageheader());
+    }
+    return $output;
+}
+
 # Main Handler
 sub handler {
     my $r=shift;
@@ -754,16 +772,37 @@ sub handler {
     return OK if $r->header_only;
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//);
+
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+
+    if ($env{'request.state'} eq 'construct') {
+        &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 Catalog Information',
+        $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 {
@@ -780,22 +819,41 @@ sub handler {
             }
         }
     } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
-        $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+        &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|^/~|) { 
+    } elsif ($uri=~m|^/priv|) { 
         # Construction space
-        $r->print(&Apache::loncommon::start_page('Edit Catalog Information',
+        &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 {
-        $r->print(&Apache::loncommon::start_page('Metadata',
-						 undef,
-						 {'domain' => $resdomain,}));
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'Metadata',
+            'href'  => '',
+        });
+        $r->print(
+            &Apache::loncommon::start_page(
+                'Metadata',
+                undef,
+                {'domain' => $resdomain,
+                'only_body' => 1,})
+           .'<h1>'.&mt('Metadata').'</h1>'
+        );
         &present_uneditable_metadata($r,$uri);
     }
     $r->print(&Apache::loncommon::end_page());
@@ -816,7 +874,7 @@ sub report_bombs {
     $uri = &Apache::lonnet::declutter($uri);
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
     my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
-    if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
+    if (&Apache::loncacc::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
 	if ($env{'form.clearbombs'}) {
 	    &Apache::lonmsg::clear_author_res_msg($uri);
 	}
@@ -832,11 +890,11 @@ sub report_bombs {
 ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
-        foreach (sort(keys(%brokenurls))) {
-            if ($_=~/^\Q$uri\E/) {
+        foreach my $key (sort(keys(%brokenurls))) {
+            if ($key=~/^\Q$uri\E/) {
                 $r->print
-                    ('<a href="'.&Apache::lonnet::clutter($_).'">'.$_.'</a>'.
-                     &Apache::lonmsg::retrieve_author_res_msg($_).
+                    ('<a href="'.&Apache::lonnet::clutter($key).'">'.$key.'</a>'.
+                     &Apache::lonmsg::retrieve_author_res_msg($key).
                      '<hr />');
             }
         }
@@ -859,8 +917,8 @@ sub present_uneditable_metadata {
     my $uploaded = ($uri =~ m|/uploaded/|);
     my %content=();
     # Read file
-    foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
-        $content{$_}=&Apache::lonnet::metadata($uri,$_);
+    foreach my $key (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
+        $content{$key}=&Apache::lonnet::metadata($uri,$key);
     }
     # Render Output
     # displayed url
@@ -881,9 +939,8 @@ sub present_uneditable_metadata {
 	    $versiondisplay='Version: '.$currentversion;
 	}
     }
-    # crumbify displayed URL               uri     target prefix form  size
-    $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');
-    $disuri =~ s:<br />::g;
+    # crumbify displayed URL               uri     target prefix form 
+    $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef);
     # obsolete
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
@@ -926,10 +983,14 @@ sub present_uneditable_metadata {
 		   'obsolete', 
 		   'obsoletereplacement');
     }
+    my $rownum = 0;
     foreach my $field (@fields) {
+        my $lastrow = '';
+        $rownum ++;
+        $lastrow = 1 if ($rownum == @fields); 
         $table.=&Apache::lonhtmlcommon::row_title($lt{$field})
                .&prettyprint($field,$content{$field})
-               .&Apache::lonhtmlcommon::row_closure();
+               .&Apache::lonhtmlcommon::row_closure($lastrow);
         delete($content{$field});
     }
     #
@@ -963,26 +1024,32 @@ sub print_dynamic_metadata {
     my %dynmeta=&dynamicmeta($uri);
     #
     # General Access and Usage Statistics
+    $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>');
     if (exists($dynmeta{'count'}) ||
         exists($dynmeta{'sequsage'}) ||
         exists($dynmeta{'comefrom'}) ||
         exists($dynmeta{'goto'}) ||
         exists($dynmeta{'course'})) {
-        $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
-                  &Apache::lonhtmlcommon::start_pick_box());
-        foreach ('count',
-                 'sequsage','sequsage_list',
-                 'comefrom','comefrom_list',
-                 'goto','goto_list',
-                 'course','course_list') {
-            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
-                     .&prettyprint($_,$dynmeta{$_})
-                     .&Apache::lonhtmlcommon::row_closure()
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        my @counts = ('count','sequsage','sequsage_list',
+                      'comefrom','comefrom_list','goto',
+                      'goto_list','course','course_list');
+        my $rownum = 0;
+        foreach my $item (@counts) {
+            my $lastrow = '';
+            $rownum ++;
+            $lastrow = 1 if ($rownum == @counts);
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
+                     .&prettyprint($item,$dynmeta{$item})
+                     .&Apache::lonhtmlcommon::row_closure($lastrow)
             );
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
-        $r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
+        $r->print('<p>'
+                 .&mt('No Access or Usages Statistics are available for this resource.')
+                 .'</p>'
+        );
     }
     #
     # Assessment statistics
@@ -1000,20 +1067,26 @@ sub print_dynamic_metadata {
                      .&prettyprint('stdno',$dynmeta{'stdno'})
                      .&Apache::lonhtmlcommon::row_closure()
             );
-            foreach ('avetries','difficulty','disc') {
-                $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
-                         .&prettyprint($_,sprintf('%5.2f',$dynmeta{$_}))
-                         .&Apache::lonhtmlcommon::row_closure()
+            my @stats = ('avetries','difficulty','disc');
+            my $rownum = 0;
+            foreach my $item (@stats) {
+                my $lastrow = '';
+                $rownum ++;
+                $lastrow = 1 if ($rownum == @stats);
+                $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
+                         .&prettyprint($item,sprintf('%5.2f',$dynmeta{$item}))
+                         .&Apache::lonhtmlcommon::row_closure($lastrow)
                 );
             }
             $r->print(&Apache::lonhtmlcommon::end_pick_box());
         }
+        #
+        # New assessment statistics
+        $r->print('<h4>'
+                 .&mt('Recent Detailed Assessment Statistical Data')
+                 .'</h4>'
+        );
         if (exists($dynmeta{'stats'})) {
-            #
-            # New assessment statistics
-            $r->print('<h4>'.
-                      &mt('Recent Detailed Assessment Statistical Data').
-                      '</h4>');
             my $table=&Apache::loncommon::start_data_table()
                      .&Apache::loncommon::start_data_table_header_row()
                      .'<th>'.&mt('Course').'</th>'
@@ -1041,10 +1114,10 @@ sub print_dynamic_metadata {
                     '<td align="right">'.$data->{'sections'}.'</td>';
                 $table .=
                     '<td align="right">'.$data->{'stdno'}.'</td>';
-                foreach ('avetries','difficulty','disc') {
+                foreach my $item ('avetries','difficulty','disc') {
                     $table .= '<td align="right">';
-                    if (exists($data->{$_})) {
-                        $table .= sprintf('%.2f',$data->{$_}).'&nbsp;';
+                    if (exists($data->{$item})) {
+                        $table .= sprintf('%.2f',$data->{$item}).'&nbsp;';
                     } else {
                         $table .= '';
                     }
@@ -1059,7 +1132,10 @@ sub print_dynamic_metadata {
             $table .= &Apache::loncommon::end_data_table().$/;
             $r->print($table);
         } else {
-            $r->print(&mt('No new dynamic data found.'));
+            $r->print('<p>'
+                     .&mt('No new dynamic data found.')
+                     .'</p>'
+            );
         }
     } else {
         $r->print('<h4>'.
@@ -1068,43 +1144,61 @@ sub print_dynamic_metadata {
     }
 
     #
-    #
+    # Evaluation Data
+    $r->print('<h4>'.&mt('Evaluation Data').'</h4>');
     if (exists($dynmeta{'clear'})   || 
         exists($dynmeta{'depth'})   || 
         exists($dynmeta{'helpful'}) || 
         exists($dynmeta{'correct'}) || 
         exists($dynmeta{'technical'})){ 
-        $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
-                  &Apache::lonhtmlcommon::start_pick_box());
-        foreach ('clear','depth','helpful','correct','technical') {
-            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
-                     .&prettyprint($_,$dynmeta{$_})
-                     .&Apache::lonhtmlcommon::row_closure()
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        my @criteria = ('clear','depth','helpful','correct','technical');
+        my $rownum = 0;
+        foreach my $item (@criteria) {
+            my $lastrow = '';
+            $rownum ++;
+            $lastrow = 1 if ($rownum == @criteria);
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
+                     .&prettyprint($item,$dynmeta{$item})
+                     .&Apache::lonhtmlcommon::row_closure($lastrow)
             );
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
-        $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
+        $r->print('<p>'
+                 .&mt('No Evaluation Data is available for this resource.')
+                 .'</p>'
+        );
     }
+    # Evaluation Comments
     $uri=~/^\/res\/($match_domain)\/($match_username)\//; 
     if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2))
         || ($env{'user.role.ca./'.$1.'/'.$2})) {
+        $r->print('<h4>'.&mt('Evaluation Comments').'</h4>'
+                 .'<div>('
+                 .&mt('visible to author and co-authors only')
+                 .')</div>'
+        );
         if (exists($dynmeta{'comments'})) {
-            $r->print('<h4>'.&mt('Evaluation Comments').' ('.
-                      &mt('visible to author and co-authors only').
-                      ')</h4>'.
-                      '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+            $r->print('<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
         } else {
-            $r->print('<h4>'.&mt('There are no Evaluation Comments on this resource.').'</h4>');
+            $r->print('<p>'
+                     .&mt('There are no Evaluation Comments on this resource.')
+                     .'</p>'
+            );
         }
         my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
         if (defined($bombs) && $bombs ne '') {
-            $r->print('<a name="bombs" /><h4>'.&mt('Error Messages').' ('.
-                      &mt('visible to author and co-authors only').')'.
-                      '</h4>'.$bombs);
-        } else {
-            $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
-        }
+            $r->print('<a name="bombs" />'
+                     .'<h4 class="LC_error">'.&mt('Error Messages').'</h4>'
+                     .'<div>('
+                     .&mt('visible to author and co-authors only')
+                     .')</div>'
+                     .$bombs
+            );
+        } #else {
+        #    $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
+        #}
     }
     #
     # All other stuff
@@ -1112,21 +1206,31 @@ sub print_dynamic_metadata {
               &mt('Additional Metadata (non-standard, parameters, exports)').
               '</h3>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
-    foreach (sort(keys(%content))) {
-        my $name=$_;
-        if ($name!~/\.display$/) {
+    my @names;
+    foreach my $key (sort(keys(%content))) {
+        if ($key!~/\.display$/) {
+            push(@names,$key);
+        }
+    }
+    if (@names > 0) {
+        my $rownum = 0;
+        foreach my $name (@names) {
+            my $lastrow = '';
+            $rownum ++;
+            $lastrow = 1 if ($rownum == @names);
+
             my $display=&Apache::lonnet::metadata($uri,
                                                   $name.'.display');
             if (! $display) { 
                 $display=$name;
             };
             my $otherinfo='';
-            foreach ('name','part','type','default') {
+            foreach my $item ('name','part','type','default') {
                 if (defined(&Apache::lonnet::metadata($uri,
-                                                      $name.'.'.$_))) {
-                    $otherinfo.=' '.$_.'='.
+                                                      $name.'.'.$item))) {
+                    $otherinfo.=' '.$item.'='.
                         &Apache::lonnet::metadata($uri,
-                                                  $name.'.'.$_).'; ';
+                                                  $name.'.'.$item).'; ';
                 }
             }
             $r->print(&Apache::lonhtmlcommon::row_title($display)
@@ -1135,7 +1239,7 @@ sub print_dynamic_metadata {
             if ($otherinfo) {
                 $r->print(' ('.$otherinfo.')');
             }
-            $r->print(&Apache::lonhtmlcommon::row_closure());
+            $r->print(&Apache::lonhtmlcommon::row_closure($lastrow));
         }
     }
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -1214,7 +1318,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=();
@@ -1241,7 +1346,7 @@ ENDDEL
             }
         }
         $r->print(<<ENDEDIT);
-<h1>$displayfile</h1>
+<p>$displayfile</p>
 <form method="post" action="" name="defaultmeta">
 ENDEDIT
         my %lt=&fieldnames($file_type);
@@ -1333,9 +1438,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 = '';
@@ -1354,31 +1461,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);
@@ -1439,26 +1547,27 @@ sub store_metadata {
         $output .= $result;
     } else {
         if (! ($mfh=Apache::File->new('>'.$fn))) {
-            $output .= '<p><font color="red">';
+            $output .= '<p class="LC_error">';
             if ($caller eq 'transfer') {
                 $output .= &mt('Could not transfer data in added fields to notes');
             } else { 
                 $output .= &mt('Could not write metadata');
             }
-            $output .= ', '.&mt('FAIL').'</font></p>';
+            $output .= ', '.&mt('FAIL').'</p>';
             $outcome = 'fail';
         } else {
             print $mfh ($file_content);
             close($mfh);
             &update_metadata_table($uri);
-            $output .= '<p><font color="blue">';
+            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).
-                       '</font></p>';
+            $output .= &Apache::loncommon::confirmwrapper(
+                           &Apache::lonhtmlcommon::confirm_success(
+                               $confirmtext.' '.&Apache::lonlocal::locallocaltime(time)));
             $outcome = 'ok';
         }
     }
@@ -1486,25 +1595,25 @@ sub store_portfolio_metadata {
     $env{'form.'.$formname.'.filename'}=$new_fn;
     my $result =&Apache::lonnet::userfileupload($formname,'',$path);
     if ($result =~ /(error|notfound)/) {
-        $output = '<p><font color="red">';
+        $output = '<p class="LC_error">';
         if ($caller eq 'transfer') {
             $output .= 
                 &mt('Could not transfer data in added fields to notes'); 
         } else {
             $output .= &mt('Could not write metadata');
         }
-        $output .= ', '.&mt('FAIL').'</font></p>';
+        $output .= ', '.&mt('FAIL').'</p>';
         $outcome = 'fail';
     } else {
         &update_metadata_table($uri);
-        $output = '<p><font color="blue">';
+        $output = '<p class="LC_success">';
         if ($caller eq 'transfer') {
             $output .= &mt('Transferred data in added fields to notes');
         } else {
             $output .= &mt('Wrote Metadata');
         }
         $output .= ' '.&Apache::lonlocal::locallocaltime(time).
-                   '</font></p>';
+                   '</p>';
         $outcome = 'ok';
     }
     return ($outcome,$output);