--- loncom/publisher/lonpubdir.pm	2004/11/08 22:42:20	1.65
+++ loncom/publisher/lonpubdir.pm	2005/02/28 08:22:09	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.65 2004/11/08 22:42:20 albertel Exp $
+# $Id: lonpubdir.pm,v 1.77 2005/02/28 08:22:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,6 +94,8 @@ sub handler {
   if ($ENV{'environment.remote'} eq 'off') {
       &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                # browse/upload + new file page.
+  } else {
+      &pubbuttons($r,$uname,$thisdisfn);
   }
   &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
 
@@ -189,32 +191,33 @@ sub startpage {
     my $currdir = '/priv/'.$uname.$thisdisfn;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
 
-    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-    my $pagetitle; 
-    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+    my $pagetitle;
+    my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s/\/+/\//g;
-    $pagetitle .= ('<form name="dirs" method="post" action="'.$formaction
-              .'" target="_parent">'.
-        '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'.
-        &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'top','/priv','','-1').
+    $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
+        '<form name="dirs" method="post" action="'.$formaction.
+        '" target="_parent"><tt><b>'.
+        &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
         &Apache::lonhtmlcommon::select_recent('construct','recent',
                  'this.form.action=this.form.recent.value;this.form.submit()').
-              '</form>');
-     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+              '</form>';
+    &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
     if ($ENV{'environment.remote'} eq 'off') {
-	$ENV{'request.noversionuri'}=$currdir;
+	$ENV{'request.noversionuri'}=$currdir.'/';
 	$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
     } else {
 	$r->print($pagetitle);
     }
-    $r->print(&Apache::loncommon::help_open_menu('','','','',3,'Authoring'));
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
-<script>
+<script type="text/javascript">
+top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
 // Store directory location for menu bar to find
 
-parent.lastknownpriv='/~$uname/$thisdisfn/';
+parent.lastknownpriv='/~$uname$thisdisfn/';
 
 // Confirmation dialogues
 
@@ -228,7 +231,7 @@ parent.lastknownpriv='/~$uname/$thisdisf
             pubrecdir(document.publishdir)
         }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
-            window.location=theform.filename.value+'default.meta'
+            top.location=theform.filename.value+'default.meta'
         }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
             document.printdir.postdata.value=theform.filename.value
@@ -251,7 +254,7 @@ parent.lastknownpriv='/~$uname/$thisdisf
     }
 
     function forcepub(theform) {
-        if (confirm('Force publication of unmodified files? - OK=yes; Cancel=No.')) {
+        if (confirm('Force publication of unmodified files? -  Cancel=No; OK=yes.')) {
             theform.forcerepub.value="ON";
         } 
     }
@@ -266,7 +269,7 @@ parent.lastknownpriv='/~$uname/$thisdisf
 
     function SetPubDir(theform,printForm) {
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
-            window.location = theform.filename.value
+            top.location = theform.openname.value
             return
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
@@ -276,9 +279,9 @@ parent.lastknownpriv='/~$uname/$thisdisf
             pubrecdir(theform)
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
-            window.location=theform.filename.value+'default.meta'
+            top.location=theform.filename.value+'default.meta'
         }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "print") {
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
             theform.action = '/adm/printout'
             theform.postdata.value = theform.filename.value
             theform.submit()
@@ -298,22 +301,21 @@ parent.lastknownpriv='/~$uname/$thisdisf
       if (activity == 'delete') {
           var delform = document.delresource
           delform.filename.value = theform.filename.value
-          if (confirm("Are you sure you want to delete "+theform.filename.value+"?")) {
-              delform.submit()
-          }
+          delform.submit()
       }
       if (activity == 'obsolete') {
-          alert("Mark as obsolete - still to be implemented") 
+          var pubform = document.pubresource
+          pubform.filename.value = theform.filename.value
+          alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")
+          pubform.submit()
       }
       if (activity == 'print') {
-          document.printresource.postdata = theform.filename.value
-          document.printresource.curseed = getcurseed()
-          document.printresource.problemtype = getproblemtype()
+          document.printresource.postdata.value = theform.filename.value
           document.printresource.submit()
       }
       if (activity == 'retrieve') {
-          retrieveres.filename.value = theform.filename.value
-          retrieveres.submit()
+          document.retrieveres.filename.value = theform.filename.value
+          document.retrieveres.submit()
       }
       return
     }
@@ -327,39 +329,12 @@ parent.lastknownpriv='/~$uname/$thisdisf
         document.moveresource.action.value = activity
         document.moveresource.submit();
     }
-
-    function getcurseed() {
-      if (parent.document.lonhomework
-           &&
-          parent.document.lonhomework.rndseed
-           &&
-          parent.document.lonhomework.rndseed.value) {
-              return parent.document.lonhomework.rndseed.value;
-      }
-      return 0;
-    }
-                                                                                                      
-    function getproblemtype() {
-        if (parent.document.lonhomework) {
-            var optionelement;
-            var valueIndex=0;
-            for (var optionIndex=0;
-                optionIndex < parent.document.lonhomework.problemtype.options.length;
-                optionIndex++)
-            {
-                optionElement=parent.document.lonhomework.problemtype.options[optionIndex];
-                if (optionElement.selected) {
-                    return optionElement.value;
-                }
-            }
-        }
-        return 0;
-    }
 </script>
 ENDPUBDIRSCRIPT
     $r->print($pubdirscript);
 
-    if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+    if ((($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) &&
+	$ENV{'environment.remote'} ne 'off') {
 	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</h3>');
     }
@@ -370,9 +345,9 @@ sub dircontrols {
     $r->print(<<END);
         <table cellspacing="4" cellpadding="4" width="100%">
          <tr>
-          <th bgcolor="#DDDDDD">Actions for current directory</th>
-          <th bgcolor="#DDDDDD">Upload a new document</th>
-          <th bgcolor="#DDDDDD">Create a new directory or LON-CAPA document</th>
+          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>
+          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>
+          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>
         </tr>
         <tr>
          <td bgcolor="#ccddaa" valign="top" align="center">
@@ -393,8 +368,6 @@ sub dircontrols {
           </form>
           <form name="printdir" method="post" action="/adm/printout" target="_parent">
            <input type="hidden" name="postdata" value="" />
-           <input type="hidden" name="curseed" value="0" />
-           <input type="hidden" name="problemtype" value="0" />
           </form>
          </td>
          <td bgcolor="#ccddaa" valign="top" align="center">
@@ -409,7 +382,7 @@ sub dircontrols {
 	      <nobr>
 		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
 		  <select name="action">
-		    <option>Select action</option>
+		    <option>Select Action</option>
 		    <option value="newfile">New file:</option>
 		    <option value="newhtmlfile">New HTML file:</option>
 		    <option value="newproblemfile">New problem:</option>
@@ -424,11 +397,25 @@ sub dircontrols {
 	  </td>
          </tr>
         </table>
-        <br />
-        <br />
 END
 }
 
+sub pubbuttons {
+    my ($r,$uname,$thisdisfn) = @_;
+    $r->print('<form method="post" action="/adm/publish" target="_parent">'.
+              '<table><tr><td><input type="hidden" name="filename" value="/~'.
+               $uname.$thisdisfn.'/" />'.
+              '<input type="button" onClick="pubdir(this.form);" value="'.
+&mt('Publish Directory').'" />'.
+              '<input type="hidden" name="pubrec" value="" />'.
+              '<input type="hidden" name="forcerepub" value="NO" />'.
+              '<input type="button" onClick="pubrecdir(this.form);" value="'.
+&mt('Publish Directory and Sub Directories').'" /></td><td>'.
+'<input type="button" onClick="window.location='."'/~".
+               $uname.$thisdisfn."/default.meta'".'" value="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+}
+
 sub resourceactions {
     my ($r,$uname,$udom,$thisdisfn) = @_;
     $r->print(<<END);
@@ -448,8 +435,6 @@ sub resourceactions {
        </form>
        <form name="printresource" action="/adm/printout" target="_parent" method="post">
            <input type="hidden" name="postdata" value="" />
-           <input type="hidden" name="curseed" value="" />
-           <input type="hidden" name="problemtype" value="" />
        </form>
        <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />
@@ -511,6 +496,8 @@ sub putdirectory {
 	%Apache::lonpublisher::metadatakeys=();
 	my $construct=$here;
 	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+        my $dirpath = $here;
+        $dirpath=~s:^/priv/:/~:;
 	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
        				 $construct.'/'.$dirname.'/default.meta'
 								 ));
@@ -527,13 +514,12 @@ sub putdirectory {
                       '<option value="publish">'.&mt('Publish').'</option>'.
                       '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
                       '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
-                      '<option value="printdir">'.&mt('Print directory').
+                      '<option value="printdir">'.&mt('Print directory').'</option>'.
                     '</select>'.
-                     '<input type="hidden" name="filename" value="'.$here.'/'.$dirname.'" />'.
+                     '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
+                     '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="pubrec" value="" />'.
                      '<input type="hidden" name="forcerepub" value="" />'.
-                     '<input type="hidden" name="curseed" value="0" />'.
-                     '<input type="hidden" name="problemtype" value="0" />'.
                      '<input type="hidden" name="postdata" value="" />'.
                    '</form>';
             $$numdir ++;
@@ -589,7 +575,7 @@ sub putresource {
 #		$action_buttons='';
 #	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
-		'.meta" target=cat>'.
+		'.meta" target="cat">'.
 		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
             $pubstatus = 'modified';
@@ -598,17 +584,17 @@ sub putresource {
 		&mt(&getSourceRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';
 #	    $action_buttons='';
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
 		&getTitleString($targetdir.'/'.$filename).'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
-		    '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
+		    '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
 	    }
 	}
-	$title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
+	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
 	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
-	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
     my $editlink='';
@@ -646,31 +632,29 @@ sub create_pubselect {
     $$pub_select = '
 <form name="resselect_'.$$numres.'" action="">
 <select name="reschoice"  onChange="SetResChoice(this.form)">
-<option>'.&mt('Select action').
-'<option value="rename"/>'.&mt('Rename').
-'<option value="move"/>'.&mt('Move').
-'<option value="copy"/>'.&mt('Copy').
-'<option value="publish"/>'.$publish_button;
+<option>'.&mt('Select action').'</option>'.
+'<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
-        $$pub_select .= '
-<option value="delete"/>'.&mt('Delete');
+        $$pub_select .= 
+'<option value="rename">'.&mt('Rename').'</option>'.
+'<option value="move">'.&mt('Move').'</option>'.
+'<option value="delete">'.&mt('Delete').'</option>';
     } else {
         $$pub_select .= '
-<option value="obsolete"/>'.&mt('Mark obsolete');
+<option value="obsolete">'.&mt('Mark obsolete').'</option>';
     }
-    $$pub_select .= '
-<option value="print"/>'.&mt('Print');
-
 # check for versions
     my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
     if ($versions > 0) {
         $$pub_select .='
-<option value="retrieve"/>'.&mt('Retrieve old version');
+<option value="retrieve">'.&mt('Retrieve old version').'</option>';
     }
     $$pub_select .= '
-</select>
+<option value="publish">'.$publish_button.'</option>'.
+'<option value="print">'.&mt('Print').'</option>'.
+'</select>
 <input type="hidden" name="filename" value="/~'.
- $uname.'/'.$thisdisfn.'/'.$filename.'"></form>';
+ $uname.$thisdisfn.'/'.$filename.'" /></form>';
     $$numres ++;
 }
 
