--- loncom/publisher/lonpublisher.pm	2002/05/23 21:12:44	1.82
+++ loncom/publisher/lonpublisher.pm	2002/07/17 18:23:45	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.82 2002/05/23 21:12:44 albertel Exp $
+# $Id: lonpublisher.pm,v 1.84 2002/07/17 18:23:45 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,8 +444,7 @@ sub publish {
 	       }
            }
         }
-        $allowstr=~s/\n+/\n/g;
-        $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
+        $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
 	#Encode any High ASCII characters
 	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
@@ -479,7 +478,10 @@ sub publish {
      
      my %oldparmstores=();
      
-     $scrout.='<h3>Metadata Information</h3>';
+     
+     $scrout.='<h3>Metadata Information ' .
+       Apache::loncommon::help_open_topic("Metadata_Description")
+       . '</h3>';
 
 # ------------------------------------------------ First, check out environment
      unless (-e $source.'.meta') {
@@ -586,6 +588,7 @@ sub publish {
 
 # --------------------------------------------------- Scan content for keywords
 
+        my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
 	my $keywordout=<<"END";
 <script>
 function checkAll(field)
@@ -600,7 +603,7 @@ function uncheckAll(field)
         field[i].checked = false ;
 }
 </script>
-<p><b>Keywords:</b> 
+<p><b>Keywords: $keywords_help</b> 
 <input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)"> 
 <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)"> 
 <br />
@@ -680,6 +683,7 @@ END
 	$scrout.=&textfield('Publisher/Owner','owner',
                             $metadatafields{'owner'});
 # --------------------------------------------------- Correct copyright for rat        
+
     if ($style eq 'rat') {
 	if ($metadatafields{'copyright'} eq 'public') { 
 	    delete $metadatafields{'copyright'};
@@ -695,6 +699,9 @@ END
 			    \&Apache::loncommon::copyrightdescription,
 			     (&Apache::loncommon::copyrightids));
     }
+
+    my $copyright_help = Apache::loncommon::help_open_topic("Publishing_Copyright");
+    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
     return $scrout.
       '<p><input type="submit" value="Finalize Publication" /></p></form>';
 }