Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed HTML errors with nested tables etc.

Browse Source 
SVN revision: 607
This commit is contained in:
Stefan Ritt 2003-09-08 09:29:27 +00:00
parent d74e7c1145
commit 0c0810b1a2
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.145 2003/09/08 09:29:27 midas
Fixed HTML errors with nested tables etc.
Revision 1.144 2003/09/08 07:34:18 midas Revision 1.144 2003/09/08 07:34:18 midas
Increased timeout in SMTP conversation Increased timeout in SMTP conversation
@ -5157,9 +5160,9 @@ int i, j, n_grp, n_lb, nnum, level;
LBLIST clb, flb, nlb, lbl; LBLIST clb, flb, nlb, lbl;
if (printable) if (printable)
rsprintf("<table class=\"pframe\" cellpadding=0 cellspacing=0>\n\n"); rsprintf("<table class=\"pframe\" cellpadding=0 cellspacing=0><!-- show_standard_title -->\n\n");
else else
rsprintf("<table class=\"frame\" cellpadding=0 cellspacing=0>\n\n"); rsprintf("<table class=\"frame\" cellpadding=0 cellspacing=0><!-- show_standard_title -->\n\n");
/* scan logbook hierarchy */ /* scan logbook hierarchy */
n_grp = get_logbook_hierarchy(&lbl); n_grp = get_logbook_hierarchy(&lbl);
@ -5300,7 +5303,7 @@ void show_error(char *error)
show_html_header(NULL, FALSE, "ELOG error"); show_html_header(NULL, FALSE, "ELOG error");
rsprintf("<body><center>\n"); rsprintf("<body><center>\n");
rsprintf("<table class=\"dlgframe\" width=50%% cellpadding=1 cellspacing=0"); rsprintf("<table class=\"dlgframe\" width=\"50%%\" cellpadding=1 cellspacing=0");
rsprintf("<tr><td class=\"errormsg\">%s</td></tr>\n", error); rsprintf("<tr><td class=\"errormsg\">%s</td></tr>\n", error);
rsprintf("<tr><td class=\"errormsg\">"); rsprintf("<tr><td class=\"errormsg\">");
@ -6307,19 +6310,6 @@ char fl[8][NAME_LENGTH];
} }
} }
if (breply)
/* hidden text for original message */
rsprintf("<input type=hidden name=reply_to value=\"%d\">\n", message_id);
if (bupload)
/* hidden text for original message */
rsprintf("<input type=hidden name=reply_to value=\"%s\">\n", getparam("reply_to"));
if (bedit && message_id)
rsprintf("<input type=hidden name=edit_id value=\"%d\">\n", message_id);
rsprintf("</td></tr>\n");
/* set textarea width */ /* set textarea width */
width = 76; width = 76;
@ -6360,6 +6350,17 @@ char fl[8][NAME_LENGTH];
rsprintf("<tr><td colspan=2 class=\"attribvalue\">\n"); rsprintf("<tr><td colspan=2 class=\"attribvalue\">\n");
if (breply)
/* hidden text for original message */
rsprintf("<input type=hidden name=reply_to value=\"%d\">\n", message_id);
if (bupload)
/* hidden text for original message */
rsprintf("<input type=hidden name=reply_to value=\"%s\">\n", getparam("reply_to"));
if (bedit && message_id)
rsprintf("<input type=hidden name=edit_id value=\"%d\">\n", message_id);
if (getcfg(lbs->name, "Message comment", comment) && !bedit && !message_id) if (getcfg(lbs->name, "Message comment", comment) && !bedit && !message_id)
{ {
rsputs(comment); rsputs(comment);
@ -6641,7 +6642,7 @@ char fl[8][NAME_LENGTH];
} }
} }
rsprintf("</td></tr></table>\n"); rsprintf("</table><!-- listframe -->\n");
/*---- menu buttons again ----*/ /*---- menu buttons again ----*/
@ -6650,7 +6651,7 @@ char fl[8][NAME_LENGTH];
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Back")); rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Back"));
rsprintf("</span></td></tr>\n\n"); rsprintf("</span></td></tr>\n\n");
rsprintf("</td></tr></table>\n"); rsprintf("</table><!-- show_standard_title -->\n");
rsprintf("</form></body></html>\r\n"); rsprintf("</form></body></html>\r\n");
} }
@ -11433,15 +11434,15 @@ BOOL first;
/*---- message ----*/ /*---- message ----*/
/* overall message table */
rsprintf("<tr><td><table class=\"listframe\" width=\"100%%\" cellspacing=0>\n");
if (message_error == EL_EMPTY) if (message_error == EL_EMPTY)
rsprintf("<tr><td class=\"errormsg\" colspan=2>%s</td></tr>\n", loc("Logbook is empty")); rsprintf("<tr><td class=\"errormsg\" colspan=2>%s</td></tr>\n", loc("Logbook is empty"));
else if (message_error == EL_NO_MSG) else if (message_error == EL_NO_MSG)
rsprintf("<tr><td class=\"errormsg\" colspan=2>%s</td></tr>\n", loc("This message has been deleted")); rsprintf("<tr><td class=\"errormsg\" colspan=2>%s</td></tr>\n", loc("This message has been deleted"));
else else
{ {
/* overall message table */
rsprintf("<tr><td><table class=\"listframe\" width=\"100%%\" cellspacing=0 cellpadding=0>\n");
/* check for locked attributes */ /* check for locked attributes */
for (i=0 ; i<lbs->n_attr ; i++) for (i=0 ; i<lbs->n_attr ; i++)
{ {
@ -11602,7 +11603,7 @@ BOOL first;
} }
if ((format_flags[i] & AFF_SAME_LINE) == 0) if ((format_flags[i] & AFF_SAME_LINE) == 0)
rsprintf("<table width=100%% cellpadding=0 cellspacing=0><tr>"); rsprintf("<tr><td><table width=\"100%%\" cellpadding=0 cellspacing=0><tr>");
sprintf(lattr, "l%s", attr_list[i]); sprintf(lattr, "l%s", attr_list[i]);
rsprintf("<td nowrap class=\"%s\">", class_name); rsprintf("<td nowrap class=\"%s\">", class_name);
@ -11638,7 +11639,7 @@ BOOL first;
if (comment[0]) if (comment[0])
rsprintf("<img src=\"icons/%s\" alt=\"%s\">", attrib[i], comment); rsprintf("<img src=\"icons/%s\" alt=\"%s\">", attrib[i], comment);
else else
rsprintf("<img src=\"icons/%s\">", attrib[i]); rsprintf("<img src=\"icons/%s\" alt=\"%s\">", attrib[i], attrib[i]);
} }
rsprintf("&nbsp</td>\n"); rsprintf("&nbsp</td>\n");
} }
@ -11672,9 +11673,11 @@ BOOL first;
} }
if (i == lbs->n_attr-1 || (format_flags[i+1] & AFF_SAME_LINE) == 0) if (i == lbs->n_attr-1 || (format_flags[i+1] & AFF_SAME_LINE) == 0)
rsprintf("</tr></table>\n"); rsprintf("</tr></table></td></tr>\n");
} }
rsputs("</table><!-- listframe -->\n");
rsputs("</td></tr>\n"); rsputs("</td></tr>\n");
/*---- message text ----*/ /*---- message text ----*/
@ -11799,8 +11802,8 @@ BOOL first;
} }
} }
/* overall table */ /* overall table (class "frame" from show_standard_header) */
rsprintf("</table>\n"); rsprintf("\r\n</table><!-- show_standard_title -->\r\n");
if (getcfg(lbs->name, "bottom text", str)) if (getcfg(lbs->name, "bottom text", str))
{ {
@ -12085,7 +12088,7 @@ int i, n;
show_html_header(NULL, FALSE, "ELOG error"); show_html_header(NULL, FALSE, "ELOG error");
rsprintf("<body><center>\n"); rsprintf("<body><center>\n");
rsprintf("<table class=\"dlgframe\" width=50%% cellpadding=1 cellspacing=0>"); rsprintf("<table class=\"dlgframe\" width=\"50%%\" cellpadding=1 cellspacing=0>");
sprintf(str, loc("User <i>\"%s\"</i> has no access to logbook <i>\"%s\"</i>"), getparam("iusr"), lbs->name); sprintf(str, loc("User <i>\"%s\"</i> has no access to logbook <i>\"%s\"</i>"), getparam("iusr"), lbs->name);
rsprintf("<tr><td class=\"errormsg\">%s</td></tr>\n", str); rsprintf("<tr><td class=\"errormsg\">%s</td></tr>\n", str);