--- loncom/publisher/loncfile.pm	2009/05/26 16:29:56	1.99
+++ loncom/publisher/loncfile.pm	2009/08/28 14:32:26	1.100.2.2
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.99 2009/05/26 16:29:56 bisitz Exp $
+# $Id: loncfile.pm,v 1.100.2.2 2009/08/28 14:32:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -361,25 +361,28 @@ sub cleanDest {
 	my ($newpath)=($dest=~m|(.*)/|);
 	$newpath=&relativeDest($fn,$newpath,$uname);
 	if (! -d "$newpath") {
-	    $request->print('<p><span class="LC_error">'
+	    $request->print('<p><span class="LC_warning">'
                            .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."
-                               ,'"'.&display($newpath).'"')
+                               ,'<span class="LC_filename">'.&display($newpath).'</span>')
                            .'</span></p>');
 	    $dest=~s|.*/||;
 	}
     }
     if ($dest =~ /\.(\d+)\.(\w+)$/){
-	$request->print('<span class="LC_error">'
+	$request->print('<p><span class="LC_warning">'
 			.&mt('Bad filename [_1]','<span class="LC_filename">'.&display($dest).'</span>')
                         .'<br />'
                         .&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>')
                         .'<br />'
                         .&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>')
-			.'</span>');
+			.'</span></p>');
 	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
     }
     if ($foundbad) {
-	$request->print("<p><span class=\"LC_error\">".&mt('Invalid characters in requested name have been removed.')."</span></p>");
+        $request->print('<p><span class="LC_warning">'
+                       .&mt('Invalid characters in requested name have been removed.')
+                        .'</span></p>'
+        );
     }
     return $dest;
 }
@@ -514,10 +517,10 @@ sub Rename1 {
 	    if (-d $fn) {
 		$newfilename=~/\.(\w+)$/;
 		if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
-		    $request->print('<br /><span classr="LC_warning">'.
-				    &mt('Cannot change MIME type of a directory').
+		    $request->print('<p><span class="LC_error">'.
+				    &mt('Cannot change MIME type of a directory.').
 				    '</span>'.
-				    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+				    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>');
 		    return;
 		}
 		$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
@@ -533,27 +536,37 @@ sub Rename1 {
 		return;
 	    }
 	    unless (&obsolete_unpub($user,$domain,$fn)) {
-		$request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
-				'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p><span class="LC_error">'
+                               .&mt('Cannot rename or move non-obsolete published file.')
+                               .'</span><br />'
+                               .'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
 		return;
 	    }
 	    my $action;
 	    if ($style eq 'rename') {
-		$action=&mt('Rename');
+		$action='Rename';
 	    } else {
-		$action=&mt('Move');
+		$action='Move';
 	    }
-	    $request->print('<input type="hidden" name="newfilename" value="'.
-			    $newfilename.
-			    '" /><p>'.$action.' '.&display($fn).
-			    '</p><br />to '.&display($newfilename).'?</p>');
+            $request->print('<input type="hidden" name="newfilename" value="'
+                           .$newfilename.'" />'
+                           .'<p>'
+                           .&mt($action.' [_1] to [_2]?'
+                               ,&display($fn),&display($newfilename))
+                           .'</p>'
+        );
 	    &CloseForm1($request, $fn);
 	} else {
-	    $request->print('<p>'.&mt('No new filename specified.').'</p></form>');
+	    $request->print('<p class="LC_error">'.&mt('No new filename specified.').'</p></form>');
 	    return;
 	}
     } else {
-	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>')
+                       .'</p></form>'
+        );
 	return;
     }
     
@@ -591,22 +604,38 @@ sub Delete1 {
 			$fn.'" />');
         if (-d $fn) {
             unless (&empty_directory($fn,'Delete1')) {
-                $request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
-                            'You must delete the contents of the directory first.<br />'.
-                            '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p>'
+                               .'<span class="LC_error">'
+                               .&mt('Only empty directories may be deleted.')
+                               .'</span><br />'
+                               .&mt('You must delete the contents of the directory first.')
+                               .'</p>'
+                               .'<p><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
                 return;
             }
         } else { 
 	    unless (&obsolete_unpub($user,$domain,$fn)) {
-	        $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
-			    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p><span class="LC_error">'
+                               .&mt('Cannot delete non-obsolete published file.')
+                               .'</span><br />'
+                               .'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
 	        return;
 	    }
         }
-	$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
+        $request->print('<p>'
+                       .&mt('Delete [_1]?'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>')
+                       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>')
+                       .'</p></form>'
+        );
     }
 }
 
@@ -660,13 +689,21 @@ sub Copy1 {
 	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 	    return;
 	}
-	$request->print('<input type="hidden" name="newfilename" value="'.
-			$newfilename.
-			'" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '.
-			&display($newfilename).'?</p>');
+        $request->print('<input type="hidden" name="newfilename" value="'
+                       .$newfilename.'" />'
+                       .'<p>'
+                       .&mt('Copy [_1] to [_2]?'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>'
+                           ,'<span class="LC_filename">'.&display($newfilename).'</span>')
+                       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>')
+                       .'</p></form>'
+        );
     }
 }
 
@@ -722,9 +759,13 @@ sub NewDir1 {
 	} elsif ($mode eq 'imsimport') {
 	    $request->print('<input type="hidden" name="callingmode" value="imsimport" />');
 	}
-	$request->print('<input type="hidden" name="newfilename" value="'.
-			$newfilename.'" /><p>'.&mt('Make new directory').' '.
-			&display($newfilename).'?</p>');
+        $request->print('<input type="hidden" name="newfilename" value="'
+                       .$newfilename.'" />'
+                       .'<p>'
+                       .&mt('Make new directory [_1]?'
+                           ,'<span class="LC_filename">'.&display($newfilename).'</span>')
+                       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     }
 }
@@ -734,10 +775,18 @@ sub Decompress1 {
     my ($request, $user, $domain, $fn) = @_;
     if( -e $fn) {
    	$request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />');
-   	$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
+   	$request->print('<p>'
+                   .&mt('Decompress [_1]?'
+                       ,'<span class="LC_filename">'.&display($fn).'</span>')
+                   .'</p>'
+    );
    	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]'
+                           ,'<span class="LC_filename">'.&display($fn).'</span>')
+                       .'</p></form>'
+        );
     }
 }
 
@@ -806,7 +855,8 @@ sub NewFile1 {
             $extension = $1;
         }
 
-        my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty library js css txt);
+        my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt);
+
         if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) {
             my $validexts = '.'.join(', .',@okexts);
             $request->print('<p class="LC_warning">'.
@@ -905,7 +955,10 @@ sub phaseone {
 	if($newfilename) {
 	    &Copy1($r, $uname, $udom, $fn, $newfilename);
 	} else {
-	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+            $r->print('<p class="LC_error">'
+                     .&mt('No new filename specified.')
+                     .'</p></form>'
+            );
 	}
     } elsif ($env{'form.action'} eq 'newdir') {
 	my $mode = '';
@@ -927,7 +980,10 @@ sub phaseone {
 	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
 	    &NewFile1($r, $uname, $udom, $fn, $newfilename);
 	} else {
-	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+            $r->print('<p class="LC_error">'
+                     .&mt('No new filename specified.')
+                     .'</p></form>'
+            );
 	}
     }
 }
@@ -1014,7 +1070,11 @@ sub Rename2 {
 	    unlink $tmp2;
 	}
     } else {
-	$request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
+        $request->print('<p>'
+                       .&mt('No such file: [_1]'
+                           ,'<span class="LC_filename">'.&display($oldfile).'</span>')
+                       .'</p></form>'
+        );
 	return 0;
     }
     return 1;
@@ -1062,7 +1122,7 @@ sub Delete2 {
 		    return 0;
 		}
 	    } else {
-		$request->print('<p> '.&mt('No such file').'. </p></form>');
+        	$request->print('<p class="LC_error">'.&mt('No such file').'</p></form>');
 		return 0;
 	    }
 	}
@@ -1073,7 +1133,7 @@ sub Delete2 {
 		return 0;
 	    }
 	} else {
-	    $request->print('<p> '.&mt('No such file').'. </p></form>');
+            $request->print('<p class="LC_error">'.&mt('No such file').'</p></form>');
 	    return 0;
 	}
     }
@@ -1132,7 +1192,7 @@ sub Copy2 {
 	    return 1;
 	}
     } else {
-	$request->print('<p> '.&mt('No such file').' </p>');
+        $request->print('<p class="LC_error">'.&mt('No such file').'</p>');
 	return 0;
     }
     return 1;
@@ -1286,7 +1346,7 @@ sub phasetwo {
 	    }
 	    $dest = $env{'form.newfilename'};
      	} else {
-	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
+            $r->print('<p class="LC_error">'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
@@ -1387,26 +1447,10 @@ function writeDone() {
 	$loaditem{'onload'} = "writeDone()";
     }
     
-    # Breadcrumbs
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
-        'href'  => '', # FIXME Add link to /priv/[user]
-    });
-    &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'File Operation',
-        'title' => 'Construction Space File Operation',
-        'href'  => '',
-    });
-
     $r->print(&Apache::loncommon::start_page('Construction Space File Operation',
 					     $js,
-					     {'add_entries' => \%loaditem,})
-             .&Apache::lonhtmlcommon::breadcrumbs()
-             .&Apache::loncommon::head_subbox(
-                  &Apache::loncommon::CSTR_pageheader())
-    );
-  
+					     {'add_entries' => \%loaditem,}));
+
     $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
@@ -1442,8 +1486,11 @@ function writeDone() {
 	     $env{'form.action'} eq 'Select Action' ) {
 	$r->print('<h3>'.&mt('New Resource').'</h3>');
     } else {
-	$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p>'.
-		  &Apache::loncommon::end_page());
+        $r->print('<p class="LC_error">'
+                 .&mt('Unknown Action').' '.$env{'form.action'}
+                 .'</p>'
+                 .&Apache::loncommon::end_page()
+        );
 	return OK;  
     }
     if ($env{'form.phase'} eq 'two') {