--- loncom/interface/lonmeta.pm	2007/05/15 20:21:17	1.208
+++ loncom/interface/lonmeta.pm	2008/11/10 15:15:29	1.213
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.208 2007/05/15 20:21:17 albertel Exp $
+# $Id: lonmeta.pm,v 1.213 2008/11/10 15:15:29 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,141 @@
 # 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;
@@ -42,24 +177,6 @@ use Apache::lonmsg;
 use LONCAPA qw(:DEFAULT :match);
 
 
-############################################################
-############################################################
-##
-## &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}
-##
-############################################################
-############################################################
 sub get_dynamic_metadata_from_sql {
     my ($url) = shift();
     my ($authordom,$author)=($url=~m{^/res/($match_domain)/($match_username)/});
@@ -839,10 +956,14 @@ sub report_bombs {
 	    &Apache::lonmsg::clear_author_res_msg($uri);
 	}
         my $clear=&mt('Clear all Messages in Subdirectory');
-	$r->print(<<ENDCLEAR);
+        my $cancel=&mt('Back to Directory');
+        my $cancelurl=$uri;
+        $cancelurl=~s/^\Q$domain\E/\/priv/;
+        $r->print(<<ENDCLEAR);
 <form method="post">
 <input type="submit" name="clearbombs" value="$clear" />
-</form>
+<a href="$cancelurl">$cancel</a>
+</form><hr />
 ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
@@ -1074,7 +1195,7 @@ sub print_dynamic_metadata {
             $table .= '</table>'.$/;
             $r->print($table);
         } else {
-            $r->print('No new dynamic data found.');
+            $r->print(&mt('No new dynamic data found.'));
         }
     } else {
         $r->print('<h4>'.
@@ -1221,13 +1342,11 @@ ENDDEL
 	}
 	$r->print('<br />'.$bombs);
     } else {
-        my $displayfile='Catalog Information for '.$disuri;
+        my $displayfile=&mt('Catalog Information for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
-            $displayfile=
-                &mt('Default Cataloging Information for Directory').' '.
-                $dir;
+            $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir);
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
@@ -1312,6 +1431,11 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'owner'} =
 		    $env{'user.name'}.':'.$env{'user.domain'};
 	    }
+	    if (! $Apache::lonpublisher::metadatafields{'author'}) {
+		$Apache::lonpublisher::metadatafields{'author'} =
+		    &Apache::loncommon::plainname($env{'user.name'},
+						  $env{'user.domain'});
+	    }
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
 
                 if ($file_type eq 'portfolio') {
@@ -1327,7 +1451,7 @@ ENDEDIT
                         ".description"}.'</strong>').'<br />');
                 }
 	    } else {
-		$r->print('<a href="'.$uri.'?changecourse=true">This resource is not associated with a course.</a><br />');
+		$r->print('<a href="'.$uri.'?changecourse=true">'.&mt('This resource is not associated with a course.').'</a><br />');
 	    }
 	}
 	if (@added_order) {