Changeset 11131

Timestamp:

2006-01-27T12:47:40+13:00 (18 years ago)

Author:

jrm21

Message:

use CSS instead of tables for cover images/heading, document buttons.

File:

• trunk/gsdl/src/recpt/browsetools.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -84 +84 @@
     here = buttons.begin();
     end = buttons.end();
-    int count = 0;
     while (here != end) {
-      if ((count != 0) && ((count % 2) == 0)) textout<< outconvert << "<br>\n";
       textout << outconvert << disp << *here;
-      ++count;
       ++here;
     }
@@ -109 +106 @@
   if (args["d"].empty()) return;
   
-  textout << outconvert << disp << "<img alt=\"\" onError=\"src='_httpimg_/blank.gif'\" src=\"_httpcollimg_/_thisOID_/cover.jpg\"><br>\n";
+  textout << outconvert << disp << "<img alt=\"\" onError=\"src='_httpimg_/blank.gif'\" src=\"_httpcollimg_/_thisOID_/cover.jpg\">\n";
 }
 
@@ -796 +793 @@
 
   int tabcount = 0;
-  bool havecontrols = false;
   bool fulltoc = false;
 
@@ -810 +806 @@
   // if we're inside a book
   if ((!fulltoc) && (!args["d"].empty())) {
-    textout << outconvert << "<center>\n";
-    textout << outconvert << disp << "<p><table width=_pagewidth_ cellpadding=0 cellspacing=0><tr>\n";
-    textout << outconvert << "<td valign=top align=left";
-    if (formatinfo.DocumentContents) textout << outconvert << " width=200>\n";
-    else textout << outconvert << " width=\"100%\">\n";
+    textout << outconvert << "<div class=\"heading\">\n";
     if (formatinfo.DocumentImages) 
       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
     else if (formatinfo.DocumentTitles)
       output_titles (args, collectproto, browsermap, formatinfo, disp, outconvert, textout, logout);
+    textout << outconvert << "\n</div>\n\n<div class=\"buttons\" id=\"toc_buttons\">\n"; 
     if (args["u"] != "1") {
       output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
                outconvert, textout, logout);
     }
-    textout << outconvert << "</td><td valign=\"top\">\n";  
-    havecontrols = true;
+    textout << outconvert << "</div>\n\n"; 
   }
 
   if (formatinfo.DocumentContents || args["d"].empty()) {
+    textout << outconvert << "<div class=\"toc\">\n";
     if (args.getintarg("gc") == 1) {
       
@@ -838 +831 @@
       expand_show_contents(args, tabcount, fulltoc, browsermap, formatinfo,
             collectproto, disp, outconvert, textout, logout);
-    } else {
+    } else {
       
       // contracted table of contents
@@ -844 +837 @@
                collectproto, disp, outconvert, textout, logout);
     }
-  }
-
-  if (havecontrols) textout << outconvert << "</td></tr></table></center>\n"; 
+    textout << outconvert << "</div>\n";
+  }
 
   //if there is a format specified in the config file then