--- loncom/publisher/lonpublisher.pm	2013/12/01 21:50:30	1.288
+++ loncom/publisher/lonpublisher.pm	2014/01/15 18:49:56	1.289
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.288 2013/12/01 21:50:30 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.289 2014/01/15 18:49:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1928,7 +1928,8 @@ sub publishdirectory {
     my $thisdisresdir=$thisdisfn;
     $thisdisresdir=~s/^\/priv\//\/res\//;
     my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
-    $r->print(&Apache::lonhtmlcommon::start_pick_box()
+    $r->print('<form name="pubdirpref" method="post" action="">'
+             .&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
             .'<span class="LC_filename">'.$thisdisfn.'</span>'
             .&Apache::lonhtmlcommon::row_closure()
@@ -1942,16 +1943,16 @@ sub publishdirectory {
         $r->print(&Apache::lonhtmlcommon::row_closure()
                  .&Apache::lonhtmlcommon::row_title(&mt('Options'))
         );
-        $r->print('<form name="pubdirpref" method="post" action="">'.
-		  &hiddenfield('phase','two').
+        $r->print(&hiddenfield('phase','two').
 		  &hiddenfield('filename',$env{'form.filename'}).
 		  &checkbox('pubrec','include subdirectories').
 		  &checkbox('forcerepub','force republication of previously published files').
                   &checkbox('obsolete','make file(s) obsolete').
-		  &checkbox('forceoverride','force directory level metadata over existing').
-		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+		  &checkbox('forceoverride','force directory level metadata over existing')
+        );
         $r->print(&Apache::lonhtmlcommon::row_closure(1)
                  .&Apache::lonhtmlcommon::end_pick_box()
+                 .'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'
         );
         $lock=0;
     } else {
@@ -2215,7 +2216,10 @@ sub handler {
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
 	&publishdirectory($r,$docroot.$fn,$thisdisfn);
-	$r->print('<hr /><a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>');
+        $r->print(
+            '<br /><br />'.
+            &Apache::lonhtmlcommon::actionbox([
+                '<a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>']));
     } else {
 # ---------------------- Evaluate individual file, and then output information.
 	$fn=~/\.(\w+)$/;