b2870ab708f53eb5426e880a26a35adc4560a5e2
Merge parents 156e33d b7352a7
larrym
Thu Jun 28 10:51:51 2012 -0700
Merge commit 'origin'; branch 'master' into newMenu
diff --cc src/lib/htmshell.c
index 7af6bc7,2bfbadb..734bb9b
--- src/lib/htmshell.c
+++ src/lib/htmshell.c
@@@ -465,48 -445,55 +469,47 @@@
void _htmStartWithHead(FILE *f, char *head, char *title, boolean printDocType, int dirDepth)
/* Write out bits of header that both stand-alone .htmls
* and CGI returned .htmls need, including optional head info */
{
if (printDocType)
{
//#define TOO_TIMID_FOR_CURRENT_HTML_STANDARDS
#ifdef TOO_TIMID_FOR_CURRENT_HTML_STANDARDS
fputs("\n", f);
#else///ifndef TOO_TIMID_FOR_CURRENT_HTML_STANDARDS
char *browserVersion;
if (btIE == cgiClientBrowser(&browserVersion, NULL, NULL) && *browserVersion < '8')
fputs("\n", f);
else
- fputs("",f);
+ fputs("",f);
// Strict would be nice since it fixes atleast one IE problem (use of :hover CSS pseudoclass)
- //fputs("\n",f);
#endif///ndef TOO_TIMID_FOR_CURRENT_HTML_STANDARDS
}
fputs("", f);
fprintf(f,"\n%s%s\n", head, title);
fprintf(f, "\t\n");
if (htmlStyle != NULL)
fputs(htmlStyle, f);
if (htmlStyleSheet != NULL)
- fprintf(f,"\n"
- , htmlStyleSheet);
+ fprintf(f,"\n", htmlStyleSheet);
if (htmlStyleTheme != NULL)
fputs(htmlStyleTheme, f);
fputs("\n\n",f);
-fputs("\n",f);
-
+printBodyTag(f);
htmlWarnBoxSetup(f);
}
void htmlStart(char *title)
/* Write the start of an html from CGI */
{
puts("Content-Type:text/html");
puts("\n");
_htmStartWithHead(stdout, "", title, TRUE, 1);
}
void htmStartWithHead(FILE *f, char *head, char *title)
/* Write the start of a stand alone .html file, plus head info */
{