Changeset 12069

Timestamp:

2006-07-07T11:24:27+12:00 (18 years ago)

Author:

mdewsnip

Message:

Organised the search page macros better.

File:

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

trunk/cic-hcap/macros/extra.dm

@@ -840 +840 @@
 package query
 
-# Hide the "or enter a query directly" box
-_advancedformextra_ {}
-
-# We have our own Javascript for the form searching
-_formfunctions_ {}
-
-_header_ {_If_(_cgiargq_,_style:header_,_style:cicheader_(onLoad="initializeadvancedsearch();"))}
-
-_pagescriptextra_ {}
-
-# What is displayed on the "advanced search" submit button
-_textbeginsearch_ {Search}
-
-# Hide the "search and display results in ... order" text
-_textformselect_ {}
+_cicpagecontent_ {
+_If_(_cgiargq_,_cicsearchresults_,_If_("_cgiargqst_" eq "1",_cicstatesearchpage_,_If_("_cgiargqre_" eq "1",_cicbibliographicsearchpage_,_cicadvancedsearchpage_))
+}
 
 _cicsimplequeryform_ {
@@ -866 +854 @@
 }
 
-_cicpagecontent_ {
-_If_(_cgiargq_,_cicsearchresults_,_If_("_cgiargqre_" eq "1",_cicbibliographicsearchpage_,_If_("_cgiargqst_" eq "1",_cicstatesearchpage_,_cicadvancedsearchpage_))
-}
-
 _cicsearchresults_ {
 <div class="cicheading">Search Results</div>
@@ -876 +860 @@
 }
 
-_cicbibliographicsearchpage_ {
-<span class="cicheading">Bibliographic Search</span>
-
-<center>
-  <form name=ReferencesQueryForm method=get action="_gwcgi_" onSubmit="preparereferencessearch();">
-    <input type="hidden" name="a" value="q">
-    <input type="hidden" name="fqc" value="and">
-    <input type="hidden" name="fqf" value="RE">
-    <input type="hidden" name="fqv" value="">
-    <nobr><span class="cicqueryfieldtext">Search place references by title/author/keywords: </span><input type="text" name="txq" value="" size="40" style="border: solid 1px #005400;"></nobr>
-  </form>
-</center>
-}
+
+
+# ------------------------------------------------------------------------------------------
+#   QUERY  (Search -> Institutions by State)
+# ------------------------------------------------------------------------------------------
 
 _cicstatesearchpage_ {
@@ -898 +874 @@
   </select>
 </center>
-}
-
-_cicadvancedsearchpage_ {
-<span class="cicheading">Advanced Search</span>
-
-<center>_fieldqueryform_</center>
 }
 
@@ -966 +936 @@
 }
 
+
+# ------------------------------------------------------------------------------------------
+#   QUERY  (Search -> Bibliographic Search)
+# ------------------------------------------------------------------------------------------
+
+_cicbibliographicsearchpage_ {
+<span class="cicheading">Bibliographic Search</span>
+
+<center>
+  <form name=ReferencesQueryForm method=get action="_gwcgi_" onSubmit="preparereferencessearch();">
+    <input type="hidden" name="a" value="q">
+    <input type="hidden" name="fqc" value="and">
+    <input type="hidden" name="fqf" value="RE">
+    <input type="hidden" name="fqv" value="">
+    <nobr><span class="cicqueryfieldtext">Search place references by title/author/keywords: </span><input type="text" name="txq" value="" size="40" style="border: solid 1px #005400;"></nobr>
+  </form>
+</center>
+}
+
+
+
+# ------------------------------------------------------------------------------------------
+#   QUERY  (Search -> Advanced Search)
+# ------------------------------------------------------------------------------------------
+
+# Hide the "or enter a query directly" box
+_advancedformextra_ {}
+
+# We have our own Javascript for the form searching
+_formfunctions_ {}
+
+_header_ {_If_(_cgiargq_,_style:header_,_style:cicheader_(onLoad="initializeadvancedsearch();"))}
+
+_pagescriptextra_ {}
+
+# What is displayed on the "advanced search" submit button
+_textbeginsearch_ {Search}
+
+# Hide the "search and display results in ... order" text
+_textformselect_ {}
+
+_cicadvancedsearchpage_ {
+<span class="cicheading">Advanced Search</span>
+
+<center>_fieldqueryform_</center>
+}
+
 _cicaqvdefault_ {<input id='aqv_1_field' name='aqv' type='text' style='width: 450px'/>}
 _cicaqvtypeofplace_ {<select id='aqv_1_field' 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>}