From 94c034a29d0bd6a4ea3c6d3efa28f9d2fedcb379 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Sat, 23 Jul 2005 16:40:20 +0000 Subject: [PATCH] Added even more CR's SVN revision: 1443 --- src/elogd.c | 69 +++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 2d2a160a..710ce89d 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.716 2005/07/23 16:40:20 ritt + Added even more CR's + Revision 1.715 2005/07/23 16:30:42 ritt Fixed {n} display with ROptions @@ -15028,24 +15031,24 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, } if (highlight != message_id) - rsprintf("", ref); + rsprintf("\n", ref); if (attr_icon[0]) - rsprintf("\"%s\" ", attr_icon, attr_icon, attr_icon); + rsprintf("\n\"%s\"\n ", attr_icon, attr_icon, attr_icon); else { /* if top level only, display reply icon if message has a reply */ if (getcfg(lbs->name, "Top level only", str, sizeof(str)) && atoi(str) == 1 && reply_to[0]) - rsprintf("\"%s\" ", loc("Reply"), loc("Reply")); + rsprintf("\n\"%s\"\n ", loc("Reply"), loc("Reply")); else { /* display standard icons */ if (level == 0) - rsprintf("\"%s\" ", loc("Entry"), loc("Entry")); + rsprintf("\n\"%s\"\n ", loc("Entry"), loc("Entry")); else - rsprintf("\"%s\" ", loc("Reply"), loc("Reply")); + rsprintf("\n\"%s\"\n ", loc("Reply"), loc("Reply")); } } if (highlight != message_id) - rsprintf(""); + rsprintf("\n"); j = build_subst_list(lbs, (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, attrib, TRUE); sprintf(str, "%d", message_id); @@ -15056,9 +15059,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, strsubst(display, sizeof(display), (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, j); if (highlight != message_id) - rsprintf("", ref); + rsprintf("\n\n", ref); else - rsprintf(""); + rsprintf("\n"); if (is_html(display)) rsputs(display); @@ -15066,9 +15069,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, rsputs2(display); if (highlight != message_id) - rsprintf("", ref); + rsprintf("\n", ref); else - rsprintf(""); + rsprintf("\n"); } else { /* show select box */ if (select && !strieq(mode, "Threaded")) { @@ -15084,9 +15087,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (strieq(mode, "Threaded")) { if (highlight != message_id) - rsprintf("", ref); + rsprintf("\n\n", ref); else - rsprintf(""); + rsprintf("\n"); } skip_comma = TRUE; @@ -15094,16 +15097,16 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (strieq(disp_attr[index], loc("ID"))) { if (strieq(mode, "Threaded")) { if (level == 0) - rsprintf("\"%s\" ", loc("Entry"), loc("Entry")); + rsprintf("\n\"%s\" ", loc("Entry"), loc("Entry")); else - rsprintf("\"%s\" ", loc("Reply"), loc("Reply")); + rsprintf("\n\"%s\" ", loc("Reply"), loc("Reply")); } else { rsprintf("", sclass); if (locked_by && locked_by[0]) { sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\"%s\" ", str, str); + rsprintf("\n\"%s\" ", str, str); } if (getcfg(lbs->name, "ID display", display, sizeof(display))) { @@ -15121,7 +15124,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, } else sprintf(display, "%d", message_id); - rsprintf("  %s  \n", ref, display); + rsprintf("\n  %s  \n", ref, display); rsprintf("\n"); } } @@ -15135,24 +15138,24 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, rsprintf(", %s", lbs->name); } else { if (disp_attr_link == NULL || disp_attr_link[index]) - rsprintf("%s\n", sclass, nowrap, ref, + rsprintf("\n%s\n", sclass, nowrap, ref, lbs->name); else - rsprintf("%s\n", sclass, nowrap, lbs->name); + rsprintf("\n%s\n", sclass, nowrap, lbs->name); } } if (strieq(disp_attr[index], loc("Edit"))) { if (!strieq(mode, "Threaded")) { - rsprintf("", sclass, nowrap, ref, loc("Edit")); - rsprintf("\"%s\"\n", loc("Edit entry"), loc("Edit entry")); + rsprintf("\n", sclass, nowrap, ref, loc("Edit")); + rsprintf("\n\"%s\"\n", loc("Edit entry"), loc("Edit entry")); } } if (strieq(disp_attr[index], loc("Delete"))) { if (!strieq(mode, "Threaded")) { - rsprintf("", sclass, nowrap, ref, loc("Delete")); - rsprintf("\"%s\"\n", loc("Delete entry"), loc("Delte entry")); + rsprintf("\n", sclass, nowrap, ref, loc("Delete")); + rsprintf("\n\"%s\"\n", loc("Delete entry"), loc("Delte entry")); } } @@ -15172,9 +15175,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, rsprintf(", %s", str); } else { if (disp_attr_link == NULL || disp_attr_link[index]) - rsprintf("%s\n", sclass, nowrap, ref, str); + rsprintf("\n%s\n", sclass, nowrap, ref, str); else - rsprintf("%s\n", sclass, nowrap, str); + rsprintf("\n%s\n", sclass, nowrap, str); } } @@ -15200,7 +15203,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, else if (attr_flags[i] & AF_ICON) { if (attrib[i][0]) - rsprintf(" \"%s\" ", attrib[i], + rsprintf(" \n\"%s\" ", attrib[i], attrib[i], attrib[i]); } @@ -15220,9 +15223,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, } else { if (strieq(attr_options[i][0], "boolean")) { if (atoi(attrib[i]) == 1) - rsprintf("\n", sclass); + rsprintf("\n\n", sclass); else - rsprintf("\n", sclass); + rsprintf("\n\n", sclass); } else if (attr_flags[i] & AF_DATE) { @@ -15238,9 +15241,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, my_strftime(str, sizeof(str), format, pts); if (disp_attr_link == NULL || disp_attr_link[index]) - rsprintf("%s\n", sclass, ref, str); + rsprintf("\n%s\n", sclass, ref, str); else - rsprintf("%s\n", sclass, str); + rsprintf("\n%s\n", sclass, str); } else if (attr_flags[i] & AF_DATETIME) { @@ -15256,15 +15259,15 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, my_strftime(str, sizeof(str), format, pts); if (disp_attr_link == NULL || disp_attr_link[index]) - rsprintf("%s\n", sclass, ref, str); + rsprintf("\n%s\n", sclass, ref, str); else - rsprintf("%s\n", sclass, str); + rsprintf("\n%s\n", sclass, str); } else if (attr_flags[i] & AF_ICON) { rsprintf("", sclass); if (attrib[i][0]) - rsprintf("\"%s\"", attrib[i], attrib[i], attrib[i]); + rsprintf("\n\"%s\"", attrib[i], attrib[i], attrib[i]); rsprintf(" "); } @@ -15365,13 +15368,11 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, rsputs(text); else rsputs(" "); - } rsprintf("\n"); } - if (strieq(mode, "Summary") && n_line > 0 && show_text) { rsprintf(""); for (i = i_line = 0; i < (int) sizeof(str) - 1; i++) {