Changeset 11144 for trunk/gsdl

Timestamp:

2006-01-27T14:48:52+13:00 (18 years ago)

Author:

jrm21

Message:

put the output document text in its own div, and give it some CSS to make
sure it is shown underneath any floating divs instead of next to them.

Location:

trunk/gsdl

Files:

• images/style.css (modified) (1 diff)
• src/recpt/documentaction.cpp (modified) (3 diffs)

trunk/gsdl/images/style.css

@@ -135 +135 @@
   padding-top: 5px;
 }
+div.documenttext { clear: both; } /* come after any floating divs */
 
 div.warning { /* eg expanding more than 10 sections in table of contents */

trunk/gsdl/src/recpt/documentaction.cpp

@@ -1149 +1149 @@
   }
     
+  textout << outconvert << "<div class=\"documenttext\">\n";
+
   if (get_info (OID, collection, args["l"], metadata, getParents, collectproto, inforesponse, logout)) {
     int hastxt = inforesponse.docInfo[0].metadata["hastxt"].values[0].getint();
@@ -1157 +1159 @@
            OID, highlight, hastxt, wanttext, collection, collectproto, 
            browsers, disp, outconvert, textout, logout, args);
-
 
     } else {
@@ -1223 +1224 @@
     }
   }
+  textout << outconvert << "</div>\n";
   delete formatlistptr;
 }