Changeset 4763

Timestamp:

2003-06-23T14:34:35+12:00 (21 years ago)

Author:

kjdon

Message:

changed the prefs slightly. now longer uses javascript to add in the form search stuff - can use the prefs page without java script now (however, cant actually do form searching without javascript yet - thats my next job :-) ) form type uses qf arg now instead of b arg, so the two can coexist on the same page. what prefs are shown depends on teh qto arg - this indicates in form, plain of both search types are available, and the prefs page changes accordingly.

File:

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

trunk/gsdl/macros/pref.dm

@@ -43 +43 @@
   for (i = 0; i < document.links.length; i++)
     savedhrefs[i] = document.links[i].href;
-
-  // only add form search option if mgpp (ct arg) and javascript
-_If_("_cgiargct_" eq "1",var opt=new Option\("_textformsearch_"\, "1"\); document.PrefForm.qt.options[1]=opt;,//)_If_("_cgiargqt_" eq "1",opt.selected=1;)
 
   s = "_cgiargcc_";
@@ -85 +82 @@
   for (i = 0; i < document.links.length; i++)
     savedhrefs[i] = document.links[i].href;
-  // only add form search option if mgpp (ct arg) and javascript
-_If_("_cgiargct_" eq "1",var opt=new Option\("_textformsearch_"\, "1"\); document.PrefForm.qt.options[1]=opt;,//)_If_("_cgiargqt_" eq "1",opt.selected=1;)
-\}
+
+\}
+
 }
 
 _getargsfunction_ {
 function getargs () \{
-  return argk + args + argm + argo + argrd + arghd + argb + argqb + argfqn_If_(_collectionoption_,_ccsargs_)_If_(_htmloptions_,_htmlargs_);
+  return argk + args + argm + argo + argrd + arghd + argb + argqf + argqb + argfqn_If_(_collectionoption_,_ccsargs_)_If_(_htmloptions_,_htmlargs_);
 \}
 }
@@ -142 +139 @@
 argo = "";
 argb = "";
+argqf = "";
 arghd = "";
 argqb = "";
@@ -198 +196 @@
   if (value != _cgiargb_) argb = "&b=" + value;
   else argb = "";
+  updatehrefs();
+\}
+function updateqf (value) \{
+  if (value != _cgiargqf_) argqf = "&qf=" + value;
+  else argqf = "";
   updatehrefs();
 \}
@@ -245 +248 @@
 \}
 
-function updateqt () \{
-  value = document.PrefForm.qt.options[document.PrefForm.qt.selectedIndex].value;
-  location.href = location.href + "&qt=" + value + getargs();
+function updateqt (value) \{
+  if (value != _cgiargqt_) location.href = location.href + "&qt=" + value + getargs();
 \}
 }
@@ -344 +346 @@
 }
 
+_formmodeoption_{
+<td valign=baseline>_textformtype_</td>
+<td><input type=radio name=qf value=0 onClick="updateqf(0);"
+        _If_(_cgiargf_,, checked)>_textsimple_<br>
+<input type=radio name=qf value=1 onClick="updateqf(1);"
+        _If_(_cgiargqf_, checked)>_textadvanced_</td>
+}
+
+_formnumfieldoption_ {<td></td><td>_textwith_
+<select name="fqn" onChange="updatefqn();">
+  <option value="2"_If_("_cgiargfqn_" eq "2", selected)>2  
+  <option value="4"_If_("_cgiargfqn_" eq "4", selected)>4
+  <option value="6"_If_("_cgiargfqn_" eq "6", selected)>6
+  <option value="8"_If_("_cgiargfqn_" eq "8", selected)>8
+</select>_textfields_</td>
+}
 
 _searchhistoryop_ {
@@ -428 +446 @@
 _If_(_collectionoption_,_collectionprefs_)
 _presentationprefs_
-_If_("_cgiargct_" eq "1",_mgppsearchprefs_,_mgsearchprefs_)
-
+_searchprefs_
 </blockquote>
 </form>
 }
 
-#search prefs for mg collections
-_mgsearchprefs_ {
+#search prefs 
+_searchprefs_ {
 <center><table border=0 cellpadding=0 cellspacing=0 width=_pagewidth_><tr>
 <td><h3>_textsearchprefs_</h3></td>
@@ -442 +459 @@
 
 <table>
-<tr>_boxsizeoption_</tr>
+_querytypedependantoptions_
 
 <tr>_caseoption_</tr>
 
 <tr>_stemoption_</tr>
-
-<tr>_modeoption_</tr>
 
 <tr>_searchhistoryop_</tr>
@@ -462 +477 @@
 _iconblankbar_
 <blockquote>
+}
+
+_querytypedependantoptions_ {
+_If_("_cgiargct_" eq "0", _plainqueryoptions_,_mgppqueryoptions_)
+}
+
+_mgppqueryoptions_{
+  _If_("_cgiargqto_" eq "1", _plainqueryoptions_)
+  _If_("_cgiargqto_" eq "2", _formqueryoptions_)
+  _If_("_cgiargqto_" eq "3", _dualqueryoptions_)
+}
+
+#query options for mg colls and mgpp colls with only plain searching
+_plainqueryoptions_ {
+<tr>_modeoption_</tr>
+
+<tr>_boxsizeoption_</tr>
+}
+
+#query options for mgpp colls with only form searching
+_formqueryoptions_ {
+<tr>_formmodeoption_</tr>
+<tr>_formnumfieldoption_</tr>
+}
+
+#query options for mgpp colls with both types of search available
+_dualqueryoptions_ {
+<tr><td colspan=2><input type=radio name=qt value=0 onClick="updateqt(0);" _If_(_cgiargqt_,, checked)>Plain search</td></tr>
+<tr><td></td><td><table>_plainqueryoptions_</table></td></tr>
+<tr><td colspan=2><input type=radio name=qt value=1 onClick="updateqt(1);" _If_(_cgiargqt_,checked)>Form search</td></tr>
+<tr><td></td><td><table>_formqueryoptions_</table></td></tr>
 }
 
@@ -486 +532 @@
 }
 
-#######################################################
-## new stuff for prefs for form vs text search - for mgpp collections
-_mgppsearchprefs_ {
-<h3>_textsearchprefs_</h3>
-<table>
-<tr>_searchtypeop_</tr>
-
-_If_(_cgiargqt_,_formsearchoptions_,_textsearchoptions_)
-
-<tr>_caseoption_</tr>
-
-<tr>_stemoption_</tr>
-
-<tr>_searchhistoryop_</tr>
-
-<tr><td colspan=2>_textprefop_</td></tr></table>
-<input type=submit value="Update settings"><!--non-javascript users only-->
-</blockquote>
-_iconblankbar_
-<blockquote>
-}
-
-
-_searchtypeop_ {
-<td>_texttypesearch_</td>
-<td><select name="qt" onChange="updateqt();">
-  <option value="0"_If_("_cgiargqt_" eq "0", selected)>_texttextsearch_
-<!-- textformsearch option done in initialize function -->
-</select></td>
-}
-
-_formsearchoptions_ {
-<tr>_formmodeoption_</tr>
-}
-
-_textsearchoptions_ {
-<tr>_boxsizeoption_</tr>
-<tr>_modeoption_</tr>
-}
-
-_formmodeoption_{
-<td valign=baseline>_textformtype_</td>
-<td><input type=radio name=b value=0 onClick="updateb(0);"
-        _If_(_cgiargb_,, checked)>_textsimple_<br>
-<input type=radio name=b value=1 onClick="updateb(1);"
-        _If_(_cgiargb_, checked)>_textadvanced_<br>
-_formnumoption_</td>
-}
-
-_formnumoption_ {_textwith_
-<select name="fqn" onChange="updatefqn();">
-  <option value="2"_If_("_cgiargfqn_" eq "2", selected)>2  
-  <option value="4"_If_("_cgiargfqn_" eq "4", selected)>4
-  <option value="6"_If_("_cgiargfqn_" eq "6", selected)>6
-  <option value="8"_If_("_cgiargfqn_" eq "8", selected)>8
-</select>_textfields_</td>
-}
-
 
 #######################################################################