Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with message comment

Browse Source
This commit is contained in:
Stefan Ritt 2015-04-01 16:39:31 +02:00
parent 3d5f1cbc12
commit abc1df802b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/elogd.c
View File

@ -10234,9 +10234,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("function resize_textarea()\n"); rsprintf("function resize_textarea()\n");
rsprintf("{\n"); rsprintf("{\n");
rsprintf(" p = $id('TextParent');\n"); rsprintf(" p = $id('TextParent');\n");
rsprintf(" t = p.offsetTop;\n"); rsprintf(" t = p.getBoundingClientRect().top;\n");
rsprintf(" while (p = p.offsetParent)\n");
rsprintf(" t += p.offsetTop;\n");
rsprintf(" if (window.innerHeight) // netscape\n"); rsprintf(" if (window.innerHeight) // netscape\n");
rsprintf(" height = window.innerHeight - t - 135 - 50 - 20;\n"); rsprintf(" height = window.innerHeight - t - 135 - 50 - 20;\n");
rsprintf(" else // IE\n"); rsprintf(" else // IE\n");
@ -11243,6 +11241,14 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("</td></tr>\n"); rsprintf("</td></tr>\n");
} }
if (getcfg(lbs->name, "Message comment", comment, sizeof(comment)) && !message_id) {
rsprintf("<tr><td colspan=2 class=\"attribvalue\">%s</td></tr>\n", comment);
}
if (getcfg(lbs->name, "Reply comment", comment, sizeof(comment)) && breply) {
rsprintf("<tr><td colspan=2 class=\"attribvalue\">%s</td></tr>\n", comment);
}
rsprintf("<tr><td colspan=2 width=\"100%%\" class=\"attribvalue\" id=\"TextParent\" style=\"padding:0\">\n"); rsprintf("<tr><td colspan=2 width=\"100%%\" class=\"attribvalue\" id=\"TextParent\" style=\"padding:0\">\n");
/* set textarea width */ /* set textarea width */
@ -11302,16 +11308,6 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
} }
if (getcfg(lbs->name, "Message comment", comment, sizeof(comment)) && !message_id) {
rsputs(comment);
rsputs("<br>\n");
}
if (getcfg(lbs->name, "Reply comment", comment, sizeof(comment)) && breply) {
rsputs(comment);
rsputs("<br>\n");
}
preset_text = getcfg(lbs->name, "Preset text", str, sizeof(str)); preset_text = getcfg(lbs->name, "Preset text", str, sizeof(str));
if (preset_text) { if (preset_text) {