Renamed the /icons directory to /webcit_icons because of incompatibility with symlink...

Also changed the references to reflect the new positions

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index f8491fed1e36a4146648b8317d39962cc614a7e2..09677dccab3eae76f75964be35100ffcbff981b6 100644 (file)
--- 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("<table border=0 width=100%%><tr valign=middle>");
-       wc_printf("<td align=left><img src=\"static/icons/essen/32x32/contact.png\"></td>");
+       wc_printf("<td align=left><img src=\"static/webcit_icons/essen/32x32/contact.png\"></td>");
        wc_printf("<td align=center>");
 
        wc_printf("<form>"
@@ -99,7 +99,7 @@ void display_address_book_middle_div(void) {
        wc_printf("</td>");
        wc_printf("<td align=right "
                "onclick=\"javascript:$('address_book_popup').style.display='none';\" "
-               "><img src=\"static/icons/closewindow.gif\">");
+               "><img src=\"static/webcit_icons/closewindow.gif\">");
        wc_printf("</td></tr></table>");
 
        wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",

diff --git a/webcit/buildpackages b/webcit/buildpackages
index 7d2e2a2af0df54d1f7443b1fe129be123f42a0de..b160264ac72bbec27254661813bc1c670ce370f0 100755 (executable)
--- 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 be32db14464591c48135a19778c89de278b973dc..1a6f7fa9b8a039bd6914bff131344b402650607a 100644 (file)
--- 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, "<div id=\"%s_title\">", divname);
-               StrBufAppendPrintf(Target, "<img src=\"static/icons/essen/32x32/calendar.png\">");
+               StrBufAppendPrintf(Target, "<img src=\"static/webcit_icons/essen/32x32/calendar.png\">");
                StrBufAppendPrintf(Target, "<span>");
                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("<img src=\"static/icons/essen/32x32/calendar.png\"><span>");
+               wc_printf("<img src=\"static/webcit_icons/essen/32x32/calendar.png\"><span>");
                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("</span>");
        } else {
-               wc_printf("<img align=\"center\" src=\"static/icons/error.gif\"><span>");
+               wc_printf("<img align=\"center\" src=\"static/webcit_icons/error.gif\"><span>");
                wc_printf("%s\n", &buf[4]);
                wc_printf("</span>");
        }
@@ -374,7 +374,7 @@ void handle_rsvp(void)
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               wc_printf("<img src=\"static/icons/calendar.png\"><span>");
+               wc_printf("<img src=\"static/webcit_icons/calendar.png\"><span>");
                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("</span>");
        } else {
-               wc_printf("<img src=\"static/icons/error.gif\"><span> %s\n", &buf[4]);
+               wc_printf("<img src=\"static/webcit_icons/error.gif\"><span> %s\n", &buf[4]);
                wc_printf("</span>");
        }
 

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 1bdcf608e26e3976c8b329dfd6e9079e4adb1da8..3319547a63eff22be5fc6d2fb8cee021cfca0644 100644 (file)
--- 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("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
        wc_printf("&nbsp;&nbsp;"
@@ -598,7 +598,7 @@ void calendar_month_view(int year, int month, int day) {
        localtime_r(&next_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
        wc_printf("</td></tr></table>\n");
 
@@ -722,7 +722,7 @@ void calendar_brief_month_view(int year, int month, int day) {
        localtime_r(&previous_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(month_label, sizeof month_label, "%B", &tm);
        wc_printf("&nbsp;&nbsp;"
@@ -734,7 +734,7 @@ void calendar_brief_month_view(int year, int month, int day) {
        localtime_r(&next_month, &tm);
        wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
        wc_printf("</td></tr></table>\n");
 
@@ -1284,7 +1284,7 @@ void calendar_day_view(int year, int month, int day) {
        wc_printf("<td align=\"center\">");
        wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                yesterday.year, yesterday.month, yesterday.day);
-       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>");
+       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>");
        wc_printf("</td>");
 
        wc_strftime(d_str, sizeof d_str,
@@ -1302,7 +1302,7 @@ void calendar_day_view(int year, int month, int day) {
        wc_printf("<td align=\"center\">");
        wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                tomorrow.year, tomorrow.month, tomorrow.day);
-       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\""
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\""
                " border=\"0\"></a>\n", _("next"));
        wc_printf("</td>");
 

diff --git a/webcit/debian/citadel-webcit.links b/webcit/debian/citadel-webcit.links
index 2edfc8ca645d6bb40b9a3d8ee44e226083ef6b87..a6d42852cf6a64037e0f5c4657b84bbcc88c309e 100644 (file)
--- 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 2e7489f9eae2c9406ab743f424697d429c7b1468..1a5789c25884f53a49294fa88f86890cf62f69f7 100644 (file)
--- 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 40addb0e44353c8f6f78ae7a32630b3a77a67482..0f6168d1d072ed86f2d29529dd7968a5a5f55635 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -445,7 +445,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wc_printf(
                "&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
                "title=\"%s\">"
-               "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/icons/essen/16x16/contact.png\">"
+               "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/webcit_icons/essen/16x16/contact.png\">"
                "</a>",
                _("Attendees"),
                _("Contacts")

diff --git a/webcit/openid.c b/webcit/openid.c
index 8df6d3c3648f56b48a89ab7672a997b4886f2f31..987ab0cf51449c87b8d237bafb6e595a5f183a7b 100644 (file)
--- 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("<tr class=\"%s\">", (bg ? "even" : "odd"));
-                       wc_printf("<td><img src=\"static/icons/openid-small.gif\"></td><td>");
+                       wc_printf("<td><img src=\"static/webcit_icons/openid-small.gif\"></td><td>");
                        escputs(buf);
                        wc_printf("</td><td>");
                        wc_printf("<a href=\"openid_detach?id_to_detach=");

diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index fae0868a7565aa8beb2fc825d83202a14b85e6cb..97e693c1e823808bc66e89c6cd9a9f16fe4c4735 100644 (file)
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -132,7 +132,7 @@ void chat_rwho(void) {
                        else {
                                wc_printf("<span class=\"chat_notmyname_class\">");
                        }
-                       wc_printf("<img src=\"static/icons/essen/16x16/chat.png\">");
+                       wc_printf("<img src=\"static/webcit_icons/essen/16x16/chat.png\">");
                        escputs(buf);
                        wc_printf("</span><br>\n");
                }

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 80142ebeae93ef3c2a16d3b455a07f4dc3b053b0..c0f2cdde7a579cc7d0cd2814e5d1762b0ed8ef3d 100644 (file)
--- 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("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
+       wc_printf("<img src=\"static/webcit_icons/essen/32x32/config.png\">");
        wc_printf(_("Add or delete scripts"));
        wc_printf("</h1>\n");
        wc_printf("</div>\n");
@@ -986,17 +987,17 @@ void display_rules_editor_inner_div(void) {
                wc_printf("</div>");
 
                if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-                       "<img border=\"0\" src=\"static/icons/up_pointer.gif\" "
+                       "<img border=\"0\" src=\"static/webcit_icons/up_pointer.gif\" "
                        "title=\"%s\"/></a>",
                        i-1, i, _("Move rule up") );
 
                wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-                       "<img id=\"movedown%d\" border=\"0\" src=\"static/icons/down_pointer.gif\" "
+                       "<img id=\"movedown%d\" border=\"0\" src=\"static/webcit_icons/down_pointer.gif\" "
                        "title=\"%s\"/></a>",
                        i, i+1, i, _("Move rule down") );
 
                wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
-                       "<img id=\"delete%d\" border=\"0\" src=\"static/icons/delete.gif\" "
+                       "<img id=\"delete%d\" border=\"0\" src=\"static/webcit_icons/delete.gif\" "
                        "title=\"%s\"/></a>",
                        i, i, _("Delete rule") );
 

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index fd5c02abdafac02924afe6691ae3806fe666f8db..4cb1ce74ba284977ab3ae0e1c90c1a81ccc24a28 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -243,7 +243,7 @@ void display_smtpqueue(void)
                "<tr><td valign=top>\n");
 
        wc_printf("<div id=\"smtpqueue_inner_div\">"
-               "<div align=\"center\"><img src=\"static/icons/throbber.gif\"></div>"
+               "<div align=\"center\"><img src=\"static/webcit_icons/throbber.gif\"></div>"
                "</div>"
                "<div align=\"center\">"
                "<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"

diff --git a/webcit/static/icons/8paint16.gif b/webcit/static/icons/8paint16.gif
deleted file mode 100644 (file)
index 5c2b48f..0000000
Binary files a/webcit/static/icons/8paint16.gif and /dev/null differ

diff --git a/webcit/static/icons/blank.gif b/webcit/static/icons/blank.gif
deleted file mode 100644 (file)
index 4bcc753..0000000
Binary files a/webcit/static/icons/blank.gif and /dev/null differ

diff --git a/webcit/static/icons/bubble.gif b/webcit/static/icons/bubble.gif
deleted file mode 100644 (file)
index 93adba3..0000000
Binary files a/webcit/static/icons/bubble.gif and /dev/null differ

diff --git a/webcit/static/icons/bubble_filler.gif b/webcit/static/icons/bubble_filler.gif
deleted file mode 100644 (file)
index 49c9a6b..0000000
Binary files a/webcit/static/icons/bubble_filler.gif and /dev/null differ

diff --git a/webcit/static/icons/citadel-button-32x32.gif b/webcit/static/icons/citadel-button-32x32.gif
deleted file mode 100644 (file)
index f16264f..0000000
Binary files a/webcit/static/icons/citadel-button-32x32.gif and /dev/null differ

diff --git a/webcit/static/icons/closewindow.gif b/webcit/static/icons/closewindow.gif
deleted file mode 100644 (file)
index 0cdac60..0000000
Binary files a/webcit/static/icons/closewindow.gif and /dev/null differ

diff --git a/webcit/static/icons/delete.gif b/webcit/static/icons/delete.gif
deleted file mode 100644 (file)
index 4309863..0000000
Binary files a/webcit/static/icons/delete.gif and /dev/null differ

diff --git a/webcit/static/icons/down_pointer.gif b/webcit/static/icons/down_pointer.gif
deleted file mode 100644 (file)
index 49a3ef5..0000000
Binary files a/webcit/static/icons/down_pointer.gif and /dev/null differ

diff --git a/webcit/static/icons/error.gif b/webcit/static/icons/error.gif
deleted file mode 100644 (file)
index 57d398c..0000000
Binary files a/webcit/static/icons/error.gif and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png
deleted file mode 100644 (file)
index f7b6255..0000000
Binary files a/webcit/static/icons/essen/16x16/abort.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/account.png b/webcit/static/icons/essen/16x16/account.png
deleted file mode 100644 (file)
index a705ea9..0000000
Binary files a/webcit/static/icons/essen/16x16/account.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/activeuser.png b/webcit/static/icons/essen/16x16/activeuser.png
deleted file mode 100644 (file)
index e405a93..0000000
Binary files a/webcit/static/icons/essen/16x16/activeuser.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/addcontact.png b/webcit/static/icons/essen/16x16/addcontact.png
deleted file mode 100644 (file)
index 95a6319..0000000
Binary files a/webcit/static/icons/essen/16x16/addcontact.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/attachement.png b/webcit/static/icons/essen/16x16/attachement.png
deleted file mode 100644 (file)
index 7b54c84..0000000
Binary files a/webcit/static/icons/essen/16x16/attachement.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/back.png b/webcit/static/icons/essen/16x16/back.png
deleted file mode 100644 (file)
index 44c07d1..0000000
Binary files a/webcit/static/icons/essen/16x16/back.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/blog.png b/webcit/static/icons/essen/16x16/blog.png
deleted file mode 100644 (file)
index 72fe1d0..0000000
Binary files a/webcit/static/icons/essen/16x16/blog.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/calendar.png b/webcit/static/icons/essen/16x16/calendar.png
deleted file mode 100644 (file)
index 224306c..0000000
Binary files a/webcit/static/icons/essen/16x16/calendar.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/chat.png b/webcit/static/icons/essen/16x16/chat.png
deleted file mode 100644 (file)
index 6fd9a48..0000000
Binary files a/webcit/static/icons/essen/16x16/chat.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/config.png b/webcit/static/icons/essen/16x16/config.png
deleted file mode 100644 (file)
index 6e4f4e7..0000000
Binary files a/webcit/static/icons/essen/16x16/config.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/contacts.png b/webcit/static/icons/essen/16x16/contacts.png
deleted file mode 100644 (file)
index 8c94722..0000000
Binary files a/webcit/static/icons/essen/16x16/contacts.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png
deleted file mode 100644 (file)
index 787a600..0000000
Binary files a/webcit/static/icons/essen/16x16/delete.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/draft.png b/webcit/static/icons/essen/16x16/draft.png
deleted file mode 100644 (file)
index 73c3466..0000000
Binary files a/webcit/static/icons/essen/16x16/draft.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/email.png b/webcit/static/icons/essen/16x16/email.png
deleted file mode 100644 (file)
index c728377..0000000
Binary files a/webcit/static/icons/essen/16x16/email.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/file.png b/webcit/static/icons/essen/16x16/file.png
deleted file mode 100644 (file)
index aff0a5c..0000000
Binary files a/webcit/static/icons/essen/16x16/file.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/forward.png b/webcit/static/icons/essen/16x16/forward.png
deleted file mode 100644 (file)
index 6c86a9a..0000000
Binary files a/webcit/static/icons/essen/16x16/forward.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/logout.png b/webcit/static/icons/essen/16x16/logout.png
deleted file mode 100644 (file)
index 10632ef..0000000
Binary files a/webcit/static/icons/essen/16x16/logout.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/network.png b/webcit/static/icons/essen/16x16/network.png
deleted file mode 100644 (file)
index 68ac983..0000000
Binary files a/webcit/static/icons/essen/16x16/network.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/nextroom.png b/webcit/static/icons/essen/16x16/nextroom.png
deleted file mode 100644 (file)
index c6a6ae6..0000000
Binary files a/webcit/static/icons/essen/16x16/nextroom.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/note.png b/webcit/static/icons/essen/16x16/note.png
deleted file mode 100644 (file)
index b807deb..0000000
Binary files a/webcit/static/icons/essen/16x16/note.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/pen.png b/webcit/static/icons/essen/16x16/pen.png
deleted file mode 100644 (file)
index 4d5bbd9..0000000
Binary files a/webcit/static/icons/essen/16x16/pen.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/pencil.png b/webcit/static/icons/essen/16x16/pencil.png
deleted file mode 100644 (file)
index 6616740..0000000
Binary files a/webcit/static/icons/essen/16x16/pencil.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/readallmsg.png b/webcit/static/icons/essen/16x16/readallmsg.png
deleted file mode 100644 (file)
index c7c26ab..0000000
Binary files a/webcit/static/icons/essen/16x16/readallmsg.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/refresh.png b/webcit/static/icons/essen/16x16/refresh.png
deleted file mode 100644 (file)
index b6cb0e1..0000000
Binary files a/webcit/static/icons/essen/16x16/refresh.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/room.png b/webcit/static/icons/essen/16x16/room.png
deleted file mode 100644 (file)
index 9951f00..0000000
Binary files a/webcit/static/icons/essen/16x16/room.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/rss.png b/webcit/static/icons/essen/16x16/rss.png
deleted file mode 100644 (file)
index eec61da..0000000
Binary files a/webcit/static/icons/essen/16x16/rss.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/search.png b/webcit/static/icons/essen/16x16/search.png
deleted file mode 100644 (file)
index 699f40a..0000000
Binary files a/webcit/static/icons/essen/16x16/search.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/skiproom.png b/webcit/static/icons/essen/16x16/skiproom.png
deleted file mode 100644 (file)
index 5cf416c..0000000
Binary files a/webcit/static/icons/essen/16x16/skiproom.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/summary.png b/webcit/static/icons/essen/16x16/summary.png
deleted file mode 100644 (file)
index 74cb86b..0000000
Binary files a/webcit/static/icons/essen/16x16/summary.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/task.png b/webcit/static/icons/essen/16x16/task.png
deleted file mode 100644 (file)
index 704acc2..0000000
Binary files a/webcit/static/icons/essen/16x16/task.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/taskday.png b/webcit/static/icons/essen/16x16/taskday.png
deleted file mode 100644 (file)
index c7a8a33..0000000
Binary files a/webcit/static/icons/essen/16x16/taskday.png and /dev/null differ

diff --git a/webcit/static/icons/essen/16x16/user.png b/webcit/static/icons/essen/16x16/user.png
deleted file mode 100644 (file)
index 2660b9a..0000000
Binary files a/webcit/static/icons/essen/16x16/user.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/abort.png b/webcit/static/icons/essen/32x32/abort.png
deleted file mode 100644 (file)
index 72f9e21..0000000
Binary files a/webcit/static/icons/essen/32x32/abort.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/account.png b/webcit/static/icons/essen/32x32/account.png
deleted file mode 100644 (file)
index b6520f7..0000000
Binary files a/webcit/static/icons/essen/32x32/account.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/activeuser.png b/webcit/static/icons/essen/32x32/activeuser.png
deleted file mode 100644 (file)
index 8cc8ba0..0000000
Binary files a/webcit/static/icons/essen/32x32/activeuser.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/addcontact.png b/webcit/static/icons/essen/32x32/addcontact.png
deleted file mode 100644 (file)
index 6843212..0000000
Binary files a/webcit/static/icons/essen/32x32/addcontact.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/attachement.png b/webcit/static/icons/essen/32x32/attachement.png
deleted file mode 100644 (file)
index 56fcbcf..0000000
Binary files a/webcit/static/icons/essen/32x32/attachement.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/back.png b/webcit/static/icons/essen/32x32/back.png
deleted file mode 100644 (file)
index a367595..0000000
Binary files a/webcit/static/icons/essen/32x32/back.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/blog.png b/webcit/static/icons/essen/32x32/blog.png
deleted file mode 100644 (file)
index b039659..0000000
Binary files a/webcit/static/icons/essen/32x32/blog.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/calendar.png b/webcit/static/icons/essen/32x32/calendar.png
deleted file mode 100644 (file)
index 8e5ca06..0000000
Binary files a/webcit/static/icons/essen/32x32/calendar.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/chat.png b/webcit/static/icons/essen/32x32/chat.png
deleted file mode 100644 (file)
index 7c4154a..0000000
Binary files a/webcit/static/icons/essen/32x32/chat.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/check.png b/webcit/static/icons/essen/32x32/check.png
deleted file mode 100644 (file)
index dddc20c..0000000
Binary files a/webcit/static/icons/essen/32x32/check.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/config.png b/webcit/static/icons/essen/32x32/config.png
deleted file mode 100644 (file)
index 8ee17d5..0000000
Binary files a/webcit/static/icons/essen/32x32/config.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/contact.png b/webcit/static/icons/essen/32x32/contact.png
deleted file mode 100644 (file)
index 8a13063..0000000
Binary files a/webcit/static/icons/essen/32x32/contact.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/draft.png b/webcit/static/icons/essen/32x32/draft.png
deleted file mode 100644 (file)
index aa76cdc..0000000
Binary files a/webcit/static/icons/essen/32x32/draft.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/email.png b/webcit/static/icons/essen/32x32/email.png
deleted file mode 100644 (file)
index eb98276..0000000
Binary files a/webcit/static/icons/essen/32x32/email.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/feed.png b/webcit/static/icons/essen/32x32/feed.png
deleted file mode 100644 (file)
index 040720d..0000000
Binary files a/webcit/static/icons/essen/32x32/feed.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/file.png b/webcit/static/icons/essen/32x32/file.png
deleted file mode 100644 (file)
index 6b622b4..0000000
Binary files a/webcit/static/icons/essen/32x32/file.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/forward.png b/webcit/static/icons/essen/32x32/forward.png
deleted file mode 100644 (file)
index eae25fc..0000000
Binary files a/webcit/static/icons/essen/32x32/forward.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/logout.png b/webcit/static/icons/essen/32x32/logout.png
deleted file mode 100644 (file)
index 696bc50..0000000
Binary files a/webcit/static/icons/essen/32x32/logout.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/network.png b/webcit/static/icons/essen/32x32/network.png
deleted file mode 100644 (file)
index 424f79b..0000000
Binary files a/webcit/static/icons/essen/32x32/network.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/nextroom.png b/webcit/static/icons/essen/32x32/nextroom.png
deleted file mode 100644 (file)
index c0255ba..0000000
Binary files a/webcit/static/icons/essen/32x32/nextroom.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/note.png b/webcit/static/icons/essen/32x32/note.png
deleted file mode 100644 (file)
index 8252453..0000000
Binary files a/webcit/static/icons/essen/32x32/note.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/pen.png b/webcit/static/icons/essen/32x32/pen.png
deleted file mode 100644 (file)
index 2fed49d..0000000
Binary files a/webcit/static/icons/essen/32x32/pen.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/pencil.png b/webcit/static/icons/essen/32x32/pencil.png
deleted file mode 100644 (file)
index b138a5f..0000000
Binary files a/webcit/static/icons/essen/32x32/pencil.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/readallmsg.png b/webcit/static/icons/essen/32x32/readallmsg.png
deleted file mode 100644 (file)
index 80bbac6..0000000
Binary files a/webcit/static/icons/essen/32x32/readallmsg.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/refresh.png b/webcit/static/icons/essen/32x32/refresh.png
deleted file mode 100644 (file)
index 573d92c..0000000
Binary files a/webcit/static/icons/essen/32x32/refresh.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/room.png b/webcit/static/icons/essen/32x32/room.png
deleted file mode 100644 (file)
index 4d9932f..0000000
Binary files a/webcit/static/icons/essen/32x32/room.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/search.png b/webcit/static/icons/essen/32x32/search.png
deleted file mode 100644 (file)
index e331d59..0000000
Binary files a/webcit/static/icons/essen/32x32/search.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/skiproom.png b/webcit/static/icons/essen/32x32/skiproom.png
deleted file mode 100644 (file)
index d8dcb1f..0000000
Binary files a/webcit/static/icons/essen/32x32/skiproom.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/summary.png b/webcit/static/icons/essen/32x32/summary.png
deleted file mode 100644 (file)
index 60d8729..0000000
Binary files a/webcit/static/icons/essen/32x32/summary.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/task.png b/webcit/static/icons/essen/32x32/task.png
deleted file mode 100644 (file)
index ca8b051..0000000
Binary files a/webcit/static/icons/essen/32x32/task.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/taskday.png b/webcit/static/icons/essen/32x32/taskday.png
deleted file mode 100644 (file)
index bb53aba..0000000
Binary files a/webcit/static/icons/essen/32x32/taskday.png and /dev/null differ

diff --git a/webcit/static/icons/essen/32x32/user.png b/webcit/static/icons/essen/32x32/user.png
deleted file mode 100644 (file)
index 292dd1c..0000000
Binary files a/webcit/static/icons/essen/32x32/user.png and /dev/null differ

diff --git a/webcit/static/icons/openid-32x32.gif b/webcit/static/icons/openid-32x32.gif
deleted file mode 100644 (file)
index a840e2a..0000000
Binary files a/webcit/static/icons/openid-32x32.gif and /dev/null differ

diff --git a/webcit/static/icons/openid-small.gif b/webcit/static/icons/openid-small.gif
deleted file mode 100644 (file)
index cde836c..0000000
Binary files a/webcit/static/icons/openid-small.gif and /dev/null differ

diff --git a/webcit/static/icons/resizecorner.png b/webcit/static/icons/resizecorner.png
deleted file mode 100644 (file)
index fa3e382..0000000
Binary files a/webcit/static/icons/resizecorner.png and /dev/null differ

diff --git a/webcit/static/icons/resizegrippy.gif b/webcit/static/icons/resizegrippy.gif
deleted file mode 100644 (file)
index 3cba005..0000000
Binary files a/webcit/static/icons/resizegrippy.gif and /dev/null differ

diff --git a/webcit/static/icons/sort_none.gif b/webcit/static/icons/sort_none.gif
deleted file mode 100644 (file)
index 68dce00..0000000
Binary files a/webcit/static/icons/sort_none.gif and /dev/null differ

diff --git a/webcit/static/icons/throbber.gif b/webcit/static/icons/throbber.gif
deleted file mode 100644 (file)
index 772aa89..0000000
Binary files a/webcit/static/icons/throbber.gif and /dev/null differ

diff --git a/webcit/static/icons/up_pointer.gif b/webcit/static/icons/up_pointer.gif
deleted file mode 100644 (file)
index 83e5e61..0000000
Binary files a/webcit/static/icons/up_pointer.gif and /dev/null differ

diff --git a/webcit/static/instant_messenger.html b/webcit/static/instant_messenger.html
index 1c01634d2441b9a5249992799108a4d20a36f9dc..d254e0ba4548db321e53faa5718e060284f2c9fa 100644 (file)
--- a/webcit/static/instant_messenger.html
+++ b/webcit/static/instant_messenger.html
@@ -131,7 +131,7 @@ function ShowNewMsg(gexp_xmlresponse) {
                        + '<br><form method=\"post\" action=\"null\" name=\"sendform_' + which_div + '\" '
                        + 'onSubmit=\"return SendSomething(\'' + which_div + '\', \'sendform_'
                        + which_div + '\', \'' + sender + '\');\">'
-                       + '<img src=\"icons/essen/16x16/chat.png\">&nbsp;'
+                       + '<img src=\"webcit_icons/essen/16x16/chat.png\">&nbsp;'
                        + '<input type=\"text\" size=\"72\" maxlength=\"600\" name=\"sendthis\">'
                        + '</form>'
                        + '<br></div>'

diff --git a/webcit/static/styles/iconbaricns.css b/webcit/static/styles/iconbaricns.css
index 6d3778a98ef319bc86f2a8b509a3979002416fef..a0e3e103eda3dfa277f5acf0255b16d342b28f6c 100644 (file)
--- 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 e0368b1807e62dc51761c351eb65cba500206114..c397bb6418708645ed113d4e367fc7f7b5b69170 100644 (file)
--- 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 99ffe326a47db81d92ac0c8832bdee26443a8b87..7f026bafbf6c0f3428a4e1f04c0c635e230e0099 100644 (file)
--- a/webcit/static/t/aide/edituser/select.html
+++ b/webcit/static/t/aide/edituser/select.html
@@ -1,7 +1,7 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <div id="banner">
-       <img src="static/icons/essen/32x32/account.png">
+       <img src="static/webcit_icons/essen/32x32/account.png">
        <h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
 </div>
 

diff --git a/webcit/static/t/aide/serverrestart/box.html b/webcit/static/t/aide/serverrestart/box.html
index 147d87ce3247bef8aa03f9d8f12c4b23f54ad3d2..b9baf851ee4d7a1da9d06bec32a7f3b37f1c2c7e 100644 (file)
--- a/webcit/static/t/aide/serverrestart/box.html
+++ b/webcit/static/t/aide/serverrestart/box.html
@@ -1,4 +1,4 @@
-<img src="static/icons/throbber.gif" /> 
+<img src="static/webcit_icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while the Citadel server is restarted... ")>
 </font>

diff --git a/webcit/static/t/aide/serverrestart/box_page_do.html b/webcit/static/t/aide/serverrestart/box_page_do.html
index 3a5a78352fdbcde541fcfdf1d4a81634df42fef0..258975a5649b407dd3363b1194fb56872d8baf3a 100644 (file)
--- a/webcit/static/t/aide/serverrestart/box_page_do.html
+++ b/webcit/static/t/aide/serverrestart/box_page_do.html
@@ -1,4 +1,4 @@
-<img src="static/icons/throbber.gif" /> 
+<img src="static/webcit_icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while your users are being paged, the citadel server will be restarted after that... ")>
 </font>

diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html
index bed1454aee8fa4fcd44317a8d9793614601ef47a..fbf525f3116f30147ce268a58cadc16c470349a6 100644 (file)
--- a/webcit/static/t/confirmlogoff.html
+++ b/webcit/static/t/confirmlogoff.html
@@ -1,6 +1,6 @@
 <html>
        <body><center>
-               <h1><a href="termquit"><img src="static/icons/essen/32x32/logout.png" border="0">&nbsp;<?_("Log off")></a></h1>
-               <h1><a href="javascript:toggleModal(0);"><img src="static/icons/essen/32x32/abort.png" border="0">&nbsp;<?_("Cancel")></a></h1>
+               <h1><a href="termquit"><img src="static/webcit_icons/essen/32x32/logout.png" border="0">&nbsp;<?_("Log off")></a></h1>
+               <h1><a href="javascript:toggleModal(0);"><img src="static/webcit_icons/essen/32x32/abort.png" border="0">&nbsp;<?_("Cancel")></a></h1>
        </center></body>
 </html>

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index b5ae5258cd16c804c01cff77bdf61ac6a17d23ad..36ceb4da5108daf0beb52c14f0f46b52e3cd29a5 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -5,7 +5,7 @@
 
 <div id="attachments_form">
     <div id="loading">
-      <p><img src="static/icons/throbber.gif" alt=""></p>
+      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
       <p><?_("Loading")></p>
     </div>
 </div>
@@ -104,7 +104,7 @@
 <div style="display:none" id="submit-o-matic"><ul>
 <li>
        <a href="javascript:submit_post('post');">
-               <img src="static/icons/essen/16x16/pencil.png" alt=""">
+               <img src="static/webcit_icons/essen/16x16/pencil.png" alt=""">
                <span class="navbar_link">
                <?!("COND:BSTR", 1, "__RCPTREQUIRED")><?_("Send message")><?!("X", 1)>
                <??("COND:BSTR", 2, "__RCPTREQUIRED")><?_("Post message")><?!("X", 2)>
@@ -113,7 +113,7 @@
 </li>
 <li>
        <a href="javascript:submit_post('draft');">
-               <img src="static/icons/essen/16x16/draft.png" alt=""">
+               <img src="static/webcit_icons/essen/16x16/draft.png" alt=""">
                <span class="navbar_link">
                <?_("Save to Drafts")>
                </span>
@@ -121,7 +121,7 @@
 </li>
 <li>
        <a href="javascript:show_attachments_form();">
-               <img src="static/icons/essen/16x16/attachement.png" alt=""">
+               <img src="static/webcit_icons/essen/16x16/attachement.png" alt=""">
                <span class="navbar_link">
                <?_("Attachments:")>
                <span id="num_attachments"><?MSG:NATTACH></span>
@@ -130,7 +130,7 @@
 </li>
 <li>
        <a href="javascript:submit_post('cancel');">
-               <img src="static/icons/essen/16x16/delete.png" alt="">
+               <img src="static/webcit_icons/essen/16x16/delete.png" alt="">
                <span class="navbar_link">
                <?_("Cancel")>
                </span>
@@ -138,7 +138,7 @@
 </li>
 <?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
        <a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
-               <img src="static/icons/essen/16x16/contact.png" alt=""">
+               <img src="static/webcit_icons/essen/16x16/contact.png" alt=""">
                <span class="navbar_link">
                <?_("Contacts")>
                </span>

diff --git a/webcit/static/t/edit_message/attachments_pane.html b/webcit/static/t/edit_message/attachments_pane.html
index edec77866ad2ab6fdd18c22ecba7db8d7eb0d5e2..d4824078cb02b4b33520b1457e61adce961ce79c 100644 (file)
--- a/webcit/static/t/edit_message/attachments_pane.html
+++ b/webcit/static/t/edit_message/attachments_pane.html
@@ -1,8 +1,8 @@
 <div align="right">
        <a href="javascript:hide_attachments_form();">
-               <?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></div>
+               <?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></div>
        </a>
-       <h2><img src="static/icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
+       <h2><img src="static/webcit_icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
        <ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
 
        <iframe id="upload_target" name="upload_target" src="" style="width:0;height:0;border:0">
@@ -18,6 +18,6 @@
                </div>
 
                <div id="upload_throbber" style="display:none">
-                       <?_("Upload")>&nbsp;<img src="static/icons/throbber.gif" border="0">
+                       <?_("Upload")>&nbsp;<img src="static/webcit_icons/throbber.gif" border="0">
                </div>
        </form>

diff --git a/webcit/static/t/files/section_onefile.html b/webcit/static/t/files/section_onefile.html
index 72cef8c3c47dc460430ffb052a81ab5a34b3e718..32ecdf0c6c31b439e51239daf7520d964803dd35 100644 (file)
--- a/webcit/static/t/files/section_onefile.html
+++ b/webcit/static/t/files/section_onefile.html
@@ -11,7 +11,7 @@
 <td><?FILE:SIZE></td>
 <td><?FILE:MIMETYPE></td>
 <td><?FILE:COMMENT("X")></td>
-<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
+<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/webcit_icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
 </tr>
 
 <?!("COND:ITERATE:LASTN", 2)>

diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index 8011697b95fb4aaeee2bea2070adfbd7bf085096..b371af9d7746c2e8a56d2aa66d779ee1c01ffec0 100644 (file)
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -6,7 +6,7 @@
 </div>
 <div id="loginbox_closebutton">
 <a href="javascript:toggleModal(0);">
-<?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></a>
+<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></a>
 </div>
 </div>
 <br><br>
@@ -14,12 +14,12 @@
 <div id="auth_container">
 <div id="authbar">
 <ul id="button">
-<li class="ib_button" style='background-image: url("/static/icons/citadel-button-32x32.gif");'>
+<li class="ib_button" style='background-image: url("/static/webcit_icons/citadel-button-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_userpass');" title="<?SERV:HUMANNODE>"><span>
         <?SERV:HUMANNODE>
     </span></a>
 </li>
-<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/icons/openid-32x32.gif");'>
+<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/webcit_icons/openid-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>

diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
index 7c81b1568669e384248d68e7f05729864bd6bcc6..93695974c691951b4874f7ac6b4f14a3a9a7d295 100644 (file)
--- a/webcit/static/t/iconbar/edit.html
+++ b/webcit/static/t/iconbar/edit.html
@@ -25,63 +25,63 @@
                <tr class="odd"><td>
                        <input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/summary.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/summary.png" alt="&nbsp;"></td>
                        <td><b><?_("Summary")></b><br><?_("Your summary page")></td>
                </tr>
                <tr class="even"><td>
                        <input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br>
                        </td>
-                       <td><img src="static/icons/essen/32x32/email.png" alt="&nbsp;"></td>
+                       <td><img src="static/webcit_icons/essen/32x32/email.png" alt="&nbsp;"></td>
                        <td><b><?_("Mail (inbox)")></b><br><?_("A shortcut to your email Inbox")></td>
                </tr>
                <tr class="odd"><td>
                        <input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/contact.png" alt="&nbsp;">
+                       </td><td><img src="static/webcit_icons/essen/32x32/contact.png" alt="&nbsp;">
                        </td><td><b><?_("Contacts")></b><br><?_("Your personal address book")></td>
                </tr>
                <tr class="even"><td>
                        <input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br>
                        </td>
-                       <td><img src="static/icons/essen/32x32/note.png" alt="&nbsp;"></td>
+                       <td><img src="static/webcit_icons/essen/32x32/note.png" alt="&nbsp;"></td>
                        <td><b><?_("Notes")></b><br><?_("Your personal notes")></td>
                </tr>
                <tr class="odd"><td>
                        <input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/calendar.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/calendar.png" alt="&nbsp;"></td>
                        <td><b><?_("Calendar")></b><br><?_("A shortcut to your personal calendar")></td>
                </tr>
                <tr class="even"><td>
                        <input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/task.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/task.png" alt="&nbsp;"></td>
                        <td><b><?_("Tasks")></b><br><?_("A shortcut to your personal task list")></td>
                </tr>
                <tr class="odd"><td>
                        <input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/room.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/room.png" alt="&nbsp;"></td>
                        <td><b><?_("Rooms")></b><br><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td>
                </tr>
                <tr class="even"><td>
                        <input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/user.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/user.png" alt="&nbsp;"></td>
                        <td><b><?_("Who is online?")></b><br><?_("Clicking this icon displays a list of all users currently logged in.")></td>
                </tr>
                <tr class="odd"><td>
                        <input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/chat.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/chat.png" alt="&nbsp;"></td>
                        <td><b><?_("Chat")></b><br><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td>
                </tr>
                <tr class="even"><td>
                        <input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
                        <input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br>
-                       </td><td><img src="static/icons/essen/32x32/config.png" alt="&nbsp;"></td>
+                       </td><td><img src="static/webcit_icons/essen/32x32/config.png" alt="&nbsp;"></td>
                        <td><b><?_("Advanced options")></b><br><?_("Access to the complete menu of Citadel functions.")></td>
                </tr>
                <tr class="odd"><td>

diff --git a/webcit/static/t/iconbar/save.html b/webcit/static/t/iconbar/save.html
index d57a936389af7c94d48f8d7adf93fd98d09a60a3..bac3f9912e0141f117f669423b5130e6d85e826b 100644 (file)
--- a/webcit/static/t/iconbar/save.html
+++ b/webcit/static/t/iconbar/save.html
@@ -6,7 +6,7 @@
 <div id="content" class="service">
        <center>
                <table border=1 bgcolor="#ffffff"><tr><td>
-                       <img src="static/icons/essen/32x32/config.png">
+                       <img src="static/webcit_icons/essen/32x32/config.png">
                        &nbsp;
                        <?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
                </td></tr></table>

diff --git a/webcit/static/t/msg_listview.html b/webcit/static/t/msg_listview.html
index 68bbfa8c86fa3978c0c248442c27325ec9729e24..223d25ea1379f4f0d1a8f4f70d64c99dcc339b62 100644 (file)
--- a/webcit/static/t/msg_listview.html
+++ b/webcit/static/t/msg_listview.html
@@ -16,7 +16,7 @@ var sortmode = ""; /*"<?PREF:ROOM:VALUE("sort")>";*/
 <div id="summary_view">
   <table id="message_list_body" class="mailbox_summary"><tr style="display: none;"><td colspan="4"></td></tr></table>
     <div id="loading">
-      <p><img src="static/icons/throbber.gif" alt=""></p>
+      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
       <p><?_("Loading messages from server, please wait")></p>
     </div>
 </div>

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 5aa0cb1b9ca499b21e5adde212d5c7edb0670023..009cc6e7c017495eb30bf7a1c6103579401ad419 100644 (file)
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -1,7 +1,7 @@
 <div id="navbar"><ul>
        <li class="ungoto">
                <a href="ungoto">
-                       <img src="static/icons/essen/16x16/back.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/back.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Ungoto")></span>
                </a>
        </li>
@@ -9,19 +9,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 10, #"VIEW_BBS")>
        <li class="newmess">
                <a href="readnew">
-                       <img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Read new messages")></span>
                </a>
        </li>
        <li class="readallmess">
                <a href="readfwd">
-                       <img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Read all messages")></span>
                </a>
        </li>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Enter a message")></span>
                </a>
        </li>
@@ -30,13 +30,13 @@
 <?!("COND:THISROOM:CURR_VIEW", 20, #"VIEW_ADDRESSBOOK")>
        <li class="viewcontacts">
                <a href="readfwd">
-                       <img src="static/icons/essen/16x16/search.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/search.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("View contacts")></span>
                </a>
        </li>
        <li class="addnewcontact">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img src="static/icons/essen/16x16/addcontact.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/addcontact.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new contact")></span>
                </a>
        </li>
@@ -45,19 +45,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 30, #"VIEW_CALENDAR")>
        <li class="staskday">
                <a href="readfwd?calview=day">
-                       <img src="static/icons/essen/16x16/taskday.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/taskday.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Day view")></span>
                </a>
        </li>
        <li class="monthview">
                <a href="readfwd?calview=month">
-                       <img src="static/icons/essen/16x16/calendar.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/calendar.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Month view")></span>
                </a>
        </li>
        <li class="addevent">
                <a href="display_enter<?BSTR:FORWARD("year", "U")><?BSTR:FORWARD("month", "U")><?BSTR:FORWARD("day", "U")>">
-                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new event")></span>
                </a>
        </li>
@@ -66,7 +66,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 40, #"VIEW_CALBRIEF")>
        <li class="monthview">
                <a href="readfwd?calview=month">
-                       <img src="static/icons/essen/16x16/calendar.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/calendar.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Calendar list")></span>
                </a>
        </li>
@@ -75,13 +75,13 @@
 <?!("COND:THISROOM:CURR_VIEW", 50, #"VIEW_TASKS")>
        <li class="taskmanag">
                <a href="readfwd">
-                       <img src="static/icons/essen/16x16/task.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/task.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("View tasks")></span>
                </a>
        </li>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new task")></span>
                </a>
        </li>
@@ -90,14 +90,14 @@
 <?!("COND:THISROOM:CURR_VIEW", 60, #"VIEW_NOTES")>
        <li class="viewnotes">
                <a href="readfwd">
-                       <img src="static/icons/essen/16x16/note.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/note.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("View notes")>
                        </span>
                </a>
        </li>
        <li class="enternewnote">
                <a href="add_new_note">
-                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new note")></span>
                </a>
        </li>
@@ -106,19 +106,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 70, #"VIEW_MAILBOX")>
        <li class="readallmess">
                <a id="m_refresh" href="readfwd">
-                       <img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Refresh message list")></span>
                </a>
        </li>
        <li class="deleteselectedmess">
                <a href="javascript:deleteAllSelectedMessages();">
-                       <img src="static/icons/essen/16x16/delete.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/delete.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Delete")></span>
                </a>
        </li>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Write mail")></span>
                </a>
        </li>
@@ -128,20 +128,20 @@
         <??("COND:WIKI:PAGE", 81, "home")>
        <li class="readallmess">
                <a href="wiki?page=home">
-                       <img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Wiki home")></span>
                </a>
        </li>
        <?!("X", 81)>
                <li class="newmess">
                                <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter<?BSTR:FORWARD("page", "U")>'))">
-                                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                                        <span class="navbar_link"><?_("Edit this page")></span>
                                </a>
                        </li>
                <li class="newmess">
                        <a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "", "", "_history")><?BSTR:FORWARD("page", "U")>">
-                               <img  src="static/icons/essen/16x16/pen.png" alt="" width="16" height="16">
+                               <img  src="static/webcit_icons/essen/16x16/pen.png" alt="" width="16" height="16">
                                <span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "", _("Current version", _("History"))></span>
                        </a>
                </li>
@@ -150,7 +150,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 90, #"VIEW_BLOG")>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+                       <img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("New blog post")></span>
                </a>
        </li>
@@ -158,13 +158,13 @@
        
        <li class="skipthisroom">
                <a href="skip" title="<?_("Leave all messages marked as unread, go to next room with unread messages")>">
-                       <img  src="static/icons/essen/16x16/skiproom.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/skiproom.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Skip this room")></span>
                </a>
        </li>
        <li class="markngo">
                <a href="gotonext" title="<?_("Mark all messages as read, go to next room with unread messages")>">
-                       <img  src="static/icons/essen/16x16/nextroom.png" alt="" width="16" height="16">
+                       <img  src="static/webcit_icons/essen/16x16/nextroom.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Goto next room")></span></a>
        </li>
 </ul></div>

diff --git a/webcit/static/t/openid_manual_create.html b/webcit/static/t/openid_manual_create.html
index c364e3d025fd8d0c49353a80f19b79d51ef26542..c67d62d43b069a3d7b2798eb692f2ee05d9dbe31 100644 (file)
--- a/webcit/static/t/openid_manual_create.html
+++ b/webcit/static/t/openid_manual_create.html
@@ -1,5 +1,5 @@
 <div class="login_infos">
-       <img src="static/icons/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
+       <img src="static/webcit_icons/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
 <?!("COND:BSTR", 1, "__username")><?_("However, the user name")>  '<?BSTR("__username", "X")>' <?_("conflicts with an existing user.")><??("X", 1)>
 <br>
        <?_("Please specify the user name you would like to use.")><br>

diff --git a/webcit/static/t/room/edit/tab_access.html b/webcit/static/t/room/edit/tab_access.html
index 9aee5442cae6b2a19162aacfd5eeb20064a2eaae..3048972f4bb3a6530859b344dbd84029cbe10422 100644 (file)
--- a/webcit/static/t/room/edit/tab_access.html
+++ b/webcit/static/t/room/edit/tab_access.html
@@ -31,7 +31,7 @@
                                </center>
                                <!-- Pop open an address book - begin -->
                                <a href="javascript:PopOpenAddressBook('username_id|<?_("User")>');" title="<?_("Users")>">
-                                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
+                                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/webcit_icons/essen/16x16/contact.png">
                                        &nbsp;<?_("Users")>
                                </a>
                                <!-- Pop open an address book - end -->

diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index 62798ed313783a42c4f5b224dfdf89e128505622..38579b06edc37e091a8132fdc2d72f9233256392 100644 (file)
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -35,7 +35,7 @@
                <div align="right">
                        <a href="javascript:PopOpenAddressBook('add_as_listrecp|<?_("List")>|add_as_digestrecp|<?_("Digest")>')"
                        title="<?_("Add recipients from Contacts or other address books")>">
-                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
+                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/webcit_icons/essen/16x16/contact.png">
                        &nbsp;<?_("Add recipients from Contacts or other address books")></a>
                </div>
                <!-- Pop open an address book - end -->

diff --git a/webcit/static/t/room/view_picture.html b/webcit/static/t/room/view_picture.html
index 517ab9a0cb53f08c52ed5557496c048b474f3749..42ce877fca74c960b6744a2cc4fafb97c5e6988c 100644 (file)
--- a/webcit/static/t/room/view_picture.html
+++ b/webcit/static/t/room/view_picture.html
@@ -2,30 +2,30 @@
 <img height="64px" alt="<?_("Room Logo")>" src="image?name=_roompic_?room=<?ROOMNAME("U")>">
 <?!("X", 1)><??("COND:THISROOM:HAVE_PIC", 2)>
        <?!("COND:ROOM:TYPE_IS", 3, #"VIEW_ADDRESSBOOK")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/contact.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/contact.png">
        <?!("X", 3)>
        <?!("COND:ROOM:TYPE_IS", 4, #"VIEW_CALENDAR")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/calendar.png">
         <?!("X", 4)>
        <?!("COND:ROOM:TYPE_IS", 5, #"VIEW_CALBRIEF")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/calendar.png">
        <?!("X", 5)>
        <?!("COND:ROOM:TYPE_IS", 6, #"VIEW_TASKS")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/task.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/task.png">
        <?!("X", 6)>
        <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_NOTES")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/note.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/note.png">
         <?!("X", 7)>
        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_MAILBOX")>
-               <img class="roompic" alt="" src="static/icons/essen/32x32/email.png">
+               <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/email.png">
         <?!("X", 8)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/room.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/room.png">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_JOURNAL")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/chat.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/chat.png">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BLOG")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/blog.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/blog.png">
         <?!("X", 9)>
 <??("X", 2)>

diff --git a/webcit/static/t/room/zap_entry.html b/webcit/static/t/room/zap_entry.html
index 4fd2369dfe930da0bf80de75ccf866b300c5949b..eba8ad5afdfdc09fd792aff2d097378fde5bffc5 100644 (file)
--- a/webcit/static/t/room/zap_entry.html
+++ b/webcit/static/t/room/zap_entry.html
@@ -2,10 +2,10 @@
        <span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
                <?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME>
                <??("COND:THISROOM:FLAG:QR", 1, #"QR_DIRECTORY")>
-                       <img src="/static/icons/essen/16x16/file.png" alt="<?_("Has Files")>">
+                       <img src="/static/webcit_icons/essen/16x16/file.png" alt="<?_("Has Files")>">
                <??("X", 1)>
                <??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")>
-                       <img src="/static/icons/essen/16x16/network.png" alt="<?_("Networked Room")>">
+                       <img src="/static/webcit_icons/essen/16x16/network.png" alt="<?_("Networked Room")>">
                <??("X", 2)>
        </span>
 </a><br>

diff --git a/webcit/static/t/roomchat.html b/webcit/static/t/roomchat.html
index 2fd363441c756e1137c92b475fa09a286c81345a..b37aa2dacf275c0bedb8b8fd73d8765ac9f70f46 100644 (file)
--- a/webcit/static/t/roomchat.html
+++ b/webcit/static/t/roomchat.html
@@ -4,7 +4,7 @@
 <div id="chatsend" class="chatsend_class">
        <form method="POST" onsubmit="return chatsendfunc()" action="chat_send" id="chatsendid" name="chatsendform">
        <input type="hidden" name="nonce" value="<?NONCE>">
-       <img src="static/icons/essen/32x32/chat.png" alt="">
+       <img src="static/webcit_icons/essen/32x32/chat.png" alt="">
        <textarea id="send_this_id" name="send_this" rows="4" cols="78"
                onKeyPress="chat_enter(event);"></textarea>
        <input type="submit" value="<?_("Send")>">

diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html
index 1b14feed0c5b1ba9285e6183d07c4e6e5dcafdcf..5d8652539303bd7e4724151cde7f6399af31d05c 100644 (file)
--- a/webcit/static/t/vnoteitem.html
+++ b/webcit/static/t/vnoteitem.html
@@ -9,12 +9,12 @@
 >
 <table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%><tr>
 <td align=left valign=middle>
-<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/icons/8paint16.gif">
+<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/webcit_icons/8paint16.gif">
 </td>
 <td></td><!-- nothing in the title bar, its just for dragging-->
 <td align=right valign=middle>
  <img onclick="DeleteStickyNote(event,'<?VNOTE:UID>','<?_("Delete this note?")>')"
-  src="static/icons/closewindow.gif">
+  src="static/webcit_icons/closewindow.gif">
 </td></tr></table>
 </div>
 <!--end title bar div; begin body div-->

diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 1ef171e83f931e44650f6f0f6c696be118b823c8..02053e914f7e5415bc9019ccd672279d1e736c44 100644 (file)
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -9,7 +9,7 @@
 
 <div id="banner">
        <div class="banner">
-               <img alt="" src="static/icons/essen/32x32/user.png">
+               <img alt="" src="static/webcit_icons/essen/32x32/user.png">
                <h1><?_("Users currently on ")><?SERV:HUMANNODE></h1>
        </div>
        <?=("loggedinas")>

diff --git a/webcit/static/t/who/box_list_static.html b/webcit/static/t/who/box_list_static.html
index 69a4c6822ebfe119f031f0e889ab6ac03875bf1f..3ca2ce94dcdb56538fe77acb83004fdbf42688e5 100644 (file)
--- a/webcit/static/t/who/box_list_static.html
+++ b/webcit/static/t/who/box_list_static.html
@@ -12,7 +12,7 @@
 </div>
 <div class="instructions">
        <?_("Click on a name to read user info.  Click on")>
-               <img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)">
+               <img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)">
        <?_("to send an instant message to that user.")>
 </div>
 

diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index 1c08ee449e5a826facf773e0e67077ffd5b36c5c..17235f6079b8c2f637ae71111d7b5994d7bbaeb2 100644 (file)
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -7,15 +7,15 @@
        </td>
        <!-- link to page this user -->
                <td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-                       <img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)"></a> 
+                       <img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)"></a> 
                </td>
        <!-- idle flag -->
                <td width="5%">
                        <?!("WHO:IDLE", 4)>
-                               <img align="middle" src="static/icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
+                               <img align="middle" src="static/webcit_icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
                        <?!("X", 4)>
                        <??("WHO:IDLE", 5)>
-                               <img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+                               <img align="middle" src="static/webcit_icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
                        <?!("X", 5)>
                </td>
                <td>

diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
index 9d404a941107902be9ca9b125af7ec9f0eaa8ec0..a5dc85fbf420513e00d851106f22e2dbe474dc28 100644 (file)
--- a/webcit/static/t/who/summary_section.html
+++ b/webcit/static/t/who/summary_section.html
@@ -1,15 +1,15 @@
 <tr class="<?ITERATE:ODDEVEN>">
        <!-- link to page this user -->
        <td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-               <img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)"></a> 
+               <img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)"></a> 
        </td>
        <!-- idle flag -->
        <td width="5%">
                <?!("WHO:IDLE", 4)>
-                       <img align="middle" src="static/icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
+                       <img align="middle" src="static/webcit_icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
                <?!("X", 4)>
                <??("WHO:IDLE", 5)>
-                       <img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+                       <img align="middle" src="static/webcit_icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
                <?!("X", 5)>
        </td>
        <td>

diff --git a/webcit/static/webcit_icons/8paint16.gif b/webcit/static/webcit_icons/8paint16.gif
new file mode 100644 (file)
index 0000000..5c2b48f
Binary files /dev/null and b/webcit/static/webcit_icons/8paint16.gif differ

diff --git a/webcit/static/webcit_icons/blank.gif b/webcit/static/webcit_icons/blank.gif
new file mode 100644 (file)
index 0000000..4bcc753
Binary files /dev/null and b/webcit/static/webcit_icons/blank.gif differ

diff --git a/webcit/static/webcit_icons/bubble.gif b/webcit/static/webcit_icons/bubble.gif
new file mode 100644 (file)
index 0000000..93adba3
Binary files /dev/null and b/webcit/static/webcit_icons/bubble.gif differ

diff --git a/webcit/static/webcit_icons/bubble_filler.gif b/webcit/static/webcit_icons/bubble_filler.gif
new file mode 100644 (file)
index 0000000..49c9a6b
Binary files /dev/null and b/webcit/static/webcit_icons/bubble_filler.gif differ

diff --git a/webcit/static/webcit_icons/citadel-button-32x32.gif b/webcit/static/webcit_icons/citadel-button-32x32.gif
new file mode 100644 (file)
index 0000000..f16264f
Binary files /dev/null and b/webcit/static/webcit_icons/citadel-button-32x32.gif differ

diff --git a/webcit/static/webcit_icons/closewindow.gif b/webcit/static/webcit_icons/closewindow.gif
new file mode 100644 (file)
index 0000000..0cdac60
Binary files /dev/null and b/webcit/static/webcit_icons/closewindow.gif differ

diff --git a/webcit/static/webcit_icons/delete.gif b/webcit/static/webcit_icons/delete.gif
new file mode 100644 (file)
index 0000000..4309863
Binary files /dev/null and b/webcit/static/webcit_icons/delete.gif differ

diff --git a/webcit/static/webcit_icons/down_pointer.gif b/webcit/static/webcit_icons/down_pointer.gif
new file mode 100644 (file)
index 0000000..49a3ef5
Binary files /dev/null and b/webcit/static/webcit_icons/down_pointer.gif differ

diff --git a/webcit/static/webcit_icons/error.gif b/webcit/static/webcit_icons/error.gif
new file mode 100644 (file)
index 0000000..57d398c
Binary files /dev/null and b/webcit/static/webcit_icons/error.gif differ

diff --git a/webcit/static/webcit_icons/essen/16x16/abort.png b/webcit/static/webcit_icons/essen/16x16/abort.png
new file mode 100644 (file)
index 0000000..f7b6255
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/abort.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/account.png b/webcit/static/webcit_icons/essen/16x16/account.png
new file mode 100644 (file)
index 0000000..a705ea9
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/account.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/activeuser.png b/webcit/static/webcit_icons/essen/16x16/activeuser.png
new file mode 100644 (file)
index 0000000..e405a93
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/activeuser.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/addcontact.png b/webcit/static/webcit_icons/essen/16x16/addcontact.png
new file mode 100644 (file)
index 0000000..95a6319
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/addcontact.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/attachement.png b/webcit/static/webcit_icons/essen/16x16/attachement.png
new file mode 100644 (file)
index 0000000..7b54c84
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/attachement.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/back.png b/webcit/static/webcit_icons/essen/16x16/back.png
new file mode 100644 (file)
index 0000000..44c07d1
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/back.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/blog.png b/webcit/static/webcit_icons/essen/16x16/blog.png
new file mode 100644 (file)
index 0000000..72fe1d0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/blog.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/calendar.png b/webcit/static/webcit_icons/essen/16x16/calendar.png
new file mode 100644 (file)
index 0000000..224306c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/calendar.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/chat.png b/webcit/static/webcit_icons/essen/16x16/chat.png
new file mode 100644 (file)
index 0000000..6fd9a48
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/chat.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/config.png b/webcit/static/webcit_icons/essen/16x16/config.png
new file mode 100644 (file)
index 0000000..6e4f4e7
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/config.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/contacts.png b/webcit/static/webcit_icons/essen/16x16/contacts.png
new file mode 100644 (file)
index 0000000..8c94722
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/contacts.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/delete.png b/webcit/static/webcit_icons/essen/16x16/delete.png
new file mode 100644 (file)
index 0000000..787a600
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/delete.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/draft.png b/webcit/static/webcit_icons/essen/16x16/draft.png
new file mode 100644 (file)
index 0000000..73c3466
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/draft.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/email.png b/webcit/static/webcit_icons/essen/16x16/email.png
new file mode 100644 (file)
index 0000000..c728377
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/email.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/file.png b/webcit/static/webcit_icons/essen/16x16/file.png
new file mode 100644 (file)
index 0000000..aff0a5c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/file.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/forward.png b/webcit/static/webcit_icons/essen/16x16/forward.png
new file mode 100644 (file)
index 0000000..6c86a9a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/forward.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/logout.png b/webcit/static/webcit_icons/essen/16x16/logout.png
new file mode 100644 (file)
index 0000000..10632ef
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/logout.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/network.png b/webcit/static/webcit_icons/essen/16x16/network.png
new file mode 100644 (file)
index 0000000..68ac983
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/network.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/nextroom.png b/webcit/static/webcit_icons/essen/16x16/nextroom.png
new file mode 100644 (file)
index 0000000..c6a6ae6
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/nextroom.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/note.png b/webcit/static/webcit_icons/essen/16x16/note.png
new file mode 100644 (file)
index 0000000..b807deb
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/note.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/pen.png b/webcit/static/webcit_icons/essen/16x16/pen.png
new file mode 100644 (file)
index 0000000..4d5bbd9
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/pen.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/pencil.png b/webcit/static/webcit_icons/essen/16x16/pencil.png
new file mode 100644 (file)
index 0000000..6616740
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/pencil.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/readallmsg.png b/webcit/static/webcit_icons/essen/16x16/readallmsg.png
new file mode 100644 (file)
index 0000000..c7c26ab
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/readallmsg.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/refresh.png b/webcit/static/webcit_icons/essen/16x16/refresh.png
new file mode 100644 (file)
index 0000000..b6cb0e1
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/refresh.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/room.png b/webcit/static/webcit_icons/essen/16x16/room.png
new file mode 100644 (file)
index 0000000..9951f00
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/room.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/rss.png b/webcit/static/webcit_icons/essen/16x16/rss.png
new file mode 100644 (file)
index 0000000..eec61da
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/rss.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/search.png b/webcit/static/webcit_icons/essen/16x16/search.png
new file mode 100644 (file)
index 0000000..699f40a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/search.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/skiproom.png b/webcit/static/webcit_icons/essen/16x16/skiproom.png
new file mode 100644 (file)
index 0000000..5cf416c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/skiproom.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/summary.png b/webcit/static/webcit_icons/essen/16x16/summary.png
new file mode 100644 (file)
index 0000000..74cb86b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/summary.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/task.png b/webcit/static/webcit_icons/essen/16x16/task.png
new file mode 100644 (file)
index 0000000..704acc2
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/task.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/taskday.png b/webcit/static/webcit_icons/essen/16x16/taskday.png
new file mode 100644 (file)
index 0000000..c7a8a33
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/taskday.png differ

diff --git a/webcit/static/webcit_icons/essen/16x16/user.png b/webcit/static/webcit_icons/essen/16x16/user.png
new file mode 100644 (file)
index 0000000..2660b9a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/user.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/abort.png b/webcit/static/webcit_icons/essen/32x32/abort.png
new file mode 100644 (file)
index 0000000..72f9e21
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/abort.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/account.png b/webcit/static/webcit_icons/essen/32x32/account.png
new file mode 100644 (file)
index 0000000..b6520f7
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/account.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/activeuser.png b/webcit/static/webcit_icons/essen/32x32/activeuser.png
new file mode 100644 (file)
index 0000000..8cc8ba0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/activeuser.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/addcontact.png b/webcit/static/webcit_icons/essen/32x32/addcontact.png
new file mode 100644 (file)
index 0000000..6843212
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/addcontact.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/attachement.png b/webcit/static/webcit_icons/essen/32x32/attachement.png
new file mode 100644 (file)
index 0000000..56fcbcf
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/attachement.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/back.png b/webcit/static/webcit_icons/essen/32x32/back.png
new file mode 100644 (file)
index 0000000..a367595
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/back.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/blog.png b/webcit/static/webcit_icons/essen/32x32/blog.png
new file mode 100644 (file)
index 0000000..b039659
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/blog.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/calendar.png b/webcit/static/webcit_icons/essen/32x32/calendar.png
new file mode 100644 (file)
index 0000000..8e5ca06
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/calendar.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/chat.png b/webcit/static/webcit_icons/essen/32x32/chat.png
new file mode 100644 (file)
index 0000000..7c4154a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/chat.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/check.png b/webcit/static/webcit_icons/essen/32x32/check.png
new file mode 100644 (file)
index 0000000..dddc20c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/check.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/config.png b/webcit/static/webcit_icons/essen/32x32/config.png
new file mode 100644 (file)
index 0000000..8ee17d5
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/config.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/contact.png b/webcit/static/webcit_icons/essen/32x32/contact.png
new file mode 100644 (file)
index 0000000..8a13063
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/contact.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/draft.png b/webcit/static/webcit_icons/essen/32x32/draft.png
new file mode 100644 (file)
index 0000000..aa76cdc
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/draft.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/email.png b/webcit/static/webcit_icons/essen/32x32/email.png
new file mode 100644 (file)
index 0000000..eb98276
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/email.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/feed.png b/webcit/static/webcit_icons/essen/32x32/feed.png
new file mode 100644 (file)
index 0000000..040720d
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/feed.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/file.png b/webcit/static/webcit_icons/essen/32x32/file.png
new file mode 100644 (file)
index 0000000..6b622b4
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/file.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/forward.png b/webcit/static/webcit_icons/essen/32x32/forward.png
new file mode 100644 (file)
index 0000000..eae25fc
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/forward.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/logout.png b/webcit/static/webcit_icons/essen/32x32/logout.png
new file mode 100644 (file)
index 0000000..696bc50
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/logout.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/network.png b/webcit/static/webcit_icons/essen/32x32/network.png
new file mode 100644 (file)
index 0000000..424f79b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/network.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/nextroom.png b/webcit/static/webcit_icons/essen/32x32/nextroom.png
new file mode 100644 (file)
index 0000000..c0255ba
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/nextroom.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/note.png b/webcit/static/webcit_icons/essen/32x32/note.png
new file mode 100644 (file)
index 0000000..8252453
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/note.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/pen.png b/webcit/static/webcit_icons/essen/32x32/pen.png
new file mode 100644 (file)
index 0000000..2fed49d
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/pen.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/pencil.png b/webcit/static/webcit_icons/essen/32x32/pencil.png
new file mode 100644 (file)
index 0000000..b138a5f
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/pencil.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/readallmsg.png b/webcit/static/webcit_icons/essen/32x32/readallmsg.png
new file mode 100644 (file)
index 0000000..80bbac6
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/readallmsg.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/refresh.png b/webcit/static/webcit_icons/essen/32x32/refresh.png
new file mode 100644 (file)
index 0000000..573d92c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/refresh.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/room.png b/webcit/static/webcit_icons/essen/32x32/room.png
new file mode 100644 (file)
index 0000000..4d9932f
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/room.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/search.png b/webcit/static/webcit_icons/essen/32x32/search.png
new file mode 100644 (file)
index 0000000..e331d59
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/search.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/skiproom.png b/webcit/static/webcit_icons/essen/32x32/skiproom.png
new file mode 100644 (file)
index 0000000..d8dcb1f
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/skiproom.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/summary.png b/webcit/static/webcit_icons/essen/32x32/summary.png
new file mode 100644 (file)
index 0000000..60d8729
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/summary.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/task.png b/webcit/static/webcit_icons/essen/32x32/task.png
new file mode 100644 (file)
index 0000000..ca8b051
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/task.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/taskday.png b/webcit/static/webcit_icons/essen/32x32/taskday.png
new file mode 100644 (file)
index 0000000..bb53aba
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/taskday.png differ

diff --git a/webcit/static/webcit_icons/essen/32x32/user.png b/webcit/static/webcit_icons/essen/32x32/user.png
new file mode 100644 (file)
index 0000000..292dd1c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/user.png differ

diff --git a/webcit/static/webcit_icons/openid-32x32.gif b/webcit/static/webcit_icons/openid-32x32.gif
new file mode 100644 (file)
index 0000000..a840e2a
Binary files /dev/null and b/webcit/static/webcit_icons/openid-32x32.gif differ

diff --git a/webcit/static/webcit_icons/openid-small.gif b/webcit/static/webcit_icons/openid-small.gif
new file mode 100644 (file)
index 0000000..cde836c
Binary files /dev/null and b/webcit/static/webcit_icons/openid-small.gif differ

diff --git a/webcit/static/webcit_icons/resizecorner.png b/webcit/static/webcit_icons/resizecorner.png
new file mode 100644 (file)
index 0000000..fa3e382
Binary files /dev/null and b/webcit/static/webcit_icons/resizecorner.png differ

diff --git a/webcit/static/webcit_icons/resizegrippy.gif b/webcit/static/webcit_icons/resizegrippy.gif
new file mode 100644 (file)
index 0000000..3cba005
Binary files /dev/null and b/webcit/static/webcit_icons/resizegrippy.gif differ

diff --git a/webcit/static/webcit_icons/sort_none.gif b/webcit/static/webcit_icons/sort_none.gif
new file mode 100644 (file)
index 0000000..68dce00
Binary files /dev/null and b/webcit/static/webcit_icons/sort_none.gif differ

diff --git a/webcit/static/webcit_icons/throbber.gif b/webcit/static/webcit_icons/throbber.gif
new file mode 100644 (file)
index 0000000..772aa89
Binary files /dev/null and b/webcit/static/webcit_icons/throbber.gif differ

diff --git a/webcit/static/webcit_icons/up_pointer.gif b/webcit/static/webcit_icons/up_pointer.gif
new file mode 100644 (file)
index 0000000..83e5e61
Binary files /dev/null and b/webcit/static/webcit_icons/up_pointer.gif differ

diff --git a/webcit/subst.c b/webcit/subst.c
index c737e75fb8502c446fd16475c3ae7ccf26bd0a3f..f857882dc9c24156dce0d4f3fd71e670bff25eab 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -2435,9 +2435,9 @@ enum {
 };
 
 ConstStr SortIcons[] = {
-       {HKEY("static/icons/sort_none.gif")},
-       {HKEY("static/icons/up_pointer.gif")},
-       {HKEY("static/icons/down_pointer.gif")},
+       {HKEY("static/webcit_icons/sort_none.gif")},
+       {HKEY("static/webcit_icons/up_pointer.gif")},
+       {HKEY("static/webcit_icons/down_pointer.gif")},
 };
 
 ConstStr SortNextOrder[] = {

diff --git a/webcit/summary.c b/webcit/summary.c
index ed7bbef4777dcffcc86ba12895d0ab1d04badbd0..0d2ec5f23cfb18cf7434e180a4607ea8d25243d0 100644 (file)
--- 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("<div id=\"banner\" class=\"banner\">\n");
        wc_printf("<table border=0><tr>");
-        wc_printf("<td><img src=\"static/icons/essen/32x32/summary.png\"></td>");
+        wc_printf("<td><img src=\"static/webcit_icons/essen/32x32/summary.png\"></td>");
         wc_printf("<td><h1>");
         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 b9c08818ac4791acca7f03ce6309ac2040b0b1f6..7b63bf81b31d0e19e8c1e505eec78e91db098825 100644 (file)
--- 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("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/icons/essen/32x32/account.png\">");
+       wc_printf("<img src=\"static/webcit_icons/essen/32x32/account.png\">");
         wc_printf("<h1>");
        wc_printf(_("User profile"));
         wc_printf("</h1>");
@@ -150,7 +150,7 @@ void showuser(void)
        wc_printf("<br><a href=\"display_page?recp=");
        urlescputs(who);
        wc_printf("\">"
-               "<img src=\"static/icons/essen/16x16/chat.png\" "
+               "<img src=\"static/webcit_icons/essen/16x16/chat.png\" "
                "align=middle border=0>&nbsp;&nbsp;");
        snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
        escputs(buf);

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 4934cf6ee4a9b39083d01f6586f4093f0e4f5e51..14074303843ab8c0eccc9ac98386e4dd84d6ca86 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -505,7 +505,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                if (pass == 1) {
                        StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
       "<td colspan=2 bgcolor=\"#ffffff\">"
-      "<img align=\"center\" src=\"static/icons/essen/32x32/contact.png\">"
+      "<img align=\"center\" src=\"static/webcit_icons/essen/32x32/contact.png\">"
       "<font size=\"+1\"><b>");
                        StrEscAppend(Target, NULL, fullname, 0, 0);
                        StrBufAppendPrintf(Target, "</b></font>");