Changeset 1485 for trunk/gsdl/macros

Timestamp:

2000-08-31T20:07:53+12:00 (24 years ago)

Author:

sjboddie

Message:

More improvements to collector

File:

• trunk/gsdl/macros/collect.dm (modified) (10 diffs)

trunk/gsdl/macros/collect.dm

@@ -19 +19 @@
 _gstimage_ [v=1] {<a href="_1_" target="\_top">_5_</a><br>}
 
-
-
 # a plain header for those pages that need it (the _pagebanner_ macro
 # will be set to this by the server for those pages.
 _plainbanner_ {}
+
+# dont want links to "help" or "preferences" pages from within
+# collector
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
 
 #######################################################################
@@ -79 +85 @@
 _httpconf_ {_gwcgi_?e=_compressedoptions_&cp=conf}
 _httpbild_ {_gwcgi_?e=_compressedoptions_&cp=bild}
-_httpview_ {_gwcgi_?e=_compressedoptions_&a=p&p=about&c=_cgiargbc1dirname_}
+_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirname_}
 _httpdel_  {javascript:do_delete();}
 
@@ -429 +435 @@
 function check\_submit (gotopage) \{
   var form = document.collectorform;
-  if (form.bc1inputdir1.value.match(/^\\s*$/) &&
-      form.bc1inputdir2.value.match(/^\\s*$/) &&
-      form.bc1inputdir3.value.match(/^\\s*$/) &&
-      form.bc1inputdir4.value.match(/^\\s*$/))
+  var found = 0;
+  var i = 0;
+  if (!form.bc1inputdir1.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir1.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel1.selectedIndex;
+      form.bc1inputdir1.value = form.sel1.options[i].value + form.bc1inputdir1.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir2.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir2.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel2.selectedIndex;
+      form.bc1inputdir2.value = form.sel2.options[i].value + form.bc1inputdir2.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir3.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir3.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel3.selectedIndex;
+      form.bc1inputdir3.value = form.sel3.options[i].value + form.bc1inputdir3.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir4.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir4.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel4.selectedIndex;
+      form.bc1inputdir4.value = form.sel4.options[i].value + form.bc1inputdir4.value;
+    \}
+    found = 1;
+  \}
+
+  if (!found)
   \{
     alert("At least one input source must be specified");
@@ -449 +483 @@
   \} else \{
     form.bc1clonechanged.value = 0;
+  \}
+  menuchange();
+\}
+
+function menuchange () \{
+  var form = document.collectorform;
+  var warnlist = new Array (_warnindex_);
+
+  if (warnlist[form.bc1clonecol.selectedIndex] == 1) \{
+    alert ("The collection you are cloning has a non-standard input file\\n" +
+           "format, and/or uses metadata specified in auxiliary files.  If your\\n" +
+       "new input lacks this information, some browsing facilities may not\\n" +
+           "work properly.");
   \}
 \}
@@ -499 +546 @@
 
 <h4>Input source:</h4>
-<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=72>
+_typeselect_(1,file)<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=60>
 <br>
-<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=72>
+_typeselect_(2,http)<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=60>
 <br>
-<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=72>
+_typeselect_(3,ftp)<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=60>
 <br>
-<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=72>
+_typeselect_(4,file)<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=60>
 <br>
 <font color="#909090">
@@ -525 +572 @@
 
 <p>_iconblankbar_
-<p>Remember, you can always revisit a previous stage by clicking its yellow
-button. 
+<p>Click one of the green buttons. If you are an advanced user you may want
+to adjust the collection configuration. Alternatively, go straight to the
+building stage. Remember, you can always revisit an earlier stage by
+clicking its yellow button.
 
 <p><center>
@@ -537 +586 @@
 </form>
 }
+
+_typeselect_ {<select name="sel_1_">
+<option value="file://" _If_("_2_" eq "file",selected)>file://
+<option value="http://" _If_("_2_" eq "http",selected)>http://
+<option value="ftp://" _If_("_2_" eq "ftp",selected)>ftp://
+</select>}
 
 _srcemenu_ {<input type=radio name=bc1clone onClick="clone_changed(1);" value=1 
@@ -622 +677 @@
 <frameset rows="*,150" border=0>
   <noframes><body bgcolor="#ffffff">
-  <p>You must have a frame enabled browser to view this.</p>
+  <p>You must have a frame enabled browser to obtain feedback
+  on how the building process is progressing. The collection <i>will</i>
+  continue to build as normal however.
+
+  <table>
+  <tr valign=center><td>
+  To stop the building process at any time, click here.
+  <br>The collection you are working on will remain intact.
+  </td>
+  <td><input type="submit" value="stop building"></td>
+  </table>
+
   </body>
   </noframes>
@@ -681 +747 @@
 status line below gives feedback on how the operation is progressing.
 <p>
-To stop the building process at any time, click here:
-<input type="submit" value="stop building">
+
+<table>
+<tr valign=center><td>
+To stop the building process at any time, click here.
 <br>The collection you are working on will remain intact.
+</td>
+<td><input type="submit" value="stop building"></td>
+</table>
+
 <p>
 If you leave this page (and have not cancelled the building process with
@@ -814 +886 @@
 <tr><td>
 <p>An error has occurred while attempting to build your collection.
+<br> The build log contains the following:
+<p>_faillog_
 </td></tr>
 </table></center>