From 64ef1d438d5ee853b598c4e762498e4bc7f1e22f Mon Sep 17 00:00:00 2001 From: the_mgt Date: Sun, 3 Jul 2011 01:28:46 +0200 Subject: [PATCH] Renamed the /icons directory to /webcit_icons because of incompatibility with symlinking to local iconset for mimetypes Also changed the references to reflect the new positions --- webcit/addressbook_popup.c | 4 +- webcit/buildpackages | 2 +- webcit/calendar.c | 10 ++-- webcit/calendar_view.c | 12 ++--- webcit/debian/citadel-webcit.links | 2 +- webcit/downloads.c | 4 +- webcit/event.c | 2 +- webcit/openid.c | 2 +- webcit/roomchat.c | 2 +- webcit/sieve.c | 9 ++-- webcit/smtpqueue.c | 2 +- webcit/static/instant_messenger.html | 2 +- webcit/static/styles/iconbaricns.css | 24 ++++----- webcit/static/styles/webcit.css | 26 +++++----- webcit/static/t/aide/edituser/select.html | 2 +- webcit/static/t/aide/serverrestart/box.html | 2 +- .../t/aide/serverrestart/box_page_do.html | 2 +- webcit/static/t/confirmlogoff.html | 4 +- webcit/static/t/edit_message.html | 12 ++--- .../t/edit_message/attachments_pane.html | 6 +-- webcit/static/t/files/section_onefile.html | 2 +- webcit/static/t/get_logged_in.html | 6 +-- webcit/static/t/iconbar/edit.html | 20 ++++---- webcit/static/t/iconbar/save.html | 2 +- webcit/static/t/msg_listview.html | 2 +- webcit/static/t/navbar.html | 46 +++++++++--------- webcit/static/t/openid_manual_create.html | 2 +- webcit/static/t/room/edit/tab_access.html | 2 +- webcit/static/t/room/edit/tab_listserv.html | 2 +- webcit/static/t/room/view_picture.html | 18 +++---- webcit/static/t/room/zap_entry.html | 4 +- webcit/static/t/roomchat.html | 2 +- webcit/static/t/vnoteitem.html | 4 +- webcit/static/t/who.html | 2 +- webcit/static/t/who/box_list_static.html | 2 +- webcit/static/t/who/section.html | 6 +-- webcit/static/t/who/summary_section.html | 6 +-- .../{icons => webcit_icons}/8paint16.gif | Bin .../static/{icons => webcit_icons}/blank.gif | Bin .../static/{icons => webcit_icons}/bubble.gif | Bin .../{icons => webcit_icons}/bubble_filler.gif | Bin .../citadel-button-32x32.gif | Bin .../{icons => webcit_icons}/closewindow.gif | Bin .../static/{icons => webcit_icons}/delete.gif | Bin .../{icons => webcit_icons}/down_pointer.gif | Bin .../static/{icons => webcit_icons}/error.gif | Bin .../essen/16x16/abort.png | Bin .../essen/16x16/account.png | Bin .../essen/16x16/activeuser.png | Bin .../essen/16x16/addcontact.png | Bin .../essen/16x16/attachement.png | Bin .../essen/16x16/back.png | Bin .../essen/16x16/blog.png | Bin .../essen/16x16/calendar.png | Bin .../essen/16x16/chat.png | Bin .../essen/16x16/config.png | Bin .../essen/16x16/contacts.png | Bin .../essen/16x16/delete.png | Bin .../essen/16x16/draft.png | Bin .../essen/16x16/email.png | Bin .../essen/16x16/file.png | Bin .../essen/16x16/forward.png | Bin .../essen/16x16/logout.png | Bin .../essen/16x16/network.png | Bin .../essen/16x16/nextroom.png | Bin .../essen/16x16/note.png | Bin .../essen/16x16/pen.png | Bin .../essen/16x16/pencil.png | Bin .../essen/16x16/readallmsg.png | Bin .../essen/16x16/refresh.png | Bin .../essen/16x16/room.png | Bin .../essen/16x16/rss.png | Bin .../essen/16x16/search.png | Bin .../essen/16x16/skiproom.png | Bin .../essen/16x16/summary.png | Bin .../essen/16x16/task.png | Bin .../essen/16x16/taskday.png | Bin .../essen/16x16/user.png | Bin .../essen/32x32/abort.png | Bin .../essen/32x32/account.png | Bin .../essen/32x32/activeuser.png | Bin .../essen/32x32/addcontact.png | Bin .../essen/32x32/attachement.png | Bin .../essen/32x32/back.png | Bin .../essen/32x32/blog.png | Bin .../essen/32x32/calendar.png | Bin .../essen/32x32/chat.png | Bin .../essen/32x32/check.png | Bin .../essen/32x32/config.png | Bin .../essen/32x32/contact.png | Bin .../essen/32x32/draft.png | Bin .../essen/32x32/email.png | Bin .../essen/32x32/feed.png | Bin .../essen/32x32/file.png | Bin .../essen/32x32/forward.png | Bin .../essen/32x32/logout.png | Bin .../essen/32x32/network.png | Bin .../essen/32x32/nextroom.png | Bin .../essen/32x32/note.png | Bin .../essen/32x32/pen.png | Bin .../essen/32x32/pencil.png | Bin .../essen/32x32/readallmsg.png | Bin .../essen/32x32/refresh.png | Bin .../essen/32x32/room.png | Bin .../essen/32x32/search.png | Bin .../essen/32x32/skiproom.png | Bin .../essen/32x32/summary.png | Bin .../essen/32x32/task.png | Bin .../essen/32x32/taskday.png | Bin .../essen/32x32/user.png | Bin .../{icons => webcit_icons}/openid-32x32.gif | Bin .../{icons => webcit_icons}/openid-small.gif | Bin .../{icons => webcit_icons}/resizecorner.png | Bin .../{icons => webcit_icons}/resizegrippy.gif | Bin .../{icons => webcit_icons}/sort_none.gif | Bin .../{icons => webcit_icons}/throbber.gif | Bin .../{icons => webcit_icons}/up_pointer.gif | Bin webcit/subst.c | 6 +-- webcit/summary.c | 2 +- webcit/userlist.c | 4 +- webcit/vcard_edit.c | 2 +- 121 files changed, 137 insertions(+), 136 deletions(-) rename webcit/static/{icons => webcit_icons}/8paint16.gif (100%) rename webcit/static/{icons => webcit_icons}/blank.gif (100%) rename webcit/static/{icons => webcit_icons}/bubble.gif (100%) rename webcit/static/{icons => webcit_icons}/bubble_filler.gif (100%) rename webcit/static/{icons => webcit_icons}/citadel-button-32x32.gif (100%) rename webcit/static/{icons => webcit_icons}/closewindow.gif (100%) rename webcit/static/{icons => webcit_icons}/delete.gif (100%) rename webcit/static/{icons => webcit_icons}/down_pointer.gif (100%) rename webcit/static/{icons => webcit_icons}/error.gif (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/abort.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/account.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/activeuser.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/addcontact.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/attachement.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/back.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/blog.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/calendar.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/chat.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/config.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/contacts.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/delete.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/draft.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/email.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/file.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/forward.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/logout.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/network.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/nextroom.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/note.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/pen.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/pencil.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/readallmsg.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/refresh.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/room.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/rss.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/search.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/skiproom.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/summary.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/task.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/taskday.png (100%) rename webcit/static/{icons => webcit_icons}/essen/16x16/user.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/abort.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/account.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/activeuser.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/addcontact.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/attachement.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/back.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/blog.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/calendar.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/chat.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/check.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/config.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/contact.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/draft.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/email.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/feed.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/file.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/forward.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/logout.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/network.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/nextroom.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/note.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/pen.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/pencil.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/readallmsg.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/refresh.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/room.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/search.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/skiproom.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/summary.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/task.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/taskday.png (100%) rename webcit/static/{icons => webcit_icons}/essen/32x32/user.png (100%) rename webcit/static/{icons => webcit_icons}/openid-32x32.gif (100%) rename webcit/static/{icons => webcit_icons}/openid-small.gif (100%) rename webcit/static/{icons => webcit_icons}/resizecorner.png (100%) rename webcit/static/{icons => webcit_icons}/resizegrippy.gif (100%) rename webcit/static/{icons => webcit_icons}/sort_none.gif (100%) rename webcit/static/{icons => webcit_icons}/throbber.gif (100%) rename webcit/static/{icons => webcit_icons}/up_pointer.gif (100%) diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index f8491fed1..09677dcca 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 7d2e2a2af..b160264ac 100755 --- a/webcit/buildpackages +++ b/webcit/buildpackages @@ -60,7 +60,7 @@ case $1 in ;; sourcedist) if test "$2" == "dfsg"; then - NONDFSG=-"-exclude static/icons/openid-small.gif" + NONDFSG=-"-exclude static/webcit_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 be32db144..1a6f7fa9b 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 1bdcf608e..3319547a6 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/debian/citadel-webcit.links b/webcit/debian/citadel-webcit.links index 2edfc8ca6..a6d42852c 100644 --- a/webcit/debian/citadel-webcit.links +++ b/webcit/debian/citadel-webcit.links @@ -1,3 +1,3 @@ -/usr/share/icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons +/usr/share/webcit_icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons /usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/prototype.js /usr/share/javascript/scriptaculous/scriptaculous.js /usr/share/citadel-webcit/static/scriptaculous.js diff --git a/webcit/downloads.c b/webcit/downloads.c index 2e7489f9e..1a5789c25 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], "/icons/essen/16x16/file.png"); + snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/webcit_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], "/icons/blank.gif"); + StrBufPrintf (Buf, "%s%s", static_dirs[0], "/webcit_icons/blank.gif"); output_static(ChrPtr(Buf)); FreeStrBuf(&Buf); } diff --git a/webcit/event.c b/webcit/event.c index 40addb0e4..0f6168d1d 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 8df6d3c36..987ab0cf5 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 80142ebea..c0f2cdde7 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -21,6 +21,7 @@ #define MAX_SCRIPTS 100 #define MAX_RULES 50 #define RULES_SCRIPT "__WebCit_Generated_Script__" + #define FOO 1 /* @@ -699,7 +700,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"); @@ -986,17 +987,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 fd5c02abd..4cb1ce74b 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/instant_messenger.html b/webcit/static/instant_messenger.html index 1c01634d2..d254e0ba4 100644 --- a/webcit/static/instant_messenger.html +++ b/webcit/static/instant_messenger.html @@ -131,7 +131,7 @@ function ShowNewMsg(gexp_xmlresponse) { + '
' - + ' ' + + ' ' + '' + '' + '
' diff --git a/webcit/static/styles/iconbaricns.css b/webcit/static/styles/iconbaricns.css index 6d3778a98..a0e3e103e 100644 --- a/webcit/static/styles/iconbaricns.css +++ b/webcit/static/styles/iconbaricns.css @@ -18,40 +18,40 @@ min-height: 25px; /* Makes all of the 'button' to be clickable */ } #ib_summary { - background-image: url("/static/icons/essen/32x32/summary.png"); + background-image: url("/static/webcit_icons/essen/32x32/summary.png"); } #ib_inbox { - background-image: url("/static/icons/essen/32x32/email.png"); + background-image: url("/static/webcit_icons/essen/32x32/email.png"); } #ib_calendar { - background-image: url("/static/icons/essen/32x32/calendar.png"); + background-image: url("/static/webcit_icons/essen/32x32/calendar.png"); } #ib_contacts { - background-image: url("/static/icons/essen/32x32/contact.png"); + background-image: url("/static/webcit_icons/essen/32x32/contact.png"); } #ib_notes { - background-image: url("/static/icons/essen/32x32/note.png"); + background-image: url("/static/webcit_icons/essen/32x32/note.png"); } #ib_tasks { - background-image: url("/static/icons/essen/32x32/task.png"); + background-image: url("/static/webcit_icons/essen/32x32/task.png"); } #ib_rooms { - background-image: url("/static/icons/essen/32x32/room.png"); + background-image: url("/static/webcit_icons/essen/32x32/room.png"); } #ib_users { - background-image: url("/static/icons/essen/32x32/user.png"); + background-image: url("/static/webcit_icons/essen/32x32/user.png"); } #ib_chat { - background-image: url("/static/icons/essen/32x32/chat.png"); + background-image: url("/static/webcit_icons/essen/32x32/chat.png"); } #ib_advanced, #ib_admin { - background-image: url("/static/icons/essen/32x32/config.png"); + background-image: url("/static/webcit_icons/essen/32x32/config.png"); } #ib_aide { - background-image: url("/static/icons/essen/32x32/config.png"); + background-image: url("/static/webcit_icons/essen/32x32/config.png"); } #ib_logoff { - background-image: url("/static/icons/essen/32x32/logout.png"); + background-image: url("/static/webcit_icons/essen/32x32/logout.png"); } #citlogo { display: block !important; diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index e0368b180..c397bb641 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -96,7 +96,7 @@ body { #message_list_hdr table { font-style: italic } #resize_msglist { - background-image: url(/static/icons/resizegrippy.gif); + background-image: url(/static/webcit_icons/resizegrippy.gif); background-position: center; background-repeat: no-repeat; } @@ -546,17 +546,17 @@ body { /* Override to disable list-style-image" */ .room a, .room a, .room a:visited, .room a:link { color: #f0feff } -.room-private { list-style-image: url("/static/icons/essen/16x16/email.png") } +.room-private { list-style-image: url("/static/webcit_icons/essen/16x16/email.png") } -.room-addr { list-style-image: url("/static/icons/essen/16x16/contact.png") } +.room-addr { list-style-image: url("/static/webcit_icons/essen/16x16/contact.png") } -.room-cal { list-style-image: url("/static/icons/essen/16x16/calendar.png") } +.room-cal { list-style-image: url("/static/webcit_icons/essen/16x16/calendar.png") } -.room-tasks { list-style-image: url("/static/icons/essen/16x16/task.png") } +.room-tasks { list-style-image: url("/static/webcit_icons/essen/16x16/task.png") } -.room-notes { list-style-image: url("/static/icons/essen/16x16/note.png") } +.room-notes { list-style-image: url("/static/webcit_icons/essen/16x16/note.png") } -.room-chat { list-style-image: url("/static/icons/essen/16x16/room.png") } +.room-chat { list-style-image: url("/static/webcit_icons/essen/16x16/room.png") } .room-newmsgs { font-weight: bold } @@ -723,9 +723,9 @@ div.auto_complete ul strong.highlight { background-position: center right; } -.sort_ascending { background-image: url("/static/icons/down_pointer.gif") } +.sort_ascending { background-image: url("/static/webcit_icons/down_pointer.gif") } -.sort_descending { background-image: url("/static/icons/up_pointer.gif") } +.sort_descending { background-image: url("/static/webcit_icons/up_pointer.gif") } #message_list_hdr > table { border-collapse: collapse } @@ -1160,14 +1160,14 @@ a.event_title:hover span.tooltip, a.event_unread:hover span.tooltip, a.event_rea a.event_title:hover span.btttop, a.event_unread:hover span.btttop, a.event_read:hover span.btttop { display: block; padding: 30px 8px 0; - background: url(/static/icons/bubble.gif) no-repeat top; + background: url(/static/webcit_icons/bubble.gif) no-repeat top; } /* different middle bg for stretch */ a.event_title:hover span.bttmiddle, a.event_unread:hover span.bttmiddle, a.event_read:hover span.bttmiddle { display: block; padding: 0 8px; - background: url(/static/icons/bubble_filler.gif) repeat bottom; + background: url(/static/webcit_icons/bubble_filler.gif) repeat bottom; color: #022750; font-size: 10px; } @@ -1175,7 +1175,7 @@ a.event_title:hover span.bttmiddle, a.event_unread:hover span.bttmiddle, a.event a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event_read:hover span.bttbottom { display: block; padding:3px 8px 10px; - background: url(/static/icons/bubble.gif) no-repeat bottom; + background: url(/static/webcit_icons/bubble.gif) no-repeat bottom; } @@ -1321,7 +1321,7 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event } .openid_urlarea { - background: url('../icons/openid-small.gif') no-repeat scroll 0pt 50%; + background: url('../webcit_icons/openid-small.gif') no-repeat scroll 0pt 50%; padding-left: 18px; } diff --git a/webcit/static/t/aide/edituser/select.html b/webcit/static/t/aide/edituser/select.html index 99ffe326a..7f026bafb 100644 --- a/webcit/static/t/aide/edituser/select.html +++ b/webcit/static/t/aide/edituser/select.html @@ -1,7 +1,7 @@ diff --git a/webcit/static/t/aide/serverrestart/box.html b/webcit/static/t/aide/serverrestart/box.html index 147d87ce3..b9baf851e 100644 --- a/webcit/static/t/aide/serverrestart/box.html +++ b/webcit/static/t/aide/serverrestart/box.html @@ -1,4 +1,4 @@ - + diff --git a/webcit/static/t/aide/serverrestart/box_page_do.html b/webcit/static/t/aide/serverrestart/box_page_do.html index 3a5a78352..258975a56 100644 --- a/webcit/static/t/aide/serverrestart/box_page_do.html +++ b/webcit/static/t/aide/serverrestart/box_page_do.html @@ -1,4 +1,4 @@ - + diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html index bed1454ae..fbf525f31 100644 --- a/webcit/static/t/confirmlogoff.html +++ b/webcit/static/t/confirmlogoff.html @@ -1,6 +1,6 @@
-

 

-

 

+

 

+

 

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index b5ae5258c..36ceb4da5 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -5,7 +5,7 @@
-

+

@@ -104,7 +104,7 @@ -

 

+