Changeset 180 for trunk

Timestamp:

1999-03-02T09:39:18+13:00 (25 years ago)

Author:

sjboddie

Message:

Fixed a few errors. Started using new _If_ functionality

Location:

trunk/gsdl/macros

Files:

• base.dm (modified) (2 diffs)
• pref.dm (modified) (2 diffs)
• query.dm (modified) (1 diff)

trunk/gsdl/macros/base.dm

@@ -437 +437 @@
 _httpicontsergr_ {_httpimg_/tsergr.gif}
 _httpicontsergr_ [language=mi] {_httpimg_/mtsergr.gif}
-_httpicontsergr_ [language=mi] {_httpimg_/mtsergr.gif}
 _httpicontserof_ {_httpimg_/tserof.gif}
 _httpicontserof_ [language=mi] {_httpimg_/mtserof.gif}
@@ -734 +733 @@
 onMouseout = "img\_off('detach')">_icondetach_</a>}
 _imagedetach_[version=text] {><_font_>_texticondetach_</font></a><br>}
-
-_imagecontracttoc_ {" onMouseover = "img\_on('concon')"
-onMouseout = "img\_off('concon')">_iconcontracttoc_</a>}
-_imagecontracttoc_[version=text] {"><_font_>_texticoncontracttoc_</font></a><br>}
-_imagecontracttoc_[style=htmlonly] {}
-
-_imageexpandtoc_ {" onMouseover = "img\_on('expcon')"
-onMouseout = "img\_off('expcon')">_iconexpandtoc_</a>}
-_imageexpandtoc_ [version=text] {"><_font_>_texticonexpandtoc_</font></a><br>}
-_imageexpandtoc_ [style=htmlonly] {}
-
-_imagecontracttext_ {0" onMouseover = "img\_on('thissec')"
-onMouseout = "img\_off('thissec')">_iconcontracttext_</a>}
-_imagecontracttext_[version=text] {0"><_font_>display only current section</font></a><br>}
-_imagecontracttext_[style=htmlonly] {}
-
-_imageexpandtext_ {1" onMouseover = "img\_on('alltext')"
-onMouseout = "img\_off('alltext')">_iconexpandtext_</a>}
-_imageexpandtext_[version=text] {1"><_font_>display all text</font></a><br>}
-_imageexpandtext_[style=htmlonly] {}
 
 _imagecontracttoc_ {" onMouseover = "img\_on('concon')"

trunk/gsdl/macros/pref.dm

@@ -9 +9 @@
 _imagethispage_ {_iconthispage_}
 
-
-# these macros will be overridden at runtime
 _caseoption_ {
 <input type=radio name=k value=1
-        checked>_textignorecase_<br>
+        _If_(_cgiargk_, checked)>_textignorecase_<br>
 <input type=radio name=k value=0
-        >_textmatchcase_
+        _If_(_cgiargk_,, checked)>_textmatchcase_
 }
 
 _stemoption_ {
 <input type=radio name=s value=1 
-        >_textstem_<br>
+        _If_(_cgiargs_, checked)>_textstem_<br>
 <input type=radio name=s value=0
-        checked>_textnostem_
+        _If_(_cgiargs_,, checked)>_textnostem_
 }
 
 _maxdocoption_ {
 <select name="m">
-  <option value="50" selected>50
-  <option value="100" >100
-  <option value="200" >200
-  <option value="500" >500
+  <option value="50"_If_("_cgiargm_" eq "50", selected)>50
+  <option value="100"_If_("_cgiargm_" eq "100", selected)>100
+  <option value="200"_If_("_cgiargm_" eq "200", selected)>200
+  <option value="500"_If_("_cgiargm_" eq "500", selected)>500
 </select>
 }
@@ -36 +34 @@
 _hitsperpageoption_ {
 <select name="o">
-  <option value="10" selected>10  
-  <option value="20" >20
-  <option value="50" >50
-  <option value="100" >100
-  <option value="500" >all
+  <option value="10"_If_("_cgiargo_" eq "10", selected)>10  
+  <option value="20"_If_("_cgiargo_" eq "20", selected)>20
+  <option value="50"_If_("_cgiargo_" eq "50", selected)>50
+  <option value="100")_If_("_cgiargo_" eq "100", selected)>100
+  <option value="500"_If_("_cgiargo_" eq "500", selected)>all
 </select>
 }

trunk/gsdl/macros/query.dm

@@ -131 +131 @@
 _querytypeselection_ of the words}
 
+_querytypeselection_ {
+<select name="t">
+<option value=1_If_(_cgiargt_, selected)>_textsome_
+<option value=0_If_(_cgiargt_,, selected)>_textall_
+</select>
+}
+
+
 #######################################################################
 # Maori text