--- loncom/interface/lonmeta.pm	2012/05/21 19:01:12	1.246
+++ loncom/interface/lonmeta.pm	2014/06/12 12:08:02	1.253
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.246 2012/05/21 19:01:12 bisitz Exp $
+# $Id: lonmeta.pm,v 1.253 2014/06/12 12:08:02 kruse Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -351,7 +351,7 @@ sub pre_select_course {
     if ($group) {
         $group_input = '<input type="hidden" name="group" value="'.$group.'" />';
     } 
-    $r->print('<br /><br /><form method="post" action="'.$port_path.'">'.
+    $r->print(' <form method="post" action="'.$port_path.'">'.
               '<input type="hidden" name="currentpath" value="'.$path.'" />'.
 	      $group_input.
 	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
@@ -389,9 +389,9 @@ sub select_course {
                     &mt('You can choose to transfer data from the added fields to the "Notes" field if you are planning to change the course association.').'<br /><br />'.
                     &Apache::loncommon::start_data_table().
                     &Apache::loncommon::start_data_table_header_row().
-                    '<th>Copy to notes?</th>'."\n".
-                    '<th>Field name</th>'."\n".
-                    '<th>Values</th>'."\n".
+                    '<th>'.&mt('Copy to notes?').'</th>'."\n".
+                    '<th>'.&mt('Field Name').'</th>'."\n".
+                    '<th>'.&mt('Values').'</th>'."\n".
                     &Apache::loncommon::end_data_table_header_row().
                     $transfernotes.
                     &Apache::loncommon::end_data_table().'<br />';
@@ -455,7 +455,7 @@ sub prettyprint {
     }
     # MIME
     if ($type eq 'mime') {
-        return '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
+        return '<img src="'.&Apache::loncommon::icon($value).'" alt="" />&nbsp;'.
             &Apache::loncommon::filedescription($value);
     }
     # Person
@@ -778,7 +778,7 @@ sub handler {
 
     if ($env{'request.state'} eq 'construct') {
         &Apache::lonhtmlcommon::add_breadcrumb({
-            'text'  => 'Construction Space',
+            'text'  => 'Authoring Space',
             'href'  => &Apache::loncommon::authorspace($uri),
         });
     }
@@ -829,7 +829,7 @@ sub handler {
         $r->print(&pageheader());
         &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/priv|) { 
-        # Construction space
+        # Authoring space
         &Apache::lonhtmlcommon::add_breadcrumb({
             'text'  => 'Edit Metadata',
             'href'  => '',
@@ -872,9 +872,13 @@ sub report_bombs {
     # Set document type
     $uri =~ s:/adm/bombs/::;
     $uri = &Apache::lonnet::declutter($uri);
-    $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
+    $r->print(
+        '<p>'.&mt('Folder: [_1]',
+                  '<span class="LC_filename">'.&Apache::lonnet::clutter($uri).'</span>')
+       .'</p>'
+    );
     my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
-    if (!&Apache::loncacc::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
+    if (!&Apache::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
         $r->print('<p class="LC_error">'.&mt('Not authorized').'</p>');
         return;
     }
@@ -965,7 +969,7 @@ sub present_uneditable_metadata {
 		 $currentversion   :
 		 &mt('information not available')).')';
 	} else {
-	    $versiondisplay='Version: '.$currentversion;
+	    $versiondisplay=&mt('Version: [_1]',$currentversion);
 	}
     }
     # crumbify displayed URL               uri     target prefix form 
@@ -983,7 +987,7 @@ sub present_uneditable_metadata {
     my $table='';
     my $title = $content{'title'};
     if (! defined($title)) {
-        $title = 'Untitled Resource';
+        $title = &mt('Untitled Resource');
     }
     my @fields;
     if ($uploaded) {
@@ -1118,6 +1122,7 @@ sub print_dynamic_metadata {
         if (exists($dynmeta{'stats'})) {
             my $table=&Apache::loncommon::start_data_table()
                      .&Apache::loncommon::start_data_table_header_row()
+		     .'<th>'.&mt('Domain').'</th>'
                      .'<th>'.&mt('Course').'</th>'
                      .'<th>'.&mt('Section(s)').'</th>'
                      .'<th>'.&mt('Num Students').'</th>'
@@ -1138,6 +1143,8 @@ sub print_dynamic_metadata {
                     next;
                 }
                 $table .= &Apache::loncommon::start_data_table_row();
+		$table .=
+		    '<td><span class="LC_nobreak">'.$courseinfo{'domain'}.'</span></td>';
                 $table .= 
                     '<td><span class="LC_nobreak">'.$courseinfo{'description'}.'</span></td>';
                 $table .= 
@@ -1174,7 +1181,6 @@ sub print_dynamic_metadata {
           &mt('No Assessment Statistical Data is available for this resource').
                   '</h4>');
     }
-
     #
     # Evaluation Data
     $r->print('<h4>'.&mt('Evaluation Data').'</h4>');
@@ -1289,7 +1295,7 @@ sub print_dynamic_metadata {
 #####################################################
 sub present_editable_metadata {
     my ($r,$uri,$file_type) = @_;
-    # Construction Space Call
+    # Authoring Space Call
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
@@ -1306,7 +1312,12 @@ sub present_editable_metadata {
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
         # Display Bombs, not Metadata
-        $r->print("<h1>$disuri</h1>");
+        $r->print(
+            '<h2>'.&mt('Error Messages').'</h2>'
+           .'<p>'.&mt('Folder: [_1]',
+                      '<span class="LC_filename">'.$disuri.'</span>')
+           .'</p>'
+        );
         my $showbuttons=1;
         my $message='';
         my $rc='';
@@ -1365,7 +1376,9 @@ sub present_editable_metadata {
     } else {
 
         # Display Metadata, not Bombs
-        my $displayfile=&mt('Metadata for [_1]',$disuri);
+        my $displayfile =
+            &mt('Metadata for [_1]'
+               ,'<span class="LC_filename">'.$disuri.'</span>');
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
@@ -1376,7 +1389,11 @@ sub present_editable_metadata {
         %Apache::lonpublisher::metadatakeys=();
         my $result=&Apache::lonnet::getfile($fn);
         if ($result == -1){
-	    $r->print(&mt('Creating new file [_1]'),$meta_uri);
+            my $message = &Apache::lonhtmlcommon::confirm_success(
+                &mt('Creating new file [_1]'
+                   ,'<span class="LC_filename"'.$meta_uri.'</span>'));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
             &Apache::lonpublisher::metaeval($result);
         }
@@ -1397,7 +1414,7 @@ sub present_editable_metadata {
             }
         }
         $r->print(<<ENDEDIT);
-<p>$displayfile</p>
+<h2>$displayfile</h2>
 <form method="post" action="" name="defaultmeta">
 ENDEDIT
         my %lt=&fieldnames($file_type);
@@ -1423,7 +1440,7 @@ ENDEDIT
 	        @fields = (split(/,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'}));
 	    } else {
 	        # no saved field list, use default list
-	        @fields =  ('author','title','subject','keywords','abstract',
+	        @fields =  ('title','author','subject','keywords','abstract',
 			    'notes','lowestgradelevel',
 	                    'highestgradelevel','standards');
                 if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) {
@@ -1436,7 +1453,7 @@ ENDEDIT
                 }
 	    }
 	} else {
-	    @fields = ('author','title','subject','keywords','abstract','notes',
+	    @fields = ('title','author','subject','keywords','abstract','notes',
 		       'copyright','customdistributionfile','language',
 		       'standards',
 		       'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
@@ -1463,21 +1480,29 @@ ENDEDIT
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
 
                 if ($file_type eq 'portfolio') {
-		    $r->print(&mt('Associated with course [_1]',
-		        '<strong><a href="'.$uri.'?changecourse=true">'.
-		        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
-		        ".description"}.
-			      '</a></strong>').'<br />');
+                    $r->print(
+                        &mt('Associated with course [_1]'
+                           ,'<strong>'
+                           .$env{$Apache::lonpublisher::metadatafields{'courserestricted'}
+                           .".description"}.'</strong>')
+                       .' <a href="'.$uri.'?changecourse=true">'
+                       .&mt('Change')
+                       .'</a>'.'<br />'
+                    );
+
                 } else {
                     $r->print(&mt('Associated with course [_1]',
                         '<strong>'.
   $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
                         ".description"}.'</strong>').'<br />');
                 }
-	    } else {
-		$r->print('<a href="'.$uri.'?changecourse=true">'.&mt('This resource is not associated with a course.').'</a><br />');
-	    }
-	}
+            } else {
+                $r->print(
+                    &mt('This resource is not associated with a course.')
+                  .' <a href="'.$uri.'?changecourse=true">'.&mt('Change').'</a><br />'
+                );
+            }
+        }
 	if (@added_order) {
 	    foreach my $field_name (@added_order) {
                 push(@fields,$field_name);