--- loncom/interface/lonmeta.pm	2008/11/10 15:15:29	1.213
+++ loncom/interface/lonmeta.pm	2008/11/18 19:14:22	1.215
@@ -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.215 2008/11/18 19:14:22 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,17 +37,11 @@ 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
+=head1 SUBROUTINES
 
 =over
 
-=item *
-
-&get_dynamic_metadata_from_sql($url) :
+=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
@@ -60,101 +54,65 @@ Examples:
 
     $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 *
+=item dynamicmeta()
 
-portfolio_display_uri()
+Fetch and evaluate dynamic metadata
 
-=item *
+=item access_count()
 
-pre_select_course()
+=item alttag()
 
-=item *
+Try to make an alt tag if there is none
 
-select_course()
+=item authordisplay()
 
-=item *
+Author display
 
-prettyprint() : Pretty printing of metadata field
+=item evalgraph()
 
-=item *
+Pretty display
 
-direct() : Pretty input of metadata field
+=item diffgraph()
 
-=item *
+=item fieldnames()
 
-selectbox()
+=item portfolio_linked_path()
 
-=item *
+=item get_port_path_and_group()
 
-relatedfield()
+=item portfolio_display_uri()
 
-=item *
+=item pre_select_course()
 
-prettyinput()
+=item select_course()
 
-=item *
+=item prettyprint()
 
-report_bombs()
+Pretty printing of metadata field
 
-=item *
+=item direct()
 
-present_uneditable_metadata()
+Pretty input of metadata field
 
-=item *
+=item selectbox()
 
-present_editable_metadata()
+=item relatedfield()
 
-=item *
+=item prettyinput()
 
-store_metadata()
+=item report_bombs()
 
-=item *
+=item present_uneditable_metadata()
 
-store_transferred_addedfields()
+=item present_editable_metadata()
 
-=item *
+=item store_metadata()
 
-store_portfolio_metadata()
+=item store_transferred_addedfields()
 
-=item *
+=item store_portfolio_metadata()
 
-update_metadata_table()
+=item update_metadata_table()
 
 =back
 
@@ -928,7 +886,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 +1300,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 +1467,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);