Changeset 12085

Timestamp:

2006-07-07T12:24:42+12:00 (18 years ago)

Author:

mdewsnip

Message:

Split up the javascript for the different search pages.

File:

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

trunk/cic-hcap/macros/extra.dm

@@ -840 +840 @@
 package query
 
+_cicjavascript_ {
+<script language="Javascript">
+
+_cicsimplejavascript_
+_If_("_cgiargqst_" eq "1",_cicstatesearchjavascript_)
+_If_("_cgiargqre_" eq "1",_cicbibliographicsearchjavascript_)
+_cicadvancedsearchjavascript_
+
+</script>
+}
+
 _cicpagecontent_ {
-_If_(_cgiargq_,_cicsearchresults_,_If_("_cgiargqst_" eq "1",_cicstatesearchpage_,_If_("_cgiargqre_" eq "1",_cicbibliographicsearchpage_,_cicadvancedsearchpage_))
+_If_(_cgiargq_,_cicsearchresults_,_If_("_cgiargqst_" eq "1",_cicstatesearchpage_,_If_("_cgiargqre_" eq "1",_cicbibliographicsearchpage_,_cicadvancedsearchpage_)))
+}
+
+_cicsimplejavascript_ {
+function initializesimplesearch()
+\{
+   document.SimpleQueryForm.txq.focus();
+\}
+
+function preparesimplesearch()
+\{
+   document.SimpleQueryForm.fqv.value = document.SimpleQueryForm.txq.value;
+\}
 }
 
@@ -868 +891 @@
 #   QUERY  (Search -> Institutions by State)
 # ------------------------------------------------------------------------------------------
+
+_cicstatesearchjavascript_ {
+function preparestatesearch()
+\{
+\}
+}
 
 _cicstatesearchpage_ {
@@ -949 +978 @@
 # ------------------------------------------------------------------------------------------
 
+_cicbibliographicsearchjavascript_ {
+function initializereferencessearch()
+\{
+   document.ReferencesQueryForm.txq.focus();
+\}
+
+function preparereferencessearch()
+\{
+   document.ReferencesQueryForm.fqv.value = document.ReferencesQueryForm.txq.value;
+\}
+}
+
 _cicbibliographicsearchpage_ {
 <span class="cicheading">Bibliographic Search</span>
@@ -1247 +1288 @@
 }
 
-_cicjavascript_ {
-<script language="Javascript">
-
-function initializesimplesearch()
-\{
-   document.SimpleQueryForm.txq.focus();
-\}
-
-function preparesimplesearch()
-\{
-   document.SimpleQueryForm.fqv.value = document.SimpleQueryForm.txq.value;
-\}
-
-function preparestatesearch()
-\{
-\}
-
+_cicadvancedsearchjavascript_ {
 function initializeadvancedsearch()
 \{
@@ -1362 +1387 @@
    return source_string.substring(0, source_string.length - offender.length);
 \}
-
-function initializereferencessearch()
-\{
-   document.ReferencesQueryForm.txq.focus();
-\}
-
-function preparereferencessearch()
-\{
-   document.ReferencesQueryForm.fqv.value = document.ReferencesQueryForm.txq.value;
-\}
-
-</script>
 }