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

Use again common table for attribute display

Browse Source 
SVN revision: 1075
This commit is contained in:
Stefan Ritt 2004-09-15 05:24:31 +00:00
parent e9579c00b2
commit 807ab54ad2
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
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.471 2004/09/15 05:24:31 midas
Use again common table for attribute display
Revision 1.470 2004/09/15 02:05:28 midas Revision 1.470 2004/09/15 02:05:28 midas
Only show first 1000 lines of inline ASCII attachments Only show first 1000 lines of inline ASCII attachments
@ -6478,8 +6481,8 @@ void show_bottom_text(LOGBOOK * lbs)
} else } else
/* add little logo */ /* add little logo */
rsprintf rsprintf
("<center><a class=\"bottomlink\" href=\"http://midas.psi.ch/elog/\">ELOG V%s</a></center>", ("<center><a class=\"bottomlink\" title=\"%s\" href=\"http://midas.psi.ch/elog/\">ELOG V%s</a></center>",
VERSION); loc("Goto ELOG home page"), VERSION);
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -16750,7 +16753,7 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
lbk_list[MAX_N_LIST][NAME_LENGTH], comment[256], class_name[80], class_value[80], lbk_list[MAX_N_LIST][NAME_LENGTH], comment[256], class_name[80], class_value[80],
fl[8][NAME_LENGTH]; fl[8][NAME_LENGTH];
FILE *f; FILE *f;
BOOL first, show_text, display_inline; BOOL first, show_text, display_inline, subtable;
struct tm *pts; struct tm *pts;
time_t ltime; time_t ltime;
@ -17213,6 +17216,10 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
} }
} }
/* 2 column table for all attributes */
rsprintf("<tr><td><table width=\"100%%\" cellpadding=0 cellspacing=0>");
subtable = 0;
for (i = 0; i < lbs->n_attr; i++) { for (i = 0; i < lbs->n_attr; i++) {
if (getcfg(lbs->name, "Password file", str, sizeof(str)) && if (getcfg(lbs->name, "Password file", str, sizeof(str)) &&
@ -17239,8 +17246,16 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
strlcpy(class_value, fl[2], sizeof(class_value)); strlcpy(class_value, fl[2], sizeof(class_value));
} }
if ((format_flags[i] & AFF_SAME_LINE) == 0) if (format_flags[i] & AFF_SAME_LINE)
rsprintf("<tr><td><table width=\"100%%\" cellpadding=0 cellspacing=0><tr>"); /* if attribute on same line, do nothing */
rsprintf("");
else if (i < lbs->n_attr-1 && (format_flags[i+1] & AFF_SAME_LINE)) {
/* if next attribute on same line, start a new subtable */
rsprintf("<tr><td colspan=2><table width=\"100%%\" cellpadding=0 cellspacing=0><tr>");
subtable = 1;
} else
/* for normal attribute, start new row */
rsprintf("<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);
@ -17340,9 +17355,26 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
rsprintf("&nbsp</td>\n"); rsprintf("&nbsp</td>\n");
} }
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></td></tr>\n"); /* if next attribute not on same line, close row or subtable */
if (subtable) {
rsprintf("</table></td></tr>\n");
subtable = 0;
} else
rsprintf("</tr>");
}
/* if last attribute, close row or subtable */
if (i == lbs->n_attr - 1) {
if (subtable) {
rsprintf("</table></td></tr>\n");
subtable = 0;
} else
rsprintf("</tr>");
}
} }
rsputs("</table></td></tr>\n"); // 2 column table
rsputs("</table><!-- listframe -->\n"); rsputs("</table><!-- listframe -->\n");