--- loncom/interface/lonmeta.pm	2008/11/10 15:15:29	1.213
+++ loncom/interface/lonmeta.pm	2008/11/20 15:19:39	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.213 2008/11/10 15:15:29 jms Exp $
+# $Id: lonmeta.pm,v 1.216 2008/11/20 15:19:39 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,141 +26,6 @@
 # http://www.lon-capa.org/
 
 
-=head1 NAME
-
-Apache::lonmeta - display meta data
-
-=head1 SYNOPSIS
-
-Handler to display meta data
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-handler()
-
-=head1 OTHER SUBROUTINES
-
-=over
-
-=item *
-
-&get_dynamic_metadata_from_sql($url) :
-
-Queries sql database for dynamic metdata
-Returns a hash of hashes, with keys of urls which match $url
-Returned fields are given below.
-
-Examples:
-
-    %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
-    ('/res/msu/korte/');
-
-    $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
-
-=item *
-
-dynamicmeta() : Fetch and evaluate dynamic metadata
-
-=item *
-
-access_count()
-
-=item *
-
-alttag() : Try to make an alt tag if there is none
-
-=item *
-
-authordisplay() : Author display
-
-=item *
-
-evalgraph() : Pretty display
-
-=item *
-
-diffgraph()
-
-=item *
-
-fieldnames()
-
-=item *
-
-portfolio_linked_path()
-
-=item *
-
-get_port_path_and_group()
-
-=item *
-
-portfolio_display_uri()
-
-=item *
-
-pre_select_course()
-
-=item *
-
-select_course()
-
-=item *
-
-prettyprint() : Pretty printing of metadata field
-
-=item *
-
-direct() : Pretty input of metadata field
-
-=item *
-
-selectbox()
-
-=item *
-
-relatedfield()
-
-=item *
-
-prettyinput()
-
-=item *
-
-report_bombs()
-
-=item *
-
-present_uneditable_metadata()
-
-=item *
-
-present_editable_metadata()
-
-=item *
-
-store_metadata()
-
-=item *
-
-store_transferred_addedfields()
-
-=item *
-
-store_portfolio_metadata()
-
-=item *
-
-update_metadata_table()
-
-=back
-
-=cut
-
-
 package Apache::lonmeta;
 
 use strict;
@@ -928,7 +793,7 @@ sub handler {
 						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri);
     } else {
-        $r->print(&Apache::loncommon::start_page('Catalog Information',
+        $r->print(&Apache::loncommon::start_page('Metadata',
 						 undef,
 						 {'domain' => $resdomain,}));
         &present_uneditable_metadata($r,$uri);
@@ -1342,11 +1207,11 @@ ENDDEL
 	}
 	$r->print('<br />'.$bombs);
     } else {
-        my $displayfile=&mt('Catalog Information for [_1]',$disuri);
+        my $displayfile=&mt('Metadata for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
-            $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir);
+            $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
@@ -1509,8 +1374,8 @@ ENDEDIT
             my ($outcome,$result) = &store_metadata($fn,$uri,'store');
             $r->print($result);
 	}
-	$r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Save Catalog Information').'" />');
+	$r->print($output.'<br /><input type="submit" title="Save Metadata" name="store" value="'.
+                  &mt('Save').'" />');
 
 	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
 	    my ($port_path,$group) = &get_port_path_and_group($uri);
@@ -1675,3 +1540,95 @@ sub update_metadata_table {
 1;
 __END__
 
+
+=head1 NAME
+
+Apache::lonmeta - display meta data
+
+=head1 SYNOPSIS
+
+Handler to display meta data
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item &get_dynamic_metadata_from_sql($url) :
+
+Queries sql database for dynamic metdata
+Returns a hash of hashes, with keys of urls which match $url
+Returned fields are given below.
+
+Examples:
+
+    %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
+    ('/res/msu/korte/');
+
+    $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
+
+=item dynamicmeta()
+
+Fetch and evaluate dynamic metadata
+
+=item access_count()
+
+=item alttag()
+
+Try to make an alt tag if there is none
+
+=item authordisplay()
+
+Author display
+
+=item evalgraph()
+
+Pretty display
+
+=item diffgraph()
+
+=item fieldnames()
+
+=item portfolio_linked_path()
+
+=item get_port_path_and_group()
+
+=item portfolio_display_uri()
+
+=item pre_select_course()
+
+=item select_course()
+
+=item prettyprint()
+
+Pretty printing of metadata field
+
+=item direct()
+
+Pretty input of metadata field
+
+=item selectbox()
+
+=item relatedfield()
+
+=item prettyinput()
+
+=item report_bombs()
+
+=item present_uneditable_metadata()
+
+=item present_editable_metadata()
+
+=item store_metadata()
+
+=item store_transferred_addedfields()
+
+=item store_portfolio_metadata()
+
+=item update_metadata_table()
+
+=back
+
+=cut