From c77900f83a8fb36b2c0f4459056cb891f4b08b8d Mon Sep 17 00:00:00 2001 From: the_mgt Date: Fri, 1 Jul 2011 03:30:54 +0200 Subject: [PATCH] Adapted c-files to new iconset "Essen" Moved some additional icons from static/ to static/icons The goal is, that we can remove all stray image files from static/ after the transition Only relevant .gif in static that is left should be citadel-logo.gif. --- webcit/addressbook_popup.c | 4 ++-- webcit/buildpackages | 2 +- webcit/calendar.c | 10 +++++----- webcit/calendar_view.c | 12 ++++++------ webcit/downloads.c | 4 ++-- webcit/event.c | 2 +- webcit/openid.c | 2 +- webcit/roomchat.c | 2 +- webcit/sieve.c | 12 ++++++------ webcit/smtpqueue.c | 2 +- webcit/static/{ => icons}/blank.gif | Bin webcit/static/{ => icons}/delete.gif | Bin webcit/static/{ => icons}/down_pointer.gif | Bin webcit/static/{ => icons}/error.gif | Bin webcit/static/{ => icons}/sort_none.gif | Bin webcit/static/{ => icons}/up_pointer.gif | Bin webcit/subst.c | 6 +++--- webcit/summary.c | 2 +- webcit/userlist.c | 4 ++-- webcit/vcard_edit.c | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) rename webcit/static/{ => icons}/blank.gif (100%) rename webcit/static/{ => icons}/delete.gif (100%) rename webcit/static/{ => icons}/down_pointer.gif (100%) rename webcit/static/{ => icons}/error.gif (100%) rename webcit/static/{ => icons}/sort_none.gif (100%) rename webcit/static/{ => icons}/up_pointer.gif (100%) diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index 0b789f74f..f8491fed1 100644 --- a/webcit/addressbook_popup.c +++ b/webcit/addressbook_popup.c @@ -53,7 +53,7 @@ void display_address_book_middle_div(void) { DefAddrBook = get_room_pref("defaddrbook"); wc_printf(""); - wc_printf(""); + wc_printf(""); wc_printf(""); wc_printf("
"); wc_printf("
" @@ -99,7 +99,7 @@ void display_address_book_middle_div(void) { wc_printf("
"); + ">"); wc_printf("
"); wc_printf("", diff --git a/webcit/buildpackages b/webcit/buildpackages index 8a066da6c..7d2e2a2af 100755 --- a/webcit/buildpackages +++ b/webcit/buildpackages @@ -60,7 +60,7 @@ case $1 in ;; sourcedist) if test "$2" == "dfsg"; then - NONDFSG=-"-exclude static/openid-small.gif" + NONDFSG=-"-exclude static/icons/openid-small.gif" fi cd ..; tar --exclude .svn --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/ ;; diff --git a/webcit/calendar.c b/webcit/calendar.c index 98fc8260c..be32db144 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -75,7 +75,7 @@ void cal_process_object(StrBuf *Target, the_method = icalproperty_get_method(method); StrBufAppendPrintf(Target, "
", divname); - StrBufAppendPrintf(Target, ""); + StrBufAppendPrintf(Target, ""); StrBufAppendPrintf(Target, ""); switch(the_method) { case ICAL_METHOD_REQUEST: @@ -329,7 +329,7 @@ void respond_to_request(void) serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wc_printf(""); + wc_printf(""); if (!strcasecmp(bstr("sc"), "accept")) { wc_printf(_("You have accepted this meeting invitation. " "It has been entered into your calendar.") @@ -347,7 +347,7 @@ void respond_to_request(void) wc_printf(_("A reply has been sent to the meeting organizer.")); wc_printf(""); } else { - wc_printf(""); + wc_printf(""); wc_printf("%s\n", &buf[4]); wc_printf(""); } @@ -374,7 +374,7 @@ void handle_rsvp(void) serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wc_printf(""); + wc_printf(""); if (!strcasecmp(bstr("sc"), "update")) { /* Translators: RSVP aka Répondez s'il-vous-plaît Is the term that the recipient of an ical-invitation should please @@ -387,7 +387,7 @@ void handle_rsvp(void) } wc_printf(""); } else { - wc_printf(" %s\n", &buf[4]); + wc_printf(" %s\n", &buf[4]); wc_printf(""); } diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index c7af4b607..1bdcf608e 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -586,7 +586,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"%s\"\n", _("previous")); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); wc_printf("  " @@ -598,7 +598,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"%s\"\n", _("next")); + wc_printf("\"%s\"\n", _("next")); wc_printf("\n"); @@ -722,7 +722,7 @@ void calendar_brief_month_view(int year, int month, int day) { localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"%s\"\n", _("previous")); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(month_label, sizeof month_label, "%B", &tm); wc_printf("  " @@ -734,7 +734,7 @@ void calendar_brief_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\"%s\"\n", _("next")); + wc_printf("\"%s\"\n", _("next")); wc_printf("\n"); @@ -1284,7 +1284,7 @@ void calendar_day_view(int year, int month, int day) { wc_printf(""); wc_printf("", yesterday.year, yesterday.month, yesterday.day); - wc_printf("\"previous\""); + wc_printf("\"previous\""); wc_printf(""); wc_strftime(d_str, sizeof d_str, @@ -1302,7 +1302,7 @@ void calendar_day_view(int year, int month, int day) { wc_printf(""); wc_printf("", tomorrow.year, tomorrow.month, tomorrow.day); - wc_printf("\"%s\"\n", _("next")); wc_printf(""); diff --git a/webcit/downloads.c b/webcit/downloads.c index b1ece229c..2e7489f9e 100644 --- a/webcit/downloads.c +++ b/webcit/downloads.c @@ -246,7 +246,7 @@ void display_mime_icon(void) FileName = GetIconFilename(MimeType, tlen); if (FileName == NULL) - snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/diskette_24x.gif"); + snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/icons/essen/16x16/file.png"); else snprintf (FileBuf, SIZ, "%s%s", static_dirs[3], FileName); output_static(FileBuf); @@ -410,7 +410,7 @@ void output_image(void) * Instead of an ugly 404, send a 1x1 transparent GIF * when there's no such image on the server. */ - StrBufPrintf (Buf, "%s%s", static_dirs[0], "/blank.gif"); + StrBufPrintf (Buf, "%s%s", static_dirs[0], "/icons/blank.gif"); output_static(ChrPtr(Buf)); FreeStrBuf(&Buf); } diff --git a/webcit/event.c b/webcit/event.c index a7107bde7..40addb0e4 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -445,7 +445,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, wc_printf( " " - "" + "" "", _("Attendees"), _("Contacts") diff --git a/webcit/openid.c b/webcit/openid.c index 5a6c8e9f5..8df6d3c36 100644 --- a/webcit/openid.c +++ b/webcit/openid.c @@ -43,7 +43,7 @@ void display_openids(void) if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { bg = 1 - bg; wc_printf("", (bg ? "even" : "odd")); - wc_printf(""); + wc_printf(""); escputs(buf); wc_printf(""); wc_printf(""); } - wc_printf(""); + wc_printf(""); escputs(buf); wc_printf("
\n"); } diff --git a/webcit/sieve.c b/webcit/sieve.c index 0db8f5ae0..635b2fc53 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -31,7 +31,7 @@ void display_no_sieve(void) { output_headers(1, 1, 2, 0, 0, 0); wc_printf("
\n"); - wc_printf(""); + wc_printf(""); wc_printf("

"); wc_printf(_("View/edit server-side mail filters")); wc_printf("

\n"); @@ -115,7 +115,7 @@ void display_sieve(void) ); wc_printf("
\n"); - wc_printf(""); + wc_printf(""); wc_printf("

"); wc_printf(_("View/edit server-side mail filters")); wc_printf("

\n"); @@ -656,7 +656,7 @@ void display_add_remove_scripts(char *message) output_headers(1, 1, 2, 0, 0, 0); wc_printf("
\n"); - wc_printf(""); + wc_printf(""); wc_printf(_("Add or delete scripts")); wc_printf("\n"); wc_printf("
\n"); @@ -985,17 +985,17 @@ void display_rules_editor_inner_div(void) { wc_printf("
"); if (i>0) wc_printf("" - "", i-1, i, _("Move rule up") ); wc_printf("" - "", i, i+1, i, _("Move rule down") ); wc_printf("" - "", i, i, _("Delete rule") ); diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c index 6ee2db9ef..fd5c02abd 100644 --- a/webcit/smtpqueue.c +++ b/webcit/smtpqueue.c @@ -243,7 +243,7 @@ void display_smtpqueue(void) "\n"); wc_printf("
" - "
" + "
" "
" "
" "%s" diff --git a/webcit/static/blank.gif b/webcit/static/icons/blank.gif similarity index 100% rename from webcit/static/blank.gif rename to webcit/static/icons/blank.gif diff --git a/webcit/static/delete.gif b/webcit/static/icons/delete.gif similarity index 100% rename from webcit/static/delete.gif rename to webcit/static/icons/delete.gif diff --git a/webcit/static/down_pointer.gif b/webcit/static/icons/down_pointer.gif similarity index 100% rename from webcit/static/down_pointer.gif rename to webcit/static/icons/down_pointer.gif diff --git a/webcit/static/error.gif b/webcit/static/icons/error.gif similarity index 100% rename from webcit/static/error.gif rename to webcit/static/icons/error.gif diff --git a/webcit/static/sort_none.gif b/webcit/static/icons/sort_none.gif similarity index 100% rename from webcit/static/sort_none.gif rename to webcit/static/icons/sort_none.gif diff --git a/webcit/static/up_pointer.gif b/webcit/static/icons/up_pointer.gif similarity index 100% rename from webcit/static/up_pointer.gif rename to webcit/static/icons/up_pointer.gif diff --git a/webcit/subst.c b/webcit/subst.c index 49723377a..354b51601 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -2433,9 +2433,9 @@ enum { }; ConstStr SortIcons[] = { - {HKEY("static/sort_none.gif")}, - {HKEY("static/up_pointer.gif")}, - {HKEY("static/down_pointer.gif")}, + {HKEY("static/icons/sort_none.gif")}, + {HKEY("static/icons/up_pointer.gif")}, + {HKEY("static/icons/down_pointer.gif")}, }; ConstStr SortNextOrder[] = { diff --git a/webcit/summary.c b/webcit/summary.c index 1e0d8e160..ed7bbef47 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -286,7 +286,7 @@ void summary(void) { output_headers(1, 1, 2, 0, 0, 0); wc_printf("
\n"); wc_printf(""); - wc_printf(""); + wc_printf(""); wc_printf("" "

"); snprintf(title, sizeof title, _("Summary page for %s"), ( (WC->logged_in) ? ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode)) diff --git a/webcit/userlist.c b/webcit/userlist.c index 845978a74..b9c08818a 100644 --- a/webcit/userlist.c +++ b/webcit/userlist.c @@ -113,7 +113,7 @@ void showuser(void) output_headers(1, 1, 2, 0, 0, 0); wc_printf("

" - "" + "" ""); StrEscAppend(Target, NULL, fullname, 0, 0); StrBufAppendPrintf(Target, ""); -- 2.30.2