Changeset 11991

Timestamp:

2006-06-30T16:35:22+12:00 (18 years ago)

Author:

mdewsnip

Message:

Lots more work on the new advanced search page... nearly there.

File:

• trunk/cic-hcap/macros/extra.dm (modified) (6 diffs)

trunk/cic-hcap/macros/extra.dm

@@ -111 +111 @@
 
 # We use a very simple pagebanner: just the collection icon, no javalinks etc
-_pagebanner_ {<span style="font-size: 26px; float: right; padding-top: 10px;">Historic Campus Architecture Project</span><a href="_gwcgi_?a=p&p=home"><img src="_httpcollection_/images/logo.jpg"></a>}
+_pagebanner_ {<span style="font-size: 24px; float: right; padding-top: 10px;">Historic Campus Architecture Project</span><a href="_gwcgi_?a=p&p=home"><img src="_httpcollection_/images/logo.jpg"></a>}
 
 _pagetitle_ {The Council of Independent Colleges: Historic Campus Architecture Project}
@@ -891 +891 @@
 
 _cicaqpdefault_ {<select name='aqp'><option value='0'>contains</option><option value='1'>is</option></select>}
-_cicaqptypeofplace_ {<select name='aqp' disabled><option value='0'>contains</option><option value='1' selected>is</option></select>}
+_cicaqptypeofplace_ {<select name='aqp' disabled='true'><option value='0'>contains</option><option value='1' selected='true'>is</option></select>}
 
 _cicaqvdefault_ {<input name='aqv' type='text' style='width: 450px'/>}
 _cicaqvtypeofplace_ {<select name='aqv' style='width: 450px'><option value='Individual building'>Individual building</option><option value='Landscape site'>Landscape site</option><option value='Campus arrangement'>Campus arrangement</option><option value='Building group'>Building group</option></select>}
+
+_cicaqline_ {
+<tr>
+  <td colspan="3">
+    <center>
+      <nobr>
+        <select name="aqi" onChange="changedAQI();">
+      <option value="">Keyword</option>
+      <option value="PL">Type of place</option>
+      <option value="IN">Institution</option>
+      <option value="AR">Designer</option>
+    </select>
+    <input type="hidden" name="aqib" value="">
+
+    <span id="aqp_1_">
+      _cicaqpdefault_
+    </span>
+
+    <span id="aqv_1_">
+      _cicaqvdefault_
+    </span>
+
+    <select name="aqc">
+      <option value="and">and</option>
+      <option value="or">or</option>
+    </select>
+      </nobr>
+    </center>
+  </td>
+</tr>
+}
 
 _advancedformsnew_ {
@@ -904 +935 @@
 <input type="hidden" name="m" value="-1">
 
-<tr>
-  <td colspan="3">
-    <center>
-      <nobr>
-        <select name="aqi" onChange="changedAQI();">
-          <option value="ZZ">Keyword</option>
-      <option value="PL">Type of place</option>
-      <option value="IN">Institution</option>
-      <option value="AR">Designer</option>
-        </select>
-
-    <span id="aqp">
-      _cicaqpdefault_
-    </span>
-
-        <span id="aqv">
-      _cicaqvdefault_
-        </span>
-
-    <select name="aqc">
-      <option value="and">and</option>
-      <option value="or">or</option>
-    </select>
-      </nobr>
-    </center>
-  </td>
-</tr>
+_cicaqline_(0)
+_cicaqline_(1)
+_cicaqline_(2)
 
 <tr>
@@ -1214 +1221 @@
 function initializeadvancedsearch()
 \{
+   changedAQI();
 \}
 
 function changedAQI()
 \{
-   if (document.QueryForm.aqi.value == "PL") \{
-      document.getElementById('aqp').innerHTML = "_cicaqptypeofplace_";
-      document.getElementById('aqv').innerHTML = "_cicaqvtypeofplace_";
+   for (var i = 0; i < document.QueryForm.aqi.length; i++) \{
+      if (document.QueryForm.aqi[i].value != document.QueryForm.aqib[i].value) \{
+         alert("Changed " + i + ": " + document.QueryForm.aqi[i].value);
+         if (document.QueryForm.aqi[i].value == "PL") \{
+            document.getElementById("aqp" + i).innerHTML = "_cicaqptypeofplace_";
+        document.getElementById("aqv" + i).innerHTML = "_cicaqvtypeofplace_";
+     \}
+     else \{
+            document.getElementById("aqp" + i).innerHTML = "_cicaqpdefault_";
+        document.getElementById("aqv" + i).innerHTML = "_cicaqvdefault_";
+     \}
+
+     document.QueryForm.aqib[i].value = document.QueryForm.aqi[i].value;
+      \}
    \}
-   else \{
-      document.getElementById('aqp').innerHTML = "_cicaqpdefault_";
-      document.getElementById('aqv').innerHTML = "_cicaqvdefault_";
-   \}
+
+   prepareadvancedsearch();
 \}
 
@@ -1232 +1249 @@
    document.QueryForm.q.value = "";
 
-   if (document.QueryForm.aqv.value != "") \{
-      addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv.value + "]:" + document.QueryForm.aqi.value);
+   for (var i = 0; i < document.QueryForm.aqi.length; i++) \{
+      alert(i + ": " + document.QueryForm.aqi[i].value + "," + document.QueryForm.aqv[i].value);
+      if (document.QueryForm.aqv[i].value != "") \{
+         addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv[i].value + "]:" + document.QueryForm.aqi[i].value);
+     alert(document.QueryForm.aqi[i].value + " -- " + document.QueryForm.q.value);
+      \}
    \}
 
@@ -1242 +1263 @@
    addIndexValue(document.QueryForm.q, document.QueryForm.deq, "DE");
    addIndexValue(document.QueryForm.q, document.QueryForm.stq, "ST");
-
-   alert(document.QueryForm.q.value);
 \}