From b20bdbae286b8727ed0d79cdfe05e2607821969d Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 11 Jul 2005 10:28:04 +0000 Subject: [PATCH] Added 'title' to all icons for FireFox SVN revision: 1427 --- src/elogd.c | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index ec42ec61..19c7cb70 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.702 2005/07/11 10:28:04 ritt + Added 'title' to all icons for FireFox + Revision 1.701 2005/07/08 20:18:04 ritt Treat attributes with as HTML @@ -7763,7 +7766,7 @@ void show_standard_title(char *logbook, char *text, int printable) if (getcfg(logbook, "Title image", str, sizeof(str))) rsprintf(str); else - rsprintf("\"ELOG"); + rsprintf("\"ELOG"); if (getcfg(logbook, "Title image URL", str, sizeof(str))) rsprintf("\n"); @@ -9762,11 +9765,11 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL getcfg(lbs->name, str, comment, sizeof(comment)); if (comment[0]) - rsprintf("\"%s\"\n", - attr_options[index][i], comment); + rsprintf("\"%s\"\n", + attr_options[index][i], comment, comment); else - rsprintf("\"%s\"\n", - attr_options[index][i], attr_options[index][i]); + rsprintf("\"%s\"\n", + attr_options[index][i], attr_options[index][i], attr_options[index][i]); rsprintf("\n"); if ((format_flags[index] & AFF_MULTI_LINE) && attr_options[index][i+1][0]) { @@ -10595,7 +10598,7 @@ void show_find_form(LOGBOOK * lbs) if (comment[0] == 0) strcpy(comment, option); - rsprintf("\"%s\"\n", option, comment); + rsprintf("\"%s\"\n", option, comment, comment); } } @@ -14917,7 +14920,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (locked_by && locked_by[0]) { sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\"%s\" ", str); + rsprintf("\"%s\" ", str, str); } /* show select box */ @@ -14953,17 +14956,17 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, rsprintf("", ref); if (attr_icon[0]) - rsprintf("\"%s\" ", attr_icon, attr_icon); + rsprintf("\"%s\" ", 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")); + rsprintf("\"%s\" ", loc("Reply"), loc("Reply")); else { /* display standard icons */ if (level == 0) - rsprintf("\"%s\" ", loc("Entry")); + rsprintf("\"%s\" ", loc("Entry"), loc("Entry")); else - rsprintf("\"%s\" ", loc("Reply")); + rsprintf("\"%s\" ", loc("Reply"), loc("Reply")); } } if (highlight != message_id) @@ -15016,16 +15019,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")); + rsprintf("\"%s\" ", loc("Entry"), loc("Entry")); else - rsprintf("\"%s\" ", loc("Reply")); + rsprintf("\"%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); + rsprintf("\"%s\" ", str, str); } if (getcfg(lbs->name, "ID display", display, sizeof(display))) { @@ -15067,14 +15070,14 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (strieq(disp_attr[index], loc("Edit"))) { if (!strieq(mode, "Threaded")) { rsprintf("", sclass, nowrap, ref, loc("Edit")); - rsprintf("\"%s\"\n", loc("Edit entry")); + rsprintf("\"%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")); + rsprintf("\"%s\"\n", loc("Delete entry"), loc("Delte entry")); } } @@ -15122,8 +15125,8 @@ 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], - attrib[i]); + rsprintf(" \"%s\" ", attrib[i], + attrib[i], attrib[i]); } else { @@ -15186,7 +15189,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, else if (attr_flags[i] & AF_ICON) { rsprintf("", sclass); if (attrib[i][0]) - rsprintf("\"%s\"", attrib[i], attrib[i]); + rsprintf("\"%s\"", attrib[i], attrib[i], attrib[i]); rsprintf(" "); } @@ -15393,7 +15396,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (show_attachments) { rsprintf("\n", colspan); rsprintf("\n", index + 1, ref); - rsprintf("\"%s\"\n", ref, attachment[index] + 14); + rsprintf("\"%s\"\n", ref, attachment[index] + 14, attachment[index] + 14); rsprintf("\n\n"); } } else { @@ -15404,7 +15407,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, if (show_attachments) { rsprintf(""); rsprintf("", colspan); - rsprintf("\"%s\"", ref, attachment[index] + 14); + rsprintf("\"%s\"", ref, attachment[index] + 14, attachment[index] + 14); rsprintf("\n"); } } else { @@ -17793,9 +17796,9 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf img[0] = 0; if (strcmp(getparam("sort"), disp_attr[i]) == 0) - sprintf(img, "\"%s\"", loc("up")); + sprintf(img, "\"%s\"", loc("up"), loc("up")); else if (strcmp(getparam("rsort"), disp_attr[i]) == 0) - sprintf(img, "\"%s\"", loc("down")); + sprintf(img, "\"%s\"", loc("down"), loc("down")); if (strieq(disp_attr[i], "Edit") || strieq(disp_attr[i], "Delete")) rsprintf("%s\n", disp_attr[i]); @@ -19842,11 +19845,11 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) } strlcat(file_name, "first.png", sizeof(file_name)); if (stat(file_name, &st) >= 0) { - rsprintf("\n", loc("First entry")); - rsprintf("\n", - loc("Previous entry")); - rsprintf("\n", loc("Next entry")); - rsprintf("\n", loc("Last entry")); + rsprintf("\n", loc("First entry"), loc("First entry")); + rsprintf("\n", + loc("Previous entry"), loc("Previous entry")); + rsprintf("\n", loc("Next entry"), loc("Next entry")); + rsprintf("\n", loc("Last entry"), loc("Last entry")); } else { rsprintf("|< \n", message_id, loc("First")); rsprintf("< \n", message_id, loc("Previous")); @@ -19961,8 +19964,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) if (locked_by && locked_by[0]) { sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\"%s\"\n", - loc("stop")); + rsprintf("\"%s\"\n", + loc("stop"), loc("stop")); rsprintf("%s
%s\n", str, loc("You can \"steal\" the lock by editing this entry")); } @@ -20101,7 +20104,7 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) if (*getparam(lattr) == '1') rsprintf(" ", lattr); else - rsprintf(" ", lattr); + rsprintf(" ", lattr); } /* display checkbox for boolean attributes */ @@ -20122,9 +20125,9 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) getcfg(lbs->name, str, comment, sizeof(comment)); if (comment[0]) - rsprintf("\"%s\"", attrib[i], comment); + rsprintf("\"%s\"", attrib[i], comment, comment); else - rsprintf("\"%s\"", attrib[i], attrib[i]); + rsprintf("\"%s\"", attrib[i], attrib[i], attrib[i]); } rsprintf(" \n"); } else if ((attr_flags[i] & AF_MULTI) @@ -20405,12 +20408,12 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) if (file_exist(thumb_name)) { rsprintf("\n"); rsprintf("\n", index + 1, ref); - rsprintf("\"%s\"\n", ref, attachment[index] + 14); + rsprintf("\"%s\"\n", ref, attachment[index] + 14, attachment[index] + 14); rsprintf("\n\n"); } else if (is_image(att)) { rsprintf("\n"); rsprintf("\n", index + 1); - rsprintf("\"%s\"\n", ref, attachment[index] + 14); + rsprintf("\"%s\"\n", ref, attachment[index] + 14, attachment[index] + 14); rsprintf("\n\n"); } else { if (is_ascii(file_name)) { @@ -21648,14 +21651,14 @@ void show_calendar(LOGBOOK * lbs) /* link to previous year */ rsprintf("  "); rsprintf("", index, cur_mon, cur_year - 1); - rsprintf("\"%s\"", loc("Previous Year")); + rsprintf("\"%s\"", loc("Previous Year"), loc("Previous Year")); /* current year */ rsprintf(" %d ", cur_year); /* link to next year */ rsprintf("", index, cur_mon, cur_year + 1); - rsprintf("\"%s\"", loc("Next Year")); + rsprintf("\"%s\"", loc("Next Year"), loc("Next Year")); /* go to first day of month */ ts->tm_mday = 1;