Changeset 10053

Timestamp:

2005-06-13T13:29:32+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed the preferences button, for real this time I hope.

Location:

trunk/gsdl

Files:

• macros/gti.dm (modified) (2 diffs)
• src/recpt/gtiaction.cpp (modified) (2 diffs)

trunk/gsdl/macros/gti.dm

@@ -1 +1 @@
 # this file must be UTF-8 encoded
-
-package Global
-
-# The preferences button must go to the "homepref" page, since we are not in a collection 
-# _imagepref_ {_gsimage_(_home:httppagehomepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
-
 
 package gti
@@ -12 +6 @@
 # page content
 #######################################################################
+
+_pagetitle_ {_textgti_}
+
+# The preferences button must go to the "homepref" page, since we are not in a collection
+_imagepref_ {_gsimage_(_home:httppagehomepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
 
 _content_ {

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -126 +126 @@
               ostream& logout)
 {
-  textout << outconvert << disp << ("_header_\n") << ("_content_\n") << ("_footer_\n");
+  textout << outconvert << disp << ("_gti:header_\n") << ("_gti:content_\n") << ("_gti:footer_\n");
   return true;
 }
@@ -148 +148 @@
   logout << endl << "CGI arg p: " << args["p"] << endl;
 
-  // Set the page content to be the content macro for the gti package
-  disp.setmacro("content", displayclass::defaultpackage, "_gti:content_");
-  disp.setmacro("pagetitle", displayclass::defaultpackage, "_gti:textgti_");
+  // For some reason this must be done as well as setting the macro in gti.dm
+  disp.setmacro("imagepref", displayclass::defaultpackage, "_gti:imagepref_");
 
   // Define the page content for the GTI home page