Removed js dependencies in find support

a8fbd447 · ae12ae9f · a8fbd447 · a8fbd447 · a8fbd447
Commit a8fbd447 authored Jan 19, 1999 by
Showing with 6 additions and 47 deletions

lib/python/OFS/FindSupport.py lib/python/OFS/FindSupport.py +2 -2

lib/python/OFS/findAdv.dtml lib/python/OFS/findAdv.dtml +2 -21

lib/python/OFS/findForm.dtml lib/python/OFS/findForm.dtml +2 -24

No files found.
--- a/lib/python/OFS/FindSupport.py
+++ b/lib/python/OFS/FindSupport.py
@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 __doc__="""Principia Find support"""
-__version__='$Revision: 1.6 $'[11:-2]
+__version__='$Revision: 1.7 $'[11:-2]


 import sys, os, string, time, Globals
@@ -103,7 +103,7 @@ class FindSupport:
    manage_findForm=HTMLFile('findForm', globals())
    manage_findAdv=HTMLFile('findAdv', globals())
    manage_findResult=HTMLFile('findResult', globals())
-    manage_findOpt=HTMLFile('findOpt', globals())
+#    manage_findOpt=HTMLFile('findOpt', globals())
    
    def PrincipiaFind(self, obj, obj_ids=None, obj_metatypes=None,
                      obj_searchterm=None, obj_expr=None,

--- a/lib/python/OFS/findAdv.dtml
+++ b/lib/python/OFS/findAdv.dtml
 <HTML>
 <HEAD>
 <TITLE>Advanced Find</TITLE>
-<SCRIPT LANGUAGE="javascript">
-<!--
-function show_smp()
-{  document.location.href="<!--#var URL1-->/manage_findForm";
-}
-
-function show_adv()
-{   document.location.href="<!--#var URL1-->/manage_findAdv";
-}
-
-function show_opt()
-{ wnd=window.open("<!--#var URL1-->/manage_findOpt","wnd_find_options","width=400,height=200");
-  if (document.layers || document.all) {
-    wnd.focus()
-  }
-}
-//-->
-</SCRIPT>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
 <!--#var manage_tabs-->
@@ -122,9 +104,8 @@ function show_opt()
  <TD ALIGN="LEFT" VALIGN="TOP">
  </TD>
  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="SUBMIT" NAME="btn_submit" VALUE="Find"> 
-  <INPUT TYPE="BUTTON" NAME="btn_opt" VALUE="Options..."
-   onClick="show_opt()">
+  <INPUT TYPE="SUBMIT" NAME="btn_submit" VALUE="Find">  
+  <a href="manage_findForm" target="findForm"> Simple...<a>
  </TD>
 </TR>
 </TABLE>

--- a/lib/python/OFS/findForm.dtml
+++ b/lib/python/OFS/findForm.dtml
 <HTML>
 <HEAD>
 <TITLE>Find</TITLE>
-<SCRIPT LANGUAGE="javascript">
-<!--
-function show_smp()
-{  document.location.href="<!--#var URL1-->/manage_findForm";
-}
-
-function show_adv()
-{   document.location.href="<!--#var URL1-->/manage_findAdv";
-}
-
-function show_opt()
-{ wnd=window.open("<!--#var URL1-->/manage_findOpt","wnd_find_options","width=400,height=200");
-  if (document.layers || document.all) {
-    wnd.focus()
-  }
-}
-//-->
-</SCRIPT>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
 <!--#var manage_tabs-->
@@ -87,15 +69,11 @@ function show_opt()
  <TD ALIGN="LEFT" VALIGN="TOP">
  </TD>
  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="SUBMIT" NAME="btn_submit" VALUE="Find"> 
-  <INPUT TYPE="BUTTON" NAME="btn_opt" VALUE="Options..."
-   onClick="show_opt()">
-  <INPUT TYPE="BUTTON" NAME="btn_adv" VALUE="Advanced..."
-   onClick="show_adv()">
+  <INPUT TYPE="SUBMIT" NAME="btn_submit" VALUE="Find">  
+  <a href="manage_findAdv" target="findForm">Advanced...<a>
  </TD>
 </TR>
 </TABLE>
 </FORM>
-
 </BODY>
 </HTML>