Changeset 2496

Timestamp:

2001-06-05T17:52:35+12:00 (23 years ago)

Author:

sjboddie

Message:

fixed a little problem where the "set preferences" button screwed up when
DocumentUseHTML was set

Location:

trunk/gsdl/macros

Files:

• english.dm (modified) (1 diff)
• pref.dm (modified) (3 diffs)

trunk/gsdl/macros/english.dm

@@ -648 +648 @@
 <br>}
 _textrelateddocdisplay_ {display related documents}
-_textfcoption_ { Include navigation bar at top of document pages}
-_texthloption_ { Highlight search terms within document text}
 _textsearchhistory_{Search history:}
 _texthistorydisplay_ { display _historynumrecords_search history records}

trunk/gsdl/macros/pref.dm

@@ -115 +115 @@
 \}
 
-function updatefc () \{
-  if (document.PrefForm.fc.checked)
-    _If_("_cgiargfc_" eq "1",_argfcblank_,_argfcon_)
-  else 
-    _If_("_cgiargfc_" ne "1",_argfcblank_,_argfcoff_)
-  updatehrefs();
-\}
-
-function updatehl () \{
-  if (document.PrefForm.hl.checked)
-    _If_("_cgiarghl_" eq "1",_arghlblank_,_arghlon_)
-  else 
-    _If_("_cgiarghl_" ne "1",_arghlblank_,_arghloff_)
-  updatehrefs();
-\}
-}
-
-_argfcblank_ {argfc = "";}
-_argfcon_ {argfc = "&fc=1&f=1";}
-_argfcoff_ {argfc = "&fc=0&f=0";}
-
-_arghlblank_ {arghl = "";}
-_arghlon_ {arghl = "&hl=1";}
-_arghloff_ {arghl = "&hl=0";}
+function updatefc(value) \{
+  if (value != _cgiargfc_) argfc = "&fc=" + value + "&f=" + value;
+  else argfc = "";
+  updatehrefs();
+\}
+
+function updatehl(value) \{
+  if (value != _cgiarghl_) arghl = "&hl=" + value;
+  else arghl = "";
+  updatehrefs();
+\}
+}
 
 _pagescriptextra_ {
@@ -289 +277 @@
 _htmloptionson_ {
 <p>
-<tr><td colspan=2>_fcoption_</td></tr>
+<tr>_fcoption_</tr>
 <p>
-<tr><td colspan=2>_hloption_</td></tr>
+<tr>_hloption_</tr>
 <p>
 <tr>_extlinkoption_</tr>
@@ -299 +287 @@
 
 _fcoption_ {
-<input type=checkbox name=fc onClick="updatefc();"_If_("_cgiargfc_" eq "1", checked)> 
-_textfcoption_
+<td valign=baseline>Document page layout</td>
+<td><input type=radio name=fc value=1 onClick="updatefc(1);"
+        _If_(_cgiargfc_, checked)>navigation bar at top<br>
+<input type=radio name=fc value=0 onClick="updatefc(0);"
+        _If_(_cgiargfc_,, checked)>no navigation bar</td>
 }
 
 _hloption_ {
-<input type=checkbox name=hl onClick="updatehl();"_If_("_cgiarghl_" eq "1", checked)> 
-_texthloption_
+<td valign=baseline>Search term highlighting</td>
+<td><input type=radio name=hl value=1 onClick="updatehl(1);"
+        _If_(_cgiarghl_, checked)>highlight search terms<br>
+<input type=radio name=hl value=0 onClick="updatehl(0);"
+        _If_(_cgiarghl_,, checked)>don't highlight search terms</td>
 }