--- loncom/publisher/lonpublisher.pm	2009/03/26 11:27:26	1.254
+++ loncom/publisher/lonpublisher.pm	2010/06/02 19:09:42	1.267
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.254 2009/03/26 11:27:26 bisitz Exp $
+# $Id: lonpublisher.pm,v 1.267 2010/06/02 19:09:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -384,11 +384,11 @@ sub selectbox {
     my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
               .'<select name="'.$name.'">';
     foreach (@idlist) {
-        $selout.='<option value=\''.$_.'\'';
+        $selout.='<option value="'.$_.'"';
         if ($_ eq $value) {
-	    $selout.=' selected>'.&{$functionref}($_).'</option>';
-	}
-        else {$selout.='>'.&{$functionref}($_).'</option>';}
+	    $selout.=' selected="selected"';
+        }
+        $selout.='>'.&{$functionref}($_).'</option>';
     }
     $selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
     return $selout;
@@ -1121,7 +1121,7 @@ sub publish {
 # ------------------------------------------------------------- Save some stuff
         my %savemeta=();
         foreach ('title') {
-            $savemeta{$_}=$metadatafields{$_};
+            if ($metadatafields{$_}) { $savemeta{$_}=$metadatafields{$_}; }
 	}
 # ------------------------------------------ See if anything new in file itself
  
@@ -1166,15 +1166,16 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.
-	    $chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').
-	    '</span></h1><p><span class="LC_warning">'.
-	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
+        $scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '
+	        .$chparms.'</p>'
+                .'<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
+                .&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.')
+                .'</p><hr />';
     }
     if ($metadatafields{'copyright'} eq 'priv') {
-        $scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
-            '</span></h1><p><span class="LC_warning">'.
-            &mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'</span></p><hr />';
+        $scrout.='<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
+                .&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.')
+                .'</p><hr />';
     }
 
 # ------------------------------------------------------- Now have all metadata
@@ -1222,12 +1223,14 @@ sub publish {
     my $intr_scrout.='<br />'
                     .'<form name="pubform" action="/adm/publish" method="post">';
     unless ($env{'form.makeobsolete'}) {
+       my $thissrc=$source;
+       $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
        $intr_scrout.='<p class="LC_warning">'
                     .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
                     .'</p>'
                     .'<p><input type="submit" value="'
                     .&mt('Finalize Publication')
-                    .'" /></p>';
+                    .'" /> <a href="'.$thissrc.'">'.&mt('Cancel').'</a></p>';
     }
     $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
     $intr_scrout.=
@@ -1401,9 +1404,9 @@ END
 				 (&Apache::loncommon::source_copyrightids));
 #	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
-        my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';
+        my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':'';
         $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
-                     .'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'
+                     .'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />'
                      .&Apache::lonhtmlcommon::row_closure(1);
         $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',
@@ -1640,7 +1643,8 @@ sub phasetwo {
         my $srcf=$2;
         my $srct=$3;
         my $srcd=$1;
-        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+        my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+        unless ($srcd=~/^\Q$docroot\E\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
             $r->print(
 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
@@ -1666,11 +1670,10 @@ sub phasetwo {
         
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $r->print('<p>'.&mt('Copied old target file').'</p>');
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file')));
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
-		", $!, ".&mt('FAIL')."</span>");
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1));
 	    return 0;
         }
         
@@ -1680,13 +1683,12 @@ sub phasetwo {
         
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $r->print('<p>'.&mt('Copied old metadata').'</p>')
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata')));
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-                $r->print( 
-                    "<span class=\"LC_error\">".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
+                $r->print(&Apache::lonhtmlcommon::confirm_success(
+                           &mt('Failed to write old metadata copy').", $!",1));
 		return 0;
 	    }
         }
@@ -1708,32 +1710,38 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
     if (copy($source,$copyfile)) {
         print $logfile "\nCopied original source to ".$copyfile."\n";
-        $r->print('<p>'.&mt('Copied source file').'</p>');
+        $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied source file')));
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        $r->print("<span class=\"LC_error\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
+        $r->print(&Apache::lonhtmlcommon::confirm_success(
+	    &mt('Failed to copy source').", $!",1));
 	return 0;
     }
     
+# ---------------------------------------------- Delete local tmp-preview files
+    unlink($copyfile.'.tmp');
 # --------------------------------------------------------------- Copy Metadata
 
     $copyfile=$copyfile.'.meta';
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>'.&mt('Copied metadata').'</p>');
+        $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata')));
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        $r->print(
-            "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
+        $r->print(&Apache::lonhtmlcommon::confirm_success(
+                  &mt('Failed to write metadata copy').", $!",1));
 	return 0;
     }
     $r->rflush;
@@ -1741,7 +1749,8 @@ sub phasetwo {
 # ------------------------------------------------------------- Trigger updates
     push(@{$modified_urls},[$target,$source]);
     unless ($registered_cleanup) {
-	$r->register_cleanup(\&notify);
+        my $handlers = $r->get_handlers('PerlCleanupHandler');
+        $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
 	$registered_cleanup=1;
     }
 
@@ -1752,27 +1761,35 @@ sub phasetwo {
     &Apache::lonnet::devalidate_cache_new('meta',
 			 &Apache::lonnet::declutter($thisdistarget));
 
+# ------------------------------------------------------------- Everything done
+    $logfile->close();
+    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        
         my $thissrc=$source;
         $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        
-        $r->print(
-           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
-           &mt('View Published Version').'</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size="+2">'.
-		  &mt('Back to Source').'</font></a></p>'.
-           '<p><a href="'.$thissrcdir.
-                   '"><font size="+2">'.
-		  &mt('Back to Source Directory').'</font></a></p>');
+        $r->print(&Apache::loncommon::head_subbox(
+            &Apache::lonhtmlcommon::start_funclist().
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thisdistarget.'">'.
+                &mt('View Published Version').
+                '</a>').
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thissrc.'">'.
+                &mt('Back to Source').
+                '</a>').
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thissrcdir.'">'.
+                &mt('Back to Source Directory').
+                '</a>').
+            &Apache::lonhtmlcommon::end_funclist())
+        );
     }
-    $logfile->close();
-    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
     return 1;
 }
 
@@ -1870,12 +1887,20 @@ sub publishdirectory {
     my $resdir=
 	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
 	$thisdisfn;
-    $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
-	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
+    $r->print(&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
+            .'<span class="LC_filename">'.$thisdisfn.'</span>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title(&mt('Target'))
+            .'<span class="LC_filename">'.$resdir.'</span>'
+    );
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
     unless ($env{'form.phase'} eq 'two') {
 # ask user what they want
+        $r->print(&Apache::lonhtmlcommon::row_closure()
+                 .&Apache::lonhtmlcommon::row_title(&mt('Options'))
+        );
         $r->print('<form name="pubdirpref" method="post">'.
 		  &hiddenfield('phase','two').
 		  &hiddenfield('filename',$env{'form.filename'}).
@@ -1884,8 +1909,14 @@ sub publishdirectory {
                   &checkbox('obsolete','make file(s) obsolete').
 		  &checkbox('forceoverride','force directory level metadata over existing').
 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)
+                 .&Apache::lonhtmlcommon::end_pick_box()
+        );
         $lock=0;
     } else {
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)
+                 .&Apache::lonhtmlcommon::end_pick_box()
+        );
         unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
 # actually publish things
 	opendir(DIR,$fn);
@@ -1965,8 +1996,12 @@ sub defaultmetapublish {
     for ($count=5;$count<$#parts;$count++) {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -2139,10 +2174,25 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Construction Space',
+        'href'  => &Apache::loncommon::authorspace(),
+    });
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Resource Publication',
+        'href'  => '',
+    });
+
     my $js='<script type="text/javascript">'.
 	&Apache::loncommon::browser_and_searcher_javascript().
 	'</script>';
-    $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
+    $r->print(&Apache::loncommon::start_page('Resource Publication',$js)
+             .&Apache::lonhtmlcommon::breadcrumbs()
+             .&Apache::loncommon::head_subbox(
+                  &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
+    );
 
 
     my $thisfn=$fn;
@@ -2206,7 +2256,7 @@ ENDCAPTION
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
                      .'<span class="LC_warning">'
-		     .&mt('[_1] at [_2]',$cuname,$cudom)
+		     .&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')'
                      .'</span>'
                      );
 	}
@@ -2243,7 +2293,6 @@ ENDDIFF
 	    }
 	} else {
 	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-	    $r->print('<hr />');
 	}
     }
     $r->print(&Apache::loncommon::end_page());