diff --git a/elogd.c b/elogd.c index 11941627..943fa75d 100755 --- a/elogd.c +++ b/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 2.137 2003/01/30 08:42:02 midas + More CSS stuff + Revision 2.136 2003/01/29 16:34:35 midas More CSS stuff @@ -4875,7 +4878,7 @@ time_t now; } /* display text box */ - rsprintf("%s%s:", attr_list[index], star); + rsprintf("%s%s:", attr_list[index], star); /* if attribute cannot be changed, just display text */ if ((attr_flags[index] & AF_LOCKED) || @@ -5038,7 +5041,7 @@ time_t now; if (getcfg(lbs->name, "Message height", str)) height = atoi(str); - rsprintf("\n"); + rsprintf("\n"); if (getcfg(lbs->name, "Message comment", comment) && !bedit && !message_id) { @@ -5225,24 +5228,24 @@ time_t now; { if (bedit) { - rsprintf("%s.
\n", - gt("Categories bgcolor1"), loc("If no attachments are resubmitted, the original ones are kept")); + rsprintf("%s.
\n", + loc("If no attachments are resubmitted, the original ones are kept")); rsprintf("%s.\n", loc("To delete an old attachment, enter <delete> in the new attachment field")); for (i=0 ; i%s %d:
%s %d:", - gt("Categories bgcolor1"), loc("Original attachment"), i+1, loc("New attachment"), i+1); + rsprintf("%s %d:
%s %d:", + loc("Original attachment"), i+1, loc("New attachment"), i+1); - rsprintf("%s
", gt("Categories bgcolor2"), att[i]+14); + rsprintf("%s
", att[i]+14); rsprintf("\n", i+1); } else - rsprintf("%s %d:\n", - gt("Categories bgcolor1"), loc("Attachment"), i+1, gt("Categories bgcolor2"), i+1); + rsprintf("%s %d:\n", + loc("Attachment"), i+1, i+1); } } @@ -5250,8 +5253,8 @@ time_t now; { /* attachment */ for (i=0 ; i%s %d:\n", - gt("Categories bgcolor1"), loc("Attachment"), i+1, gt("Categories bgcolor2"), i+1); + rsprintf("%s %d:\n", + loc("Attachment"), i+1, i+1); } } @@ -5259,14 +5262,10 @@ time_t now; /*---- menu buttons again ----*/ - rsprintf("\n", - gt("Menu1 cellpadding"), gt("Frame color")); - - rsprintf("
\n", gt("Menu1 Align"), gt("Menu1 BGColor")); - + rsprintf("
\n"); rsprintf("\n", loc("Submit")); rsprintf("\n", loc("Back")); - rsprintf("
\n\n"); + rsprintf("\n\n"); rsprintf("\n"); rsprintf("\r\n"); @@ -5953,7 +5952,6 @@ int i; rsprintf("\n\n"); - /* table for two-column items */ rsprintf(""); rsprintf("\n"); @@ -5964,7 +5962,7 @@ int i; strstr(str, getparam("unm")) != 0) { rsprintf("\n"); - rsprintf("\n", loc("Select user")); + rsprintf("\n", loc("Select user")); rsprintf("\n", str); rsprintf("\n", loc("Full name")); - rsprintf("\n", - gt("Categories bgcolor2"), full_name); + rsprintf("\n", + full_name); rsprintf("\n"); rsprintf("\n\n"); - /* overall table for message giving blue frame */ - rsprintf("
%s:
%s:
%s:
Email:    \n", @@ -6054,32 +6052,30 @@ void show_new_user_page(LOGBOOK *lbs) rsprintf("\n", loc("Cancel")); rsprintf("
\n", - gt("Categories border"), gt("Categories cellpadding"), gt("Frame color")); + /* table for two-column items */ + rsprintf("\n"); @@ -7315,7 +7311,7 @@ int current_year, current_month, current_day, printable, n_logbook, n_display char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], disp_attr[MAX_N_ATTR+4][NAME_LENGTH], list[10000], text[TEXT_SIZE], text1[TEXT_SIZE], text2[TEXT_SIZE], in_reply_to[80], reply_to[256], attachment[MAX_ATTACHMENTS][256], encoding[80]; -char str[256], col[80], ref[256], img[80]; +char str[256], ref[256], img[80]; char mode[80]; char menu_str[1000], menu_item[MAX_N_LIST][NAME_LENGTH]; char *p , *pt, *pt1, *pt2; @@ -7461,9 +7457,8 @@ LOGBOOK *lbs_cur; y1 = atoi(getparam("y1")); if (y1 < 1990 || y1 > current_year) { - rsprintf("
"); + rsprintf("\n"); /*---- entry form ----*/ - rsprintf("\n", gt("Categories bgcolor1"), loc("Login name")); - rsprintf("\n", - gt("Categories bgcolor2"), loc("name may not contain blanks")); + rsprintf("\n", loc("Login name")); + rsprintf("\n", + loc("name may not contain blanks")); - rsprintf("\n", gt("Categories bgcolor1"), loc("Full name")); - rsprintf("\n", - gt("Categories bgcolor2")); + rsprintf("\n", loc("Full name")); + rsprintf("\n"); - rsprintf("\n", gt("Categories bgcolor1")); - rsprintf("\n", - gt("Categories bgcolor2")); + rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", gt("Categories bgcolor1"), loc("Automatic email notifications")); - rsprintf("\n", gt("Categories bgcolor2")); + rsprintf("\n"); - rsprintf("\n", gt("Categories bgcolor1"), loc("Password")); - rsprintf("\n", loc("Password")); + rsprintf("\n", gt("Categories bgcolor1"), loc("Retype password")); - rsprintf("\n", loc("Retype password")); + rsprintf("
%s: (%s)
%s: (%s)
%s:
%s:
Email:
Email:
%s:
%s: \n", loc("Automatic email notifications")); + rsprintf("
%s:\n", gt("Categories bgcolor2")); + rsprintf("
%s:\n"); - rsprintf("
%s:\n", gt("Categories bgcolor2")); + rsprintf("
%s:\n"); rsprintf("
\r\n"); - rsprintf("

Error: year %s out of range

", getparam("y1")); - rsprintf("\r\n"); + sprintf(str, "Error: Year %s out of range", getparam("y1")); + show_error(str); return; } @@ -7508,9 +7503,9 @@ LOGBOOK *lbs_cur; if (y2 < 1990 || y2 > current_year) { - rsprintf("
\r\n"); - rsprintf("

Error: year %d out of range

", y2); - rsprintf("\r\n"); + sprintf(date, "%d", y2); + sprintf(str, "Error: Year %s out of range", date); + show_error(str); return; } @@ -7571,9 +7566,7 @@ LOGBOOK *lbs_cur; if (ltime_start && ltime_end && ltime_start > ltime_end) { - rsprintf("\r\n"); - rsprintf("

Error: start time after end time

", y2); - rsprintf("\r\n"); + show_error(loc("Error: start date after end date")); return; } @@ -8038,12 +8031,14 @@ LOGBOOK *lbs_cur; if (disp_filter) { - rsprintf("\n"); - rsprintf("\n"); + rsprintf("\n\n"); @@ -8110,8 +8108,6 @@ LOGBOOK *lbs_cur; /* overall listing table */ rsprintf("
\n"); + rsprintf("\n"); if (*getparam("m1") || *getparam("y1") || *getparam("d1")) - rsprintf("", - gt("Categories bgcolor1"), loc("Start date"), gt("Categories bgcolor2"), mname[m1-1], d1, y1); + { + rsprintf("", loc("Start date")); + rsprintf("", mname[m1-1], d1, y1); + } if (*getparam("m2") || *getparam("y2") || *getparam("d2")) { @@ -8060,23 +8055,26 @@ LOGBOOK *lbs_cur; ltime -= 3600*24; memcpy(&tms, localtime(<ime), sizeof(struct tm)); - rsprintf("", - gt("Categories bgcolor1"), loc("End date"), gt("Categories bgcolor2"), + rsprintf("", loc("End date")); + rsprintf("", mname[tms.tm_mon], tms.tm_mday, tms.tm_year + 1900); } for (i=0 ; in_attr ; i++) { if (*getparam(attr_list[i])) - rsprintf("", - gt("Categories bgcolor1"), attr_list[i], gt("Categories bgcolor2"), getparam(attr_list[i])); + { + rsprintf("", + attr_list[i]); + rsprintf("", getparam(attr_list[i])); + } } if (*getparam("subtext")) { - rsprintf("", gt("Categories bgcolor1"), loc("Text")); - rsprintf("", - gt("Categories bgcolor2"), getparam("subtext")); + rsprintf("", loc("Text")); + rsprintf("", + getparam("subtext")); } rsprintf("
%s:%s %d, %d
%s:%s %d, %d
%s:%s %d, %d
%s:%s %d, %d
%s:%s
%s:%s
%s:%s
%s:%s
\n"); - strcpy(col, gt("Categories bgcolor1")); - size = printable ? 2 : 3; if (getcfg(lbs->name, "Display search", list)) @@ -8146,7 +8142,7 @@ LOGBOOK *lbs_cur; /* empty title for selection box */ if (atoi(getparam("select")) == 1) - rsprintf("\n", col); + rsprintf("\n"); for (i=0 ; iname, "Enable browsing", str) || atoi(str) == 1) { - rsprintf("\n"); } diff --git a/eloglang.german b/eloglang.german index 3c5919dd..652696af 100755 --- a/eloglang.german +++ b/eloglang.german @@ -222,4 +222,5 @@ Threaded = Antwortkette ELOG Entries = ELOG Einträge Filters = Filter Mode = Modus -Options = Optionen \ No newline at end of file +Options = Optionen +Error: start date after end date = Fehler: Anfangsdatum nach Enddatum
\n"); + rsprintf("\n"); - if (atoi(gt("Menu2 use images")) == 1) - { - rsprintf("\n", - loc("First entry")); - rsprintf("\n", - loc("Previous entry")); - rsprintf("\n", - loc("Next entry")); - rsprintf("\n", - loc("Last entry")); - } - else - { - rsprintf("\n", loc("First")); - rsprintf("\n", loc("Previous")); - rsprintf("\n", loc("Next")); - rsprintf("\n", loc("Last")); - } + rsprintf("\n", + loc("First entry")); + rsprintf("\n", + loc("Previous entry")); + rsprintf("\n", + loc("Next entry")); + rsprintf("\n", + loc("Last entry")); rsprintf("