--- loncom/interface/lonmeta.pm	2008/12/10 18:43:32	1.218
+++ loncom/interface/lonmeta.pm	2009/04/04 20:06:37	1.229
@@ -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.229 2009/04/04 20:06:37 bisitz 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').'" />');
@@ -432,7 +432,7 @@ sub prettyprint {
     }
     # 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).
+		&Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'0',$noformat).
                 '</li>'
-	    } split(/\s*\,\s*/,$value)).'</ul></font>';
+	    } 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 {
@@ -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
@@ -761,7 +762,7 @@ sub handler {
     } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
 	    ($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,}));
         if ($env{'form.store'}) {
@@ -780,13 +781,13 @@ sub handler {
             }
         }
     } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
-        $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+        $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata',
 						 undef,
 						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/~|) { 
         # Construction space
-        $r->print(&Apache::loncommon::start_page('Edit Catalog Information',
+        $r->print(&Apache::loncommon::start_page('Edit Metadata',
 						"\n".'<script type="text/javascript">'."\n".
                                                 &Apache::loncommon::browser_and_searcher_javascript().
                                                 "\n".'</script>',
@@ -832,11 +833,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 +860,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
@@ -926,10 +927,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});
     }
     #
@@ -970,14 +975,17 @@ sub print_dynamic_metadata {
         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()
+        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());
@@ -1000,10 +1008,15 @@ 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());
@@ -1041,10 +1054,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 .= '';
                     }
@@ -1076,10 +1089,15 @@ sub print_dynamic_metadata {
         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()
+        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());
@@ -1112,21 +1130,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 +1163,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());
@@ -1439,26 +1467,26 @@ 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">';
+            $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';
         }
     }
@@ -1486,25 +1514,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);