--- loncom/publisher/lonupload.pm	2008/11/20 16:32:34	1.41
+++ loncom/publisher/lonupload.pm	2009/07/06 10:19:22	1.47
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.41 2008/11/20 16:32:34 bisitz Exp $
+# $Id: lonupload.pm,v 1.47 2009/07/06 10:19:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,14 +191,14 @@ sub phaseone {
                       '<br />'.
 		      '<br />'.&mt('Choose file type:').'
 <select name="filetype">
- <option value="standard" selected>'.&mt('Regular file').'
+ <option value="standard" selected="selected">'.&mt('Regular file').'
  <option value="testbank">'.&mt('Testbank file').'
  <option value="imsimport">'.&mt('IMS package').'
 </select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'
 <br />
 <br />
 ');
-            $r->print('<input type="button" value="'.&mt('Save').'" onClick="javascript:verifyForm()"/></form>');
+            $r->print('<input type="button" value="'.&mt('Upload').'" onClick="javascript:verifyForm()"/></form>');
 	    # Check for bad extension and warn user
 	    if ($fn=~/\.(\w+)$/ && 
 		(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
@@ -290,8 +290,8 @@ sub check_extension {
     if ($fn=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $result .= &mt('File [_1] could not be copied.',
-                      '<p class="LC_filename">'.$fn.'</span> ').
-                  '<span class="LC_error">'.
+                      '<span class="LC_filename">'.$fn.'</span> ').
+                  '<p class="LC_error">'.
                   &mt('The extension on this file is reserved internally by LON-CAPA.').
                   '</p>';
     } elsif ($fn=~/\.(\w+)$/ &&
@@ -421,7 +421,7 @@ function verifyForm() {
     my $fn;
     if ($env{'form.filename'}) {
 	$fn=$env{'form.filename'};
-	$fn=~s/^http\:\/\/[^\/]+\///;
+	$fn=~s/^https?\:\/\/[^\/]+\///;
 	$fn=~s/^\///;
 	$fn=~s{(~|priv/)($LONCAPA::username_re)}{};
 	$fn=~s/\/+/\//g;
@@ -440,12 +440,23 @@ function verifyForm() {
    $javascript = "<script type=\"text/javascript\">\n//<!--\n".
 	$javascript."\n// --></script>\n";
 
+    # Breadcrumbs
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                   'text' => 'Construction Space'},
+                  {'href' => '/adm/upload',
+                   'text' => 'Upload file to Construction Space'}];
     $r->print(&Apache::loncommon::start_page('Upload file to Construction Space',
-					     $javascript));
+                                             $javascript,
+                                             {'bread_crumbs' => $brcrum,})
+             .&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader())
+    );
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-	$r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.
-		  &mt(' at ').$udom.'</span></h3>');
+        $r->print('<p class="LC_warning">'
+                 .&mt('Co-Author [_1]',$uname.':'.$udom)
+                 .'</p>'
+        );
     }
 
     if ($env{'form.phase'} eq 'three') {