Changeset 2415

Timestamp:

2001-05-15T11:08:08+12:00 (23 years ago)

Author:

sjboddie

Message:

re-added the "set preferences" button to the preferences page

Location:

trunk/gsdl

Files:

• macros/arabic.dm (modified) ( previous)
• macros/dutch.dm (modified) (1 diff)
• macros/english.dm (modified) (1 diff)
• macros/french.dm (modified) (1 diff)
• macros/german.dm (modified) (1 diff)
• macros/port.dm (modified) (1 diff)
• macros/pref.dm (modified) (3 diffs)
• macros/spanish.dm (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (4 diffs)

trunk/gsdl/macros/dutch.dm

@@ -582 +582 @@
 _textfcoption_ [l=nl] {Plaats navigatie lijst bovenaan de documenten pagina}
 _texthloption_ [l=nl] {Accentueer zoektermen in document tekst}
-_texthistorydisplay_ [l=nl] {Weergave vroegere zoekresultaten}
 
 

trunk/gsdl/macros/english.dm

@@ -612 +612 @@
 #------------------------------------------------------------
 
+_textprefschanged_ {
+Preferences have been set as follows. Do not use your browsers' 'back' button - 
+it will unset them!
+}
+_textsetprefs_ {set preferences}
 _textsearchprefs_ {Search preferences}
 _textcollectionprefs_ {Collection preferences}

trunk/gsdl/macros/french.dm

@@ -460 +460 @@
 _textfcoption_ [l=fr] {Inclure la barre de naviguation en haut des pages de document}
 _texthloption_ [l=fr] {Mettre en evidence les termes de recherche au sein du document}
-_texthistorydisplay_ [l=fr] {afficher l'historique des recherches}
 
 

trunk/gsdl/macros/german.dm

@@ -507 +507 @@
 _textfcoption_ [l=de] {Produziere Navigationsleiste am Kopfende des Dokuments}
 _texthloption_ [l=de] {Hervorhebung von Suchbegriffen im Text des Dokuments}
-_texthistorydisplay_ [l=de] {Anzeige der alten Resultate}
 
 

trunk/gsdl/macros/port.dm

@@ -488 +488 @@
 _textfcoption_ [l=pt] {Inclui barra de navegação no topo da página do documento}
 _texthloption_ [l=pt] {Destacar termos buscados com o texto do documento}
-_texthistorydisplay_ [l=pt] {exibir histórico de busca}
 
 

trunk/gsdl/macros/pref.dm

@@ -11 +11 @@
 _PreferenceDocsFromWeb_ {}
 
+# this macro will be set to _textprefschanged_ when the "set preferences"
+# button has been pressed
+_prefschanged_ {}
 
 #######################################################################
@@ -418 +421 @@
 _navigationbar_
 </center>
+_If_(_prefschanged_,<p>_prefschanged_<br><center>_iconblankbar_</center>)
 
 <blockquote>
@@ -454 +458 @@
 <tr><td colspan=2>_textprefop_</td></tr>
 </table>
+<br><input type=submit name="bp" value="_textsetprefs_">
 </blockquote>
 _iconblankbar_

trunk/gsdl/macros/spanish.dm

@@ -501 +501 @@
 _textfcoption_ [l=es] {Incluir la barra de navegación en la parte superior de las páginas del documento}
 _texthloption_ [l=es] {Resaltar los términos de la búsqueda dentro del documento}
-_texthistorydisplay_ [l=es] {mostrar la historia de la búsqueda}
 
 

trunk/gsdl/src/recpt/pageaction.cpp

@@ -60 +60 @@
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bp";
+  arg_ainfo.longname = "set preferences button";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
 }
 
@@ -65 +73 @@
 }
 
-bool pageaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
+bool pageaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
                 ostream &/*logout*/) {
-  // don't want to check anything yet.
+
+  if (args["p"] == "preferences" && !args["bp"].empty()) {
+    if (args["hd"] != "0") args["hd"] = args["hdn"];
+  }
+
   return true;
 }
@@ -306 +318 @@
   // _numbrowseoptions_    the number of browsing options 
 
+  // _prefschanged_        will be set to _textprefschanged_ if the "set preferences" button
+  //                       was pressed
+
 
   // if page is "help"
@@ -472 +487 @@
       encodingoption += "</select>\n";
       disp.setmacro ("encodingoption", "preferences", encodingoption);
+    }
+
+    // _prefschanged_
+    if (!args["bp"].empty()) {
+      disp.setmacro ("prefschanged", "preferences", "_textprefschanged_");
     }