--- loncom/publisher/publisher.html	2003/02/04 20:33:19	1.24
+++ loncom/publisher/publisher.html	2003/06/15 18:02:57	1.29
@@ -1,10 +1,17 @@
 <html>
 <head>
 <title>LON-CAPA Publishing Frame</title>
-<script>
+<script language="JavaScript">
+
+function frameloc() {
+    if (parent.LONCAPAToBePublished.location.href.indexOf("/~")!=-1) {
+       parent.lastknownpriv=parent.LONCAPAToBePublished.location.href;
+    }
+    return unescape(parent.lastknownpriv);
+}
 
 function getfilename() {
-   document.publisher.filename.value=parent.LONCAPAToBePublished.location.href;
+   document.publisher.filename.value=frameloc();
    if ((document.publisher.filename.value.charAt(
         document.publisher.filename.value.length-1)!='/') &&
        (document.publisher.filename.value.indexOf('/adm/pubdir')==-1)) {
@@ -15,14 +22,14 @@ function getfilename() {
 }
 
 function getdfilename() {
-  document.dpublisher.filename.value=parent.LONCAPAToBePublished.location.href;
+  document.dpublisher.filename.value=frameloc();
   if (document.dpublisher.filename.value.indexOf('/adm/pubdir')==-1) {
       document.dpublisher.submit();
   }
 }
 
 function getufilename() {
-  document.upublisher.filename.value=parent.LONCAPAToBePublished.location.href;
+  document.upublisher.filename.value=frameloc();
   if (document.upublisher.filename.value.indexOf('/adm/pubdir')!=-1) {
       document.upublisher.filename.value=document.dpublisher.filename.value;
   }
@@ -30,7 +37,7 @@ function getufilename() {
 }
 
 function getrfilename() {
-  document.rpublisher.filename.value=parent.LONCAPAToBePublished.location.href;
+  document.rpublisher.filename.value=frameloc();
    if ((document.rpublisher.filename.value.charAt(
         document.rpublisher.filename.value.length-1)!='/') &&
        (document.rpublisher.filename.value.indexOf('/adm/pubdir')==-1)) {
@@ -41,7 +48,7 @@ function getrfilename() {
 }
 
 function getactionfilename() {
-  document.fileaction.filename.value=parent.LONCAPAToBePublished.location.href;
+  document.fileaction.filename.value=frameloc();
   var test=document.fileaction.action.selectedIndex;
   if (test == 4) { // trying to create a directory
       if (document.fileaction.filename.value.indexOf('/adm/pubdir')!=-1) {
@@ -57,8 +64,13 @@ function getactionfilename() {
    document.fileaction.submit();
 }
 
+function getdelfilename() {
+  document.del.filename.value=frameloc();
+  document.del.submit();
+}
+
 function getpostdata() {
-  document.printout.postdata.value=parent.LONCAPAToBePublished.location.href;
+  document.printout.postdata.value=frameloc();
   document.printout.submit();
 }
 </script>
@@ -87,6 +99,13 @@ function getpostdata() {
 		      <input type="button" value="Upload file"  onClick="getufilename();" />
 		    </td>
 		  </form>
+		  <form name="printout" target="_parent" action="/adm/printout" target="LONCAPAToBePublished" method="post" onSubmit="getpostdata();">
+		    <td rowspan="2" bgcolor="#ccddaa" align="center">
+		      <input type="hidden" name="postdata" value="" />
+		      <input type="button" value="Print" onClick="getpostdata();" />
+		    </td>
+		  </form>
+
 		</tr>
 		<tr valign="middle">
 		  <form name="rpublisher" action="/adm/retrieve" target="_parent" method="post">
@@ -95,13 +114,14 @@ function getpostdata() {
 		      <input type="button" value="Retrieve Old Version" onClick="getrfilename();" />
 		    </td>
 		  </form>
-		  <form name="printout" target="_parent" action="/adm/printout" target="LONCAPAToBePublished" method="post" onSubmit="getpostdata();">
-		    <td bgcolor="#ccddaa" align="center">
-		      <input type="hidden" name="postdata" value="" />
-		      <input type="button" value="Print" onClick="getpostdata();" />
+		  <form name="del" action="/adm/cfile" target="_parent" method="post">
+		    <td bgcolor="#ccddaa">
+		      <input type="hidden" name="filename" value="" />
+		      <input type="hidden" name="action" value="delete" />
+	              <input type="button" value="Delete" onClick="getdelfilename();" />
 		    </td>
 		  </form>
-		  <form name="fileaction" action="/adm/cfile" target="_parent" method="post">
+		  <form name="fileaction" action="/adm/cfile" target="_parent" method="post" onSubmit="getactionfilename();">
 		    <td bgcolor="#ccddaa" align="center">
 		      <nobr>
 			<input type="hidden" name="filename" value="" />
@@ -110,10 +130,12 @@ function getpostdata() {
 			    <option value="newfile">New file:</option>
 			    <option value="newhtmlfile">New HTML file:</option>
 			    <option value="newproblemfile">New problem:</option>
-			    <option value="newsubdir">New subdirectory:</option>
+                            <option value="newpagefile">New assembled page:</option>
+                            <option value="newsequencefile">New assembled sequence:</option>
+			    <option value="newdir">New subdirectory:</option>
 			    <option value="rename">Rename current file to:</option>
 			    <option value="copy">Copy current file to:</option>
-			  </select>&nbsp;<input type="text" name="filename" value="Type Name Here" onFocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onClick="getactionfilename();" />
+			  </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onFocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onClick="getactionfilename();" />
 		      </nobr>
 		    </td>
 		  </form>
