Changeset 14181 for gsdl/trunk

Timestamp:

2007-06-15T15:05:18+12:00 (17 years ago)

Author:

mdewsnip

Message:

Moved some HTML out of the C++ and into the macrofiles.

Location:

gsdl/trunk

Files:

• macros/document.dm (modified) (1 diff)
• src/recpt/browsetoolsclass.cpp (modified) (2 diffs)

gsdl/trunk/macros/document.dm

@@ -31 +31 @@
 # page content
 #######################################################################
+
+_tocopen_ {<div class="top" _tocopenextra_>}
+_tocclose_ {</div>}
 
 _nextsearchresult_ {_If_("_cgiargsrn_" ne "0",<li id="nextresult"><a href="_httpquery_&amp;ifl=1&amp;ifln=_cgiargsrn_">_textnextsearchresult_</a></li>)}

gsdl/trunk/src/recpt/browsetoolsclass.cpp

@@ -825 +825 @@
   if (formatinfo.DocumentContents || args["d"].empty()) {
     if (args["d"].empty()) {
-      textout << outconvert << "<div id=\""<<cl_top<<"\" class=\"toc\">\n";
+      disp.setmacro("tocopenextra", "document", "id=\"" + cl_top + "\"");
     } else {
-      textout << outconvert << "<div class=\"toc\">\n";
-      
-    }
+      disp.setmacro("tocopenextra", "document", "");
+    }
+
+    textout << outconvert << disp << "_document:tocopen_\n";
     if (args.getintarg("gc") == 1)
       {
@@ -848 +849 @@
                             collectproto, disp, outconvert, textout, logout);
       }
-    textout << outconvert << "</div>\n";
+    textout << outconvert << disp << "_document:tocclose_\n";
   }
 }