--- loncom/publisher/lonpublisher.pm	2011/10/31 17:27:10	1.275
+++ loncom/publisher/lonpublisher.pm	2013/07/18 16:28:50	1.284
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.275 2011/10/31 17:27:10 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.284 2013/07/18 16:28:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,6 @@ use HTML::LCParser;
 use HTML::Entities;
 use Encode::Encoder;
 use Apache::lonxml;
-use Apache::loncacc;
 use DBI;
 use Apache::lonnet;
 use Apache::loncommon();
@@ -1017,6 +1016,11 @@ sub publish {
 		   $outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
 		       '</span>';
                } else {
+#
+# Store the fact that the dependency has been used by the target file
+# Unfortunately, usage is erroneously named sequsage in lonmeta.pm
+# The translation happens in lonmetadata.pm
+#
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
                              &Apache::lonnet::declutter($thisdep).'___usage'
                                  => time);
@@ -1770,21 +1774,17 @@ sub phasetwo {
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        $r->print(&Apache::loncommon::head_subbox(
-            &Apache::lonhtmlcommon::start_funclist().
-            &Apache::lonhtmlcommon::add_item_funclist(
+        $r->print(
+            &Apache::lonhtmlcommon::actionbox([
                 '<a href="'.$thisdistarget.'">'.
                 &mt('View Published Version').
-                '</a>').
-            &Apache::lonhtmlcommon::add_item_funclist(
+                '</a>',
                 '<a href="'.$thissrc.'">'.
                 &mt('Back to Source').
-                '</a>').
-            &Apache::lonhtmlcommon::add_item_funclist(
+                '</a>',
                 '<a href="'.$thissrcdir.'">'.
                 &mt('Back to Source Directory').
-                '</a>').
-            &Apache::lonhtmlcommon::end_funclist())
+                '</a>'])
         );
     }
     return 1;
@@ -1880,7 +1880,7 @@ sub publishdirectory {
     $thisdisfn=~s/\/+/\//g;
     my $thisdisresdir=$thisdisfn;
     $thisdisresdir=~s/^\/priv\//\/res\//;
-    my $resdir='/home/httpd/html'.$thisdisresdir;
+    my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
     $r->print(&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
             .'<span class="LC_filename">'.$thisdisfn.'</span>'
@@ -1895,7 +1895,7 @@ sub publishdirectory {
         $r->print(&Apache::lonhtmlcommon::row_closure()
                  .&Apache::lonhtmlcommon::row_title(&mt('Options'))
         );
-        $r->print('<form name="pubdirpref" method="post">'.
+        $r->print('<form name="pubdirpref" method="post" action="">'.
 		  &hiddenfield('phase','two').
 		  &hiddenfield('filename',$env{'form.filename'}).
 		  &checkbox('pubrec','include subdirectories').
@@ -2014,7 +2014,7 @@ sub defaultmetapublish {
 	$r->print($reply.'</p><br />');$r->rflush;
     }
 # ------------------------------------------------------------------- Link back
-    $r->print("<a href='".&Apache::lonnet::display($fn)."'>".&mt('Back to Metadata').'</a>');
+    $r->print("<a href='".&Apache::loncfile::display($fn)."'>".&mt('Back to Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2078,7 +2078,7 @@ sub handler {
 # -------------------------------------------------------------- Check filename
 
     my $fn=&unescape($env{'form.filename'});
-    ($cuname,$cudom)=&Apache::loncacc::constructaccess($fn);
+    ($cuname,$cudom)=&Apache::lonnet::constructaccess($fn);
 # ----------------------------------------------------- Do we have permissions?
      unless (($cuname) && ($cudom)) {
        $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
@@ -2143,8 +2143,8 @@ sub handler {
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
-        'href'  => &Apache::loncommon::authorspace(),
+        'text'  => 'Authoring Space',
+        'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Resource Publication',
@@ -2218,7 +2218,7 @@ ENDCAPTION
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
 	    $r->print(<<ENDDIFF);
-<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&amp;versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
 ENDDIFF
             $r->print(&mt('Diffs with Current Version').'</a>');
 	}