--- loncom/publisher/publisher.html	2002/11/18 15:28:50	1.22
+++ 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)) {
@@ -40,111 +47,105 @@ function getrfilename() {
    }
 }
 
-function getdelfilename() {
-  document.del.filename.value=parent.LONCAPAToBePublished.location.href;
-  document.del.submit();
-}
-
-function getrenamefilename() {
-  document.rename.filename.value=parent.LONCAPAToBePublished.location.href;
-  document.rename.submit();
-}
-
-function getcpfilename() {
-  document.cp.filename.value=parent.LONCAPAToBePublished.location.href;
-  document.cp.submit();
+function getactionfilename() {
+  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) {
+          document.fileaction.filename.value=document.dpublisher.filename.value;
+      }
+      if ((document.fileaction.filename.value.charAt(
+           document.fileaction.filename.value.length-1)!='/') &&
+           (document.fileaction.filename.value.indexOf('/adm/pubdir')==-1)) {
+          alert('Must create new subdirectory inside a directory');
+          return;
+      }
+   }
+   document.fileaction.submit();
 }
 
-function getnewdirfilename() {
-   document.newdir.filename.value=parent.LONCAPAToBePublished.location.href;
-   if (document.newdir.filename.value.indexOf('/adm/pubdir')!=-1) {
-       document.newdir.filename.value=document.dpublisher.filename.value;
-   }
-   if ((document.newdir.filename.value.charAt(
-        document.newdir.filename.value.length-1)!='/') &&
-       (document.newdir.filename.value.indexOf('/adm/pubdir')==-1)) {
-      alert('Must create new subdirectory inside a directory');
-   } else {
-      document.newdir.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>
-</head>
-<body bgcolor="#ccffff" text='#004400' link='#003333' vlink='#006666'>
-<font size="-2">
-<table border=0><tr><th bgcolor="#004400" height=20>
-<table border=0><tr valign="middle">
-<form name="publisher" action="/adm/publish" target="_parent" method="post">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="button" value="Publish this Resource" onClick="getfilename();">
-</td></form>
-<form name="dpublisher" action="/adm/pubdir" target="LONCAPAToBePublished" method="post">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="button" value="List Directory" onClick="getdfilename();">
-</td></form>
-<form name="cp" action="/adm/cfile" target="_parent" method="post" onSubmit="getcpfilename();">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="hidden" name="action" value="copy">
-<input type="text" size=10 name="newfilename" value="">
-<input type="button" value="Copy" onClick="getcpfilename();">
-</td></form>
-<form name="upublisher" action="/adm/upload" target="_parent" 
-method="post" enctype="multipart/form-data">
-<td bgcolor="#ccffcc" valign="top">
-<input type="hidden" name="filename" value="">
-<input type="file" name="upfile" size="10">
-<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="#ccffcc">
-<input type="hidden" name="postdata" value="">
-<input type="button" value="Printout" onClick="getpostdata();">
-</td>
-</form>
-</tr>
-
-<tr valign="middle">
-<form name="rpublisher" action="/adm/retrieve" target="_parent" method="post">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="button" value="Retrieve Old Version" onClick="getrfilename();">
-</td></form>
-<form name="del" action="/adm/cfile" target="_parent" method="post">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="hidden" name="action" value="delete">
-<input type="button" value="Delete" onClick="getdelfilename();">
-</td></form>
-<form name="rename" action="/adm/cfile" target="_parent" method="post" onSubmit="getrenamefilename();">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="hidden" name="action" value="rename">
-<input type="text" size=10 name="newfilename" value="">
-<input type="button" value="Rename" onClick="getrenamefilename();">
-</td></form>
-<form name="newdir" action="/adm/cfile" target="_parent" method="post" onSubmit="getnewdirfilename();">
-<td bgcolor="#ccffcc">
-<input type="hidden" name="filename" value="">
-<input type="hidden" name="action" value="newdir">
-<input type="text" size=10 name="newfilename" value="">
-<input type="button" value="New Subdirectory" onClick="getnewdirfilename();">
-</td></form>
-</tr>
-</table>
-</th></tr></table>
-</font>
-</body>
-</html>
-
-
-
-
+    </head>
+    <body bgcolor="#ccffdd" text='#002200' link='#003333' vlink='#006666'>
+      <font size="-2">
+	<table border="0" align="center"><tr><th bgcolor="#004400" height="20">
+	      <table border="0" cellspacing="4"><tr valign="middle">
+		  <form name="publisher" action="/adm/publish" target="_parent" method="post">
+		    <td bgcolor="#ccddaa" align="center">
+		      <input type="hidden" name="filename" value="" />
+	              <input type="button" value="Publish this Resource" onClick="getfilename();" />
+		    </td>
+		  </form>
+		  <form name="dpublisher" action="/adm/pubdir" target="LONCAPAToBePublished" method="post">
+		    <td bgcolor="#ccddaa" align="center">
+		      <input type="hidden" name="filename" value="" />
+		      <input type="button" value="List Directory" onClick="getdfilename();" />
+		    </td>
+		  </form>
+		  <form name="upublisher" action="/adm/upload" target="_parent"
+			method="post" enctype="multipart/form-data">
+		    <td bgcolor="#ccddaa" valign="top" align="center">
+		      <input type="hidden" name="filename" value="" />
+		      <input type="file" name="upfile" size="20" />
+		      <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">
+		    <td bgcolor="#ccddaa" align="center">
+		      <input type="hidden" name="filename" value="" />
+		      <input type="button" value="Retrieve Old Version" onClick="getrfilename();" />
+		    </td>
+		  </form>
+		  <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" onSubmit="getactionfilename();">
+		    <td bgcolor="#ccddaa" align="center">
+		      <nobr>
+			<input type="hidden" name="filename" value="" />
+			  <select name="action">
+			    <option>Select Action</option>
+			    <option value="newfile">New file:</option>
+			    <option value="newhtmlfile">New HTML file:</option>
+			    <option value="newproblemfile">New problem:</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="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>
+		</td>
+		</form>
+		</tr>
+	      </table>
+	    </th>
+	  </tr>
+	</table>
+      </font>
+    </body>
+  </html>
