--- loncom/interface/lonmeta.pm	2004/06/16 18:33:46	1.80
+++ loncom/interface/lonmeta.pm	2004/08/24 21:40:00	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.80 2004/06/16 18:33:46 matthew Exp $
+# $Id: lonmeta.pm,v 1.86 2004/08/24 21:40:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,6 @@ use Apache::lonmsg;
 ############################################################
 sub get_dynamic_metadata_from_sql {
     my ($url) = shift();
-    # &Apache::lonnet::logthis('url = '.$url);
     my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
     if (! defined($authordom)) {
         $authordom = shift();
@@ -72,11 +71,12 @@ sub get_dynamic_metadata_from_sql {
     if (! defined($authordom) || ! defined($author)) {
         return ();
     }
-    my @Fields = ('url',
+    my @Fields = ('url','count','course',
                   'goto','goto_list',
                   'comefrom','comefrom_list',
                   'sequsage','sequsage_list',
                   'stdno','stdno_list',
+		  'dependencies',
                   'avetries','avetries_list',
                   'difficulty','difficulty_list',
                   'disc','disc_list',
@@ -113,7 +113,6 @@ sub get_dynamic_metadata_from_sql {
             my $url = $Data[0];
             for (my $i=0;$i<=$#Fields;$i++) {
                 $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
-                # &Apache::lonnet::logthis('  '.$Fields[$i].' => '.$Data[$i]);
             }
         }
         $finished = 1;
@@ -257,7 +256,7 @@ sub fieldnames {
          'owner' => 'Publisher/Owner',
          'copyright' => 'Copyright/Distribution',
          'customdistributionfile' => 'Custom Distribution File',
-         'sourceavail' => 'Source Availible',
+         'sourceavail' => 'Source Available',
          'sourcerights' => 'Source Custom Distribution File',
          'obsolete' => 'Obsolete',
          'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
@@ -279,13 +278,15 @@ sub fieldnames {
          'stdno'      => 'Total number of students who have worked on this problem',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
+	 'dependencies' => 'Resources used by this resource',
          );
 }
 
 # Pretty printing of metadata field
 
 sub prettyprint {
-    my ($type,$value)=@_;
+    my ($type,$value,$target,$prefix,$form,$noformat)=@_;
+# $target,$prefix,$form are optional and for filecrumbs only
     if (! defined($value)) { 
         return '&nbsp;'; 
     }
@@ -339,8 +340,9 @@ sub prettyprint {
 	($type eq 'obsoletereplacement') ||
 	($type eq 'goto_list') ||
 	($type eq 'comefrom_list') ||
-	($type eq 'sequsage_list')) {
-	return join('<br />',map {
+	($type eq 'sequsage_list') ||
+	($type eq 'dependencies')) {
+	return '<ul><font size="-1">'.join("\n",map {
             my $url = &Apache::lonnet::clutter($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -357,11 +359,10 @@ sub prettyprint {
                     $title .= ' Syllabus';
                 } 
             }
-            $_ = '<b>'.$title.'</b> '.
-                '<a href="'.$url.'" target="preview">'.
-                '<font size="-1">'.$url.'</font>'.
-                '</a>'
-        } split(/\s*\,\s*/,$value));
+            $_ = '<li>'.$title.' '.
+		&Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'-1',$noformat).
+                '</li>'
+	    } split(/\s*\,\s*/,$value)).'</ul></font>';
     }
     # Evaluations
     if (($type eq 'clear') ||
@@ -543,7 +544,7 @@ sub handler {
         &present_editable_metadata($r,$uri);
     } else {
         $r->print(&Apache::loncommon::bodytag
-                  ('Catalog Information','','','',$resdomain));
+		  ('Catalog Information','','','',$resdomain));
         &present_uneditable_metadata($r,$uri);
     }
     $r->print('</body></html>');
@@ -832,7 +833,7 @@ sub print_dynamic_metadata {
     # All other stuff
     $r->print('<h3>'.
               &mt('Additional Metadata (non-standard, parameters, exports)').
-              '</h3>');
+              '</h3><table border="0" cellspacing="1">');
     foreach (sort(keys(%content))) {
         my $name=$_;
         if ($name!~/\.display$/) {
@@ -850,13 +851,14 @@ sub print_dynamic_metadata {
                                                   $name.'.'.$_).'; ';
                 }
             }
-            $r->print('<b>'.$display.':</b> '.$content{$name});
+            $r->print('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
             if ($otherinfo) {
                 $r->print(' ('.$otherinfo.')');
             }
-            $r->print("<br />\n");
+            $r->print("</font></td></tr>\n");
         }
     }
+    $r->print("</table>");
     return;
 }
 
@@ -903,19 +905,15 @@ ENDBOMBS
                 &mt('Default Cataloging Information for Directory').' '.
                 $dir;
         }
-        my $bodytag=
-            &Apache::loncommon::bodytag('Edit Catalog Information');
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
         &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
         $r->print(<<ENDEDIT);
-<html><head><title>Edit Catalog Information</title></head>
-$bodytag
 <h1>$displayfile</h1>
 <form method="post" name="defaultmeta">
 ENDEDIT
         $r->print('<script language="JavaScript">'.
-                  &Apache::loncommon::browser_and_searcher_javascript.
+                  &Apache::loncommon::browser_and_searcher_javascript().
                   '</script>');
         my %lt=&fieldnames();
         foreach ('author','title','subject','keywords','abstract','notes',