Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
Conflicts:
webcit/sieve.c

145 files changed:
citadel/context.c
citadel/modules/wiki/serv_wiki.c
citadel/serv_extensions.c
webcit/addressbook_popup.c
webcit/buildpackages
webcit/calendar.c
webcit/calendar_view.c
webcit/downloads.c
webcit/event.c
webcit/openid.c
webcit/roomchat.c
webcit/sieve.c
webcit/smtpqueue.c
webcit/static/8paint16.gif [deleted file]
webcit/static/blank.gif [deleted file]
webcit/static/bubble.gif [deleted file]
webcit/static/bubble_filler.gif [deleted file]
webcit/static/citadel-button-32x32.gif [deleted file]
webcit/static/closewindow.gif [deleted file]
webcit/static/delete.gif [deleted file]
webcit/static/down_pointer.gif [deleted file]
webcit/static/error.gif [deleted file]
webcit/static/favicon.ico
webcit/static/icons/8paint16.gif [new file with mode: 0644]
webcit/static/icons/blank.gif [new file with mode: 0644]
webcit/static/icons/bubble.gif [new file with mode: 0644]
webcit/static/icons/bubble_filler.gif [new file with mode: 0644]
webcit/static/icons/citadel-button-32x32.gif [new file with mode: 0644]
webcit/static/icons/closewindow.gif [new file with mode: 0644]
webcit/static/icons/delete.gif [new file with mode: 0644]
webcit/static/icons/down_pointer.gif [new file with mode: 0644]
webcit/static/icons/error.gif [new file with mode: 0644]
webcit/static/icons/essen/16x16/abort.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/account.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/activeuser.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/addcontact.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/attachement.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/back.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/blog.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/calendar.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/chat.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/config.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/contacts.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/delete.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/draft.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/email.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/file.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/forward.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/logout.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/network.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/nextroom.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/note.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/pen.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/pencil.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/readallmsg.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/refresh.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/room.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/rss.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/search.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/skiproom.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/summary.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/task.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/taskday.png [new file with mode: 0644]
webcit/static/icons/essen/16x16/user.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/abort.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/account.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/activeuser.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/addcontact.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/attachement.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/back.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/blog.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/calendar.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/chat.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/check.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/config.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/contact.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/draft.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/email.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/feed.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/file.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/forward.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/logout.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/network.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/nextroom.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/note.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/pen.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/pencil.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/readallmsg.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/refresh.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/room.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/search.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/skiproom.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/summary.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/task.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/taskday.png [new file with mode: 0644]
webcit/static/icons/essen/32x32/user.png [new file with mode: 0644]
webcit/static/icons/openid-32x32.gif [new file with mode: 0644]
webcit/static/icons/openid-small.gif [new file with mode: 0644]
webcit/static/icons/resizecorner.png [new file with mode: 0644]
webcit/static/icons/resizegrippy.gif [new file with mode: 0644]
webcit/static/icons/sort_none.gif [new file with mode: 0644]
webcit/static/icons/throbber.gif [new file with mode: 0644]
webcit/static/icons/up_pointer.gif [new file with mode: 0644]
webcit/static/instant_messenger.html
webcit/static/openid-32x32.gif [deleted file]
webcit/static/openid-small.gif [deleted file]
webcit/static/resizecorner.png [deleted file]
webcit/static/resizegrippy.gif [deleted file]
webcit/static/sort_none.gif [deleted file]
webcit/static/styles/banner.css
webcit/static/styles/iconbar.css
webcit/static/styles/iconbaricns.css
webcit/static/styles/login.css
webcit/static/styles/navbar.css
webcit/static/styles/webcit.css
webcit/static/t/aide/edituser/select.html
webcit/static/t/aide/serverrestart/box.html
webcit/static/t/aide/serverrestart/box_page_do.html
webcit/static/t/confirmlogoff.html
webcit/static/t/edit_message.html
webcit/static/t/edit_message/attachments_pane.html
webcit/static/t/files/section_onefile.html
webcit/static/t/get_logged_in.html
webcit/static/t/iconbar/edit.html
webcit/static/t/iconbar/save.html
webcit/static/t/login.html
webcit/static/t/msg_listview.html
webcit/static/t/navbar.html
webcit/static/t/openid_manual_create.html
webcit/static/t/room/edit/tab_access.html
webcit/static/t/room/edit/tab_listserv.html
webcit/static/t/room/view_picture.html
webcit/static/t/room/zap_entry.html
webcit/static/t/roomchat.html
webcit/static/t/vnoteitem.html
webcit/static/t/who.html
webcit/static/t/who/box_list_static.html
webcit/static/t/who/section.html
webcit/static/t/who/summary_section.html
webcit/static/throbber.gif [deleted file]
webcit/static/up_pointer.gif [deleted file]
webcit/subst.c
webcit/summary.c
webcit/userlist.c
webcit/vcard_edit.c

index 90019af82c539731820f8aa1173f05454d38118a..cce46043784e072a0acd56d4284d644568e79282 100644 (file)
@@ -359,9 +359,9 @@ void RemoveContext (CitContext *con)
 
        /* 
         * If the client is still connected, blow 'em away. 
-        * if the socket is 0, its already gone or was never there.
+        * if the socket is 0 or -1, its already gone or was never there.
         */
-       if (con->client_socket != 0)
+       if (con->client_socket > 0)
        {
                syslog(LOG_NOTICE, "Closing socket %d\n", con->client_socket);
                close(con->client_socket);
index 49a039809f6a130237c845fc5e63a6e9826fc5d7..77f7899f157c6d3e5acca6081a78bb80117accd0 100644 (file)
@@ -83,6 +83,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        struct CtdlMessage *history_msg = NULL;
        char diff_old_filename[PATH_MAX];
        char diff_new_filename[PATH_MAX];
+       char diff_out_filename[PATH_MAX];
        char diff_cmd[PATH_MAX];
        FILE *fp;
        int rv;
@@ -90,7 +91,6 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        char boundary[256];
        char prefixed_boundary[258];
        char buf[1024];
-       int nbytes = 0;
        char *diffbuf = NULL;
        size_t diffbuf_len = 0;
        char *ptr = NULL;
@@ -154,6 +154,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
         */
        CtdlMakeTempFileName(diff_old_filename, sizeof diff_old_filename);
        CtdlMakeTempFileName(diff_new_filename, sizeof diff_new_filename);
+       CtdlMakeTempFileName(diff_out_filename, sizeof diff_out_filename);
 
        if (old_msg != NULL) {
                fp = fopen(diff_old_filename, "w");
@@ -166,29 +167,37 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
        fclose(fp);
 
-       diffbuf_len = 0;
-       diffbuf = NULL;
        snprintf(diff_cmd, sizeof diff_cmd,
-               "diff -u %s %s",
+               "diff -u %s %s >%s",
                diff_new_filename,
-               ((old_msg != NULL) ? diff_old_filename : "/dev/null")
+               ((old_msg != NULL) ? diff_old_filename : "/dev/null"),
+               diff_out_filename
        );
-       fp = popen(diff_cmd, "r");
+       syslog(LOG_DEBUG, "diff cmd: %s", diff_cmd);
+       rv = system(diff_cmd);
+       syslog(LOG_DEBUG, "diff cmd returned %d", rv);
+
+       diffbuf_len = 0;
+       diffbuf = NULL;
+       fp = fopen(diff_out_filename, "r");
+       if (fp == NULL) {
+               fp = fopen("/dev/null", "r");
+       }
        if (fp != NULL) {
-               do {
-                       diffbuf = realloc(diffbuf, diffbuf_len + 1025);
-                       nbytes = fread(&diffbuf[diffbuf_len], 1, 1024, fp);
-                       diffbuf_len += nbytes;
-               } while (nbytes == 1024);
+               fseek(fp, 0L, SEEK_END);
+               diffbuf_len = ftell(fp);
+               fseek(fp, 0L, SEEK_SET);
+               diffbuf = malloc(diffbuf_len + 1);
+               fread(diffbuf, diffbuf_len, 1, fp);
                diffbuf[diffbuf_len] = 0;
-               if (pclose(fp) != 0) {
-                       syslog(LOG_ERR, "pclose() returned an error - diff failed\n");
-               }
+               fclose(fp);
        }
-       syslog(LOG_DEBUG, "diff length is %d bytes\n", diffbuf_len);
+
+       syslog(LOG_DEBUG, "diff length is %d bytes", diffbuf_len);
 
        unlink(diff_old_filename);
        unlink(diff_new_filename);
+       unlink(diff_out_filename);
 
        /* Determine whether this was a bogus (empty) edit */
        if ((diffbuf_len = 0) && (diffbuf != NULL)) {
@@ -272,7 +281,8 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
                }
        } while ( (IsEmptyStr(boundary)) && (*ptr != 0) );
 
-       /* Now look for the first boundary.  That is where we need to insert our fun.
+       /*
+        * Now look for the first boundary.  That is where we need to insert our fun.
         */
        if (!IsEmptyStr(boundary)) {
                snprintf(prefixed_boundary, sizeof prefixed_boundary, "--%s", boundary);
@@ -282,16 +292,15 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
                ptr = bmstrcasestr(history_msg->cm_fields['M'], prefixed_boundary);
                if (ptr != NULL) {
                        char *the_rest_of_it = strdup(ptr);
-                       char uuid[32];
+                       char uuid[64];
                        char memo[512];
-                       char encoded_memo[768];
+                       char encoded_memo[1024];
                        generate_uuid(uuid);
                        snprintf(memo, sizeof memo, "%s|%ld|%s|%s", 
                                uuid,
                                time(NULL),
                                CCC->user.fullname,
                                config.c_nodename
-                               /* no longer logging CCC->cs_inet_email */
                        );
                        CtdlEncodeBase64(encoded_memo, memo, strlen(memo), 0);
                        sprintf(ptr, "--%s\n"
@@ -311,7 +320,9 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
                }
 
                history_msg->cm_fields['T'] = realloc(history_msg->cm_fields['T'], 32);
-               snprintf(history_msg->cm_fields['T'], 32, "%ld", time(NULL));
+               if (history_msg->cm_fields['T'] != NULL) {
+                       snprintf(history_msg->cm_fields['T'], 32, "%ld", time(NULL));
+               }
        
                CtdlSubmitMsg(history_msg, NULL, "", 0);
        }
@@ -592,6 +603,18 @@ void wiki_rev(char *pagename, char *rev, char *operation)
                        msg->cm_fields['A'] = strdup("Citadel");
                        CtdlCreateRoom(wwm, 5, "", 0, 1, 1, VIEW_BBS);  /* Not an error if already exists */
                        msgnum = CtdlSubmitMsg(msg, NULL, wwm, 0);      /* Store the revision here */
+
+                       /*
+                        * WARNING: VILE SLEAZY HACK
+                        * This will avoid the 'message xxx is not in this room' security error,
+                        * but only if the client fetches the message we just generated immediately
+                        * without first trying to perform other fetch operations.
+                        */
+                       if (CC->cached_msglist != NULL) free(CC->cached_msglist);
+                       CC->cached_num_msgs = 1;
+                       CC->cached_msglist = malloc(sizeof(long));
+                       CC->cached_msglist[0] = msgnum;
+
                }
                else if (!strcasecmp(operation, "revert")) {
                        snprintf(timestamp, sizeof timestamp, "%ld", time(NULL));
index 33c83f73887f9003c19a288aa036daf88884e5a1..4f294cf24effc2081eb874b51f7103d9174b9953 100644 (file)
@@ -969,8 +969,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
        /* Other code may elect to protect this message from server-side
         * handlers; if this is the case, don't do anything.
-       syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n",
-               EventType, msg->cm_flags);
+       syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
                syslog(LOG_DEBUG, "Skipping hooks\n");
@@ -981,8 +980,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
         */
        for (fcn = MessageHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
-                       total_retval = total_retval +
-                               (*fcn->h_function_pointer) (msg);
+                       total_retval = total_retval + (*fcn->h_function_pointer) (msg);
                }
        }
 
index 0b789f74f5f65ee6acc57988a897ce812dbf0f6b..f8491fed1e36a4146648b8317d39962cc614a7e2 100644 (file)
@@ -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/viewcontacts_32x.gif\"></td>");
+       wc_printf("<td align=left><img src=\"static/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/closewindow.gif\">");
+               "><img src=\"static/icons/closewindow.gif\">");
        wc_printf("</td></tr></table>");
 
        wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
index 8a066da6c7cb5157c60cba608ba04ef37905c51d..7d2e2a2af0df54d1f7443b1fe129be123f42a0de 100755 (executable)
@@ -60,7 +60,7 @@ case $1 in
        ;;
     sourcedist)
        if test "$2" == "dfsg"; then
-           NONDFSG=-"-exclude static/openid-small.gif"
+           NONDFSG=-"-exclude static/icons/openid-small.gif"
        fi
        cd ..; tar --exclude .svn --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/
        ;;
index 98fc8260c426eaa2ef052356f866b1555913c7f5..be32db14464591c48135a19778c89de278b973dc 100644 (file)
@@ -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/calarea_48x.gif\">");
+               StrBufAppendPrintf(Target, "<img src=\"static/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/calarea_48x.gif\"><span>");
+               wc_printf("<img src=\"static/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/error.gif\"><span>");
+               wc_printf("<img align=\"center\" src=\"static/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/calarea_48x.gif\"><span>");
+               wc_printf("<img src=\"static/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/error.gif\"><span> %s\n", &buf[4]);
+               wc_printf("<img src=\"static/icons/error.gif\"><span> %s\n", &buf[4]);
                wc_printf("</span>");
        }
 
index c7af4b607304d5f1678d861ecfa8341acc0eb6bd..1bdcf608e26e3976c8b329dfd6e9079e4adb1da8 100644 (file)
@@ -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/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/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/nextdate_32x.gif\" border=\"0\"></A>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/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/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/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/nextdate_32x.gif\" border=\"0\"></a>\n", _("next"));
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/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/prevdate_32x.gif\" border=\"0\"></a>");
+       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/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/nextdate_32x.gif\""
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\""
                " border=\"0\"></a>\n", _("next"));
        wc_printf("</td>");
 
index b1ece229c7300b9fd63cf576ad8c9e5cd4443858..2e7489f9eae2c9406ab743f424697d429c7b1468 100644 (file)
@@ -246,7 +246,7 @@ void display_mime_icon(void)
        FileName = GetIconFilename(MimeType, tlen);
 
        if (FileName == NULL)
-               snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/diskette_24x.gif");
+               snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/icons/essen/16x16/file.png");
        else
                snprintf (FileBuf, SIZ, "%s%s", static_dirs[3], FileName);
        output_static(FileBuf);
@@ -410,7 +410,7 @@ void output_image(void)
         * Instead of an ugly 404, send a 1x1 transparent GIF
         * when there's no such image on the server.
         */
-       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/blank.gif");
+       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/icons/blank.gif");
        output_static(ChrPtr(Buf));
        FreeStrBuf(&Buf);
 }
index a7107bde7b072e78817da8009c1a3adc5897502a..40addb0e44353c8f6f78ae7a32630b3a77a67482 100644 (file)
@@ -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='24' height='24' src=\"static/viewcontacts_24x.gif\">"
+               "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/icons/essen/16x16/contact.png\">"
                "</a>",
                _("Attendees"),
                _("Contacts")
index 5a6c8e9f5a639450fbfd4daa616e2620f64bd924..8df6d3c3648f56b48a89ab7672a997b4886f2f31 100644 (file)
@@ -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/openid-small.gif\"></td><td>");
+                       wc_printf("<td><img src=\"static/icons/openid-small.gif\"></td><td>");
                        escputs(buf);
                        wc_printf("</td><td>");
                        wc_printf("<a href=\"openid_detach?id_to_detach=");
index 90a9162b70bafee2ed2dc593db039c65803444aa..fae0868a7565aa8beb2fc825d83202a14b85e6cb 100644 (file)
@@ -132,7 +132,7 @@ void chat_rwho(void) {
                        else {
                                wc_printf("<span class=\"chat_notmyname_class\">");
                        }
-                       wc_printf("<img src=\"static/citadelchat_16x.gif\">");
+                       wc_printf("<img src=\"static/icons/essen/16x16/chat.png\">");
                        escputs(buf);
                        wc_printf("</span><br>\n");
                }
index 3182e17f48fd696283542031ebcfe1d43a86d41e..cac28be5966e51c3ccd069e290b5c09050f2cb3d 100644 (file)
@@ -698,7 +698,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/advanpage2_48x.gif\">");
+       wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
        wc_printf(_("Add or delete scripts"));
        wc_printf("</h1>\n");
        wc_printf("</div>\n");
@@ -985,17 +985,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/up_pointer.gif\" "
+                       "<img border=\"0\" src=\"static/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/down_pointer.gif\" "
+                       "<img id=\"movedown%d\" border=\"0\" src=\"static/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/delete.gif\" "
+                       "<img id=\"delete%d\" border=\"0\" src=\"static/icons/delete.gif\" "
                        "title=\"%s\"/></a>",
                        i, i, _("Delete rule") );
 
index 6ee2db9ef98ebc7888ee4f9bb8ca574a0efeb393..fd5c02abdafac02924afe6691ae3806fe666f8db 100644 (file)
@@ -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/throbber.gif\"></div>"
+               "<div align=\"center\"><img src=\"static/icons/throbber.gif\"></div>"
                "</div>"
                "<div align=\"center\">"
                "<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
diff --git a/webcit/static/8paint16.gif b/webcit/static/8paint16.gif
deleted file mode 100644 (file)
index 5c2b48f..0000000
Binary files a/webcit/static/8paint16.gif and /dev/null differ
diff --git a/webcit/static/blank.gif b/webcit/static/blank.gif
deleted file mode 100644 (file)
index 4bcc753..0000000
Binary files a/webcit/static/blank.gif and /dev/null differ
diff --git a/webcit/static/bubble.gif b/webcit/static/bubble.gif
deleted file mode 100644 (file)
index 93adba3..0000000
Binary files a/webcit/static/bubble.gif and /dev/null differ
diff --git a/webcit/static/bubble_filler.gif b/webcit/static/bubble_filler.gif
deleted file mode 100644 (file)
index 49c9a6b..0000000
Binary files a/webcit/static/bubble_filler.gif and /dev/null differ
diff --git a/webcit/static/citadel-button-32x32.gif b/webcit/static/citadel-button-32x32.gif
deleted file mode 100644 (file)
index f16264f..0000000
Binary files a/webcit/static/citadel-button-32x32.gif and /dev/null differ
diff --git a/webcit/static/closewindow.gif b/webcit/static/closewindow.gif
deleted file mode 100644 (file)
index 0cdac60..0000000
Binary files a/webcit/static/closewindow.gif and /dev/null differ
diff --git a/webcit/static/delete.gif b/webcit/static/delete.gif
deleted file mode 100644 (file)
index 4309863..0000000
Binary files a/webcit/static/delete.gif and /dev/null differ
diff --git a/webcit/static/down_pointer.gif b/webcit/static/down_pointer.gif
deleted file mode 100644 (file)
index 49a3ef5..0000000
Binary files a/webcit/static/down_pointer.gif and /dev/null differ
diff --git a/webcit/static/error.gif b/webcit/static/error.gif
deleted file mode 100644 (file)
index 57d398c..0000000
Binary files a/webcit/static/error.gif and /dev/null differ
index 856d5a7117e71a71f2693de5f73eb8467206dea5..d0c1741f9226ee02df503d48e354a657121d84fc 100644 (file)
Binary files a/webcit/static/favicon.ico and b/webcit/static/favicon.ico differ
diff --git a/webcit/static/icons/8paint16.gif b/webcit/static/icons/8paint16.gif
new file mode 100644 (file)
index 0000000..5c2b48f
Binary files /dev/null and b/webcit/static/icons/8paint16.gif differ
diff --git a/webcit/static/icons/blank.gif b/webcit/static/icons/blank.gif
new file mode 100644 (file)
index 0000000..4bcc753
Binary files /dev/null and b/webcit/static/icons/blank.gif differ
diff --git a/webcit/static/icons/bubble.gif b/webcit/static/icons/bubble.gif
new file mode 100644 (file)
index 0000000..93adba3
Binary files /dev/null and b/webcit/static/icons/bubble.gif differ
diff --git a/webcit/static/icons/bubble_filler.gif b/webcit/static/icons/bubble_filler.gif
new file mode 100644 (file)
index 0000000..49c9a6b
Binary files /dev/null and b/webcit/static/icons/bubble_filler.gif differ
diff --git a/webcit/static/icons/citadel-button-32x32.gif b/webcit/static/icons/citadel-button-32x32.gif
new file mode 100644 (file)
index 0000000..f16264f
Binary files /dev/null and b/webcit/static/icons/citadel-button-32x32.gif differ
diff --git a/webcit/static/icons/closewindow.gif b/webcit/static/icons/closewindow.gif
new file mode 100644 (file)
index 0000000..0cdac60
Binary files /dev/null and b/webcit/static/icons/closewindow.gif differ
diff --git a/webcit/static/icons/delete.gif b/webcit/static/icons/delete.gif
new file mode 100644 (file)
index 0000000..4309863
Binary files /dev/null and b/webcit/static/icons/delete.gif differ
diff --git a/webcit/static/icons/down_pointer.gif b/webcit/static/icons/down_pointer.gif
new file mode 100644 (file)
index 0000000..49a3ef5
Binary files /dev/null and b/webcit/static/icons/down_pointer.gif differ
diff --git a/webcit/static/icons/error.gif b/webcit/static/icons/error.gif
new file mode 100644 (file)
index 0000000..57d398c
Binary files /dev/null and b/webcit/static/icons/error.gif differ
diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png
new file mode 100644 (file)
index 0000000..f7b6255
Binary files /dev/null and b/webcit/static/icons/essen/16x16/abort.png differ
diff --git a/webcit/static/icons/essen/16x16/account.png b/webcit/static/icons/essen/16x16/account.png
new file mode 100644 (file)
index 0000000..a705ea9
Binary files /dev/null and b/webcit/static/icons/essen/16x16/account.png differ
diff --git a/webcit/static/icons/essen/16x16/activeuser.png b/webcit/static/icons/essen/16x16/activeuser.png
new file mode 100644 (file)
index 0000000..e405a93
Binary files /dev/null and b/webcit/static/icons/essen/16x16/activeuser.png differ
diff --git a/webcit/static/icons/essen/16x16/addcontact.png b/webcit/static/icons/essen/16x16/addcontact.png
new file mode 100644 (file)
index 0000000..95a6319
Binary files /dev/null and b/webcit/static/icons/essen/16x16/addcontact.png differ
diff --git a/webcit/static/icons/essen/16x16/attachement.png b/webcit/static/icons/essen/16x16/attachement.png
new file mode 100644 (file)
index 0000000..7b54c84
Binary files /dev/null and b/webcit/static/icons/essen/16x16/attachement.png differ
diff --git a/webcit/static/icons/essen/16x16/back.png b/webcit/static/icons/essen/16x16/back.png
new file mode 100644 (file)
index 0000000..44c07d1
Binary files /dev/null and b/webcit/static/icons/essen/16x16/back.png differ
diff --git a/webcit/static/icons/essen/16x16/blog.png b/webcit/static/icons/essen/16x16/blog.png
new file mode 100644 (file)
index 0000000..72fe1d0
Binary files /dev/null and b/webcit/static/icons/essen/16x16/blog.png differ
diff --git a/webcit/static/icons/essen/16x16/calendar.png b/webcit/static/icons/essen/16x16/calendar.png
new file mode 100644 (file)
index 0000000..224306c
Binary files /dev/null and b/webcit/static/icons/essen/16x16/calendar.png differ
diff --git a/webcit/static/icons/essen/16x16/chat.png b/webcit/static/icons/essen/16x16/chat.png
new file mode 100644 (file)
index 0000000..6fd9a48
Binary files /dev/null and b/webcit/static/icons/essen/16x16/chat.png differ
diff --git a/webcit/static/icons/essen/16x16/config.png b/webcit/static/icons/essen/16x16/config.png
new file mode 100644 (file)
index 0000000..6e4f4e7
Binary files /dev/null and b/webcit/static/icons/essen/16x16/config.png differ
diff --git a/webcit/static/icons/essen/16x16/contacts.png b/webcit/static/icons/essen/16x16/contacts.png
new file mode 100644 (file)
index 0000000..8c94722
Binary files /dev/null and b/webcit/static/icons/essen/16x16/contacts.png differ
diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png
new file mode 100644 (file)
index 0000000..787a600
Binary files /dev/null and b/webcit/static/icons/essen/16x16/delete.png differ
diff --git a/webcit/static/icons/essen/16x16/draft.png b/webcit/static/icons/essen/16x16/draft.png
new file mode 100644 (file)
index 0000000..73c3466
Binary files /dev/null and b/webcit/static/icons/essen/16x16/draft.png differ
diff --git a/webcit/static/icons/essen/16x16/email.png b/webcit/static/icons/essen/16x16/email.png
new file mode 100644 (file)
index 0000000..c728377
Binary files /dev/null and b/webcit/static/icons/essen/16x16/email.png differ
diff --git a/webcit/static/icons/essen/16x16/file.png b/webcit/static/icons/essen/16x16/file.png
new file mode 100644 (file)
index 0000000..aff0a5c
Binary files /dev/null and b/webcit/static/icons/essen/16x16/file.png differ
diff --git a/webcit/static/icons/essen/16x16/forward.png b/webcit/static/icons/essen/16x16/forward.png
new file mode 100644 (file)
index 0000000..6c86a9a
Binary files /dev/null and b/webcit/static/icons/essen/16x16/forward.png differ
diff --git a/webcit/static/icons/essen/16x16/logout.png b/webcit/static/icons/essen/16x16/logout.png
new file mode 100644 (file)
index 0000000..10632ef
Binary files /dev/null and b/webcit/static/icons/essen/16x16/logout.png differ
diff --git a/webcit/static/icons/essen/16x16/network.png b/webcit/static/icons/essen/16x16/network.png
new file mode 100644 (file)
index 0000000..68ac983
Binary files /dev/null and b/webcit/static/icons/essen/16x16/network.png differ
diff --git a/webcit/static/icons/essen/16x16/nextroom.png b/webcit/static/icons/essen/16x16/nextroom.png
new file mode 100644 (file)
index 0000000..c6a6ae6
Binary files /dev/null and b/webcit/static/icons/essen/16x16/nextroom.png differ
diff --git a/webcit/static/icons/essen/16x16/note.png b/webcit/static/icons/essen/16x16/note.png
new file mode 100644 (file)
index 0000000..b807deb
Binary files /dev/null and b/webcit/static/icons/essen/16x16/note.png differ
diff --git a/webcit/static/icons/essen/16x16/pen.png b/webcit/static/icons/essen/16x16/pen.png
new file mode 100644 (file)
index 0000000..4d5bbd9
Binary files /dev/null and b/webcit/static/icons/essen/16x16/pen.png differ
diff --git a/webcit/static/icons/essen/16x16/pencil.png b/webcit/static/icons/essen/16x16/pencil.png
new file mode 100644 (file)
index 0000000..6616740
Binary files /dev/null and b/webcit/static/icons/essen/16x16/pencil.png differ
diff --git a/webcit/static/icons/essen/16x16/readallmsg.png b/webcit/static/icons/essen/16x16/readallmsg.png
new file mode 100644 (file)
index 0000000..c7c26ab
Binary files /dev/null and b/webcit/static/icons/essen/16x16/readallmsg.png differ
diff --git a/webcit/static/icons/essen/16x16/refresh.png b/webcit/static/icons/essen/16x16/refresh.png
new file mode 100644 (file)
index 0000000..b6cb0e1
Binary files /dev/null and b/webcit/static/icons/essen/16x16/refresh.png differ
diff --git a/webcit/static/icons/essen/16x16/room.png b/webcit/static/icons/essen/16x16/room.png
new file mode 100644 (file)
index 0000000..9951f00
Binary files /dev/null and b/webcit/static/icons/essen/16x16/room.png differ
diff --git a/webcit/static/icons/essen/16x16/rss.png b/webcit/static/icons/essen/16x16/rss.png
new file mode 100644 (file)
index 0000000..eec61da
Binary files /dev/null and b/webcit/static/icons/essen/16x16/rss.png differ
diff --git a/webcit/static/icons/essen/16x16/search.png b/webcit/static/icons/essen/16x16/search.png
new file mode 100644 (file)
index 0000000..699f40a
Binary files /dev/null and b/webcit/static/icons/essen/16x16/search.png differ
diff --git a/webcit/static/icons/essen/16x16/skiproom.png b/webcit/static/icons/essen/16x16/skiproom.png
new file mode 100644 (file)
index 0000000..5cf416c
Binary files /dev/null and b/webcit/static/icons/essen/16x16/skiproom.png differ
diff --git a/webcit/static/icons/essen/16x16/summary.png b/webcit/static/icons/essen/16x16/summary.png
new file mode 100644 (file)
index 0000000..74cb86b
Binary files /dev/null and b/webcit/static/icons/essen/16x16/summary.png differ
diff --git a/webcit/static/icons/essen/16x16/task.png b/webcit/static/icons/essen/16x16/task.png
new file mode 100644 (file)
index 0000000..704acc2
Binary files /dev/null and b/webcit/static/icons/essen/16x16/task.png differ
diff --git a/webcit/static/icons/essen/16x16/taskday.png b/webcit/static/icons/essen/16x16/taskday.png
new file mode 100644 (file)
index 0000000..c7a8a33
Binary files /dev/null and b/webcit/static/icons/essen/16x16/taskday.png differ
diff --git a/webcit/static/icons/essen/16x16/user.png b/webcit/static/icons/essen/16x16/user.png
new file mode 100644 (file)
index 0000000..2660b9a
Binary files /dev/null and b/webcit/static/icons/essen/16x16/user.png differ
diff --git a/webcit/static/icons/essen/32x32/abort.png b/webcit/static/icons/essen/32x32/abort.png
new file mode 100644 (file)
index 0000000..72f9e21
Binary files /dev/null and b/webcit/static/icons/essen/32x32/abort.png differ
diff --git a/webcit/static/icons/essen/32x32/account.png b/webcit/static/icons/essen/32x32/account.png
new file mode 100644 (file)
index 0000000..b6520f7
Binary files /dev/null and b/webcit/static/icons/essen/32x32/account.png differ
diff --git a/webcit/static/icons/essen/32x32/activeuser.png b/webcit/static/icons/essen/32x32/activeuser.png
new file mode 100644 (file)
index 0000000..8cc8ba0
Binary files /dev/null and b/webcit/static/icons/essen/32x32/activeuser.png differ
diff --git a/webcit/static/icons/essen/32x32/addcontact.png b/webcit/static/icons/essen/32x32/addcontact.png
new file mode 100644 (file)
index 0000000..6843212
Binary files /dev/null and b/webcit/static/icons/essen/32x32/addcontact.png differ
diff --git a/webcit/static/icons/essen/32x32/attachement.png b/webcit/static/icons/essen/32x32/attachement.png
new file mode 100644 (file)
index 0000000..56fcbcf
Binary files /dev/null and b/webcit/static/icons/essen/32x32/attachement.png differ
diff --git a/webcit/static/icons/essen/32x32/back.png b/webcit/static/icons/essen/32x32/back.png
new file mode 100644 (file)
index 0000000..a367595
Binary files /dev/null and b/webcit/static/icons/essen/32x32/back.png differ
diff --git a/webcit/static/icons/essen/32x32/blog.png b/webcit/static/icons/essen/32x32/blog.png
new file mode 100644 (file)
index 0000000..b039659
Binary files /dev/null and b/webcit/static/icons/essen/32x32/blog.png differ
diff --git a/webcit/static/icons/essen/32x32/calendar.png b/webcit/static/icons/essen/32x32/calendar.png
new file mode 100644 (file)
index 0000000..8e5ca06
Binary files /dev/null and b/webcit/static/icons/essen/32x32/calendar.png differ
diff --git a/webcit/static/icons/essen/32x32/chat.png b/webcit/static/icons/essen/32x32/chat.png
new file mode 100644 (file)
index 0000000..7c4154a
Binary files /dev/null and b/webcit/static/icons/essen/32x32/chat.png differ
diff --git a/webcit/static/icons/essen/32x32/check.png b/webcit/static/icons/essen/32x32/check.png
new file mode 100644 (file)
index 0000000..dddc20c
Binary files /dev/null and b/webcit/static/icons/essen/32x32/check.png differ
diff --git a/webcit/static/icons/essen/32x32/config.png b/webcit/static/icons/essen/32x32/config.png
new file mode 100644 (file)
index 0000000..8ee17d5
Binary files /dev/null and b/webcit/static/icons/essen/32x32/config.png differ
diff --git a/webcit/static/icons/essen/32x32/contact.png b/webcit/static/icons/essen/32x32/contact.png
new file mode 100644 (file)
index 0000000..8a13063
Binary files /dev/null and b/webcit/static/icons/essen/32x32/contact.png differ
diff --git a/webcit/static/icons/essen/32x32/draft.png b/webcit/static/icons/essen/32x32/draft.png
new file mode 100644 (file)
index 0000000..aa76cdc
Binary files /dev/null and b/webcit/static/icons/essen/32x32/draft.png differ
diff --git a/webcit/static/icons/essen/32x32/email.png b/webcit/static/icons/essen/32x32/email.png
new file mode 100644 (file)
index 0000000..eb98276
Binary files /dev/null and b/webcit/static/icons/essen/32x32/email.png differ
diff --git a/webcit/static/icons/essen/32x32/feed.png b/webcit/static/icons/essen/32x32/feed.png
new file mode 100644 (file)
index 0000000..040720d
Binary files /dev/null and b/webcit/static/icons/essen/32x32/feed.png differ
diff --git a/webcit/static/icons/essen/32x32/file.png b/webcit/static/icons/essen/32x32/file.png
new file mode 100644 (file)
index 0000000..6b622b4
Binary files /dev/null and b/webcit/static/icons/essen/32x32/file.png differ
diff --git a/webcit/static/icons/essen/32x32/forward.png b/webcit/static/icons/essen/32x32/forward.png
new file mode 100644 (file)
index 0000000..eae25fc
Binary files /dev/null and b/webcit/static/icons/essen/32x32/forward.png differ
diff --git a/webcit/static/icons/essen/32x32/logout.png b/webcit/static/icons/essen/32x32/logout.png
new file mode 100644 (file)
index 0000000..696bc50
Binary files /dev/null and b/webcit/static/icons/essen/32x32/logout.png differ
diff --git a/webcit/static/icons/essen/32x32/network.png b/webcit/static/icons/essen/32x32/network.png
new file mode 100644 (file)
index 0000000..424f79b
Binary files /dev/null and b/webcit/static/icons/essen/32x32/network.png differ
diff --git a/webcit/static/icons/essen/32x32/nextroom.png b/webcit/static/icons/essen/32x32/nextroom.png
new file mode 100644 (file)
index 0000000..c0255ba
Binary files /dev/null and b/webcit/static/icons/essen/32x32/nextroom.png differ
diff --git a/webcit/static/icons/essen/32x32/note.png b/webcit/static/icons/essen/32x32/note.png
new file mode 100644 (file)
index 0000000..8252453
Binary files /dev/null and b/webcit/static/icons/essen/32x32/note.png differ
diff --git a/webcit/static/icons/essen/32x32/pen.png b/webcit/static/icons/essen/32x32/pen.png
new file mode 100644 (file)
index 0000000..2fed49d
Binary files /dev/null and b/webcit/static/icons/essen/32x32/pen.png differ
diff --git a/webcit/static/icons/essen/32x32/pencil.png b/webcit/static/icons/essen/32x32/pencil.png
new file mode 100644 (file)
index 0000000..b138a5f
Binary files /dev/null and b/webcit/static/icons/essen/32x32/pencil.png differ
diff --git a/webcit/static/icons/essen/32x32/readallmsg.png b/webcit/static/icons/essen/32x32/readallmsg.png
new file mode 100644 (file)
index 0000000..80bbac6
Binary files /dev/null and b/webcit/static/icons/essen/32x32/readallmsg.png differ
diff --git a/webcit/static/icons/essen/32x32/refresh.png b/webcit/static/icons/essen/32x32/refresh.png
new file mode 100644 (file)
index 0000000..573d92c
Binary files /dev/null and b/webcit/static/icons/essen/32x32/refresh.png differ
diff --git a/webcit/static/icons/essen/32x32/room.png b/webcit/static/icons/essen/32x32/room.png
new file mode 100644 (file)
index 0000000..4d9932f
Binary files /dev/null and b/webcit/static/icons/essen/32x32/room.png differ
diff --git a/webcit/static/icons/essen/32x32/search.png b/webcit/static/icons/essen/32x32/search.png
new file mode 100644 (file)
index 0000000..e331d59
Binary files /dev/null and b/webcit/static/icons/essen/32x32/search.png differ
diff --git a/webcit/static/icons/essen/32x32/skiproom.png b/webcit/static/icons/essen/32x32/skiproom.png
new file mode 100644 (file)
index 0000000..d8dcb1f
Binary files /dev/null and b/webcit/static/icons/essen/32x32/skiproom.png differ
diff --git a/webcit/static/icons/essen/32x32/summary.png b/webcit/static/icons/essen/32x32/summary.png
new file mode 100644 (file)
index 0000000..60d8729
Binary files /dev/null and b/webcit/static/icons/essen/32x32/summary.png differ
diff --git a/webcit/static/icons/essen/32x32/task.png b/webcit/static/icons/essen/32x32/task.png
new file mode 100644 (file)
index 0000000..ca8b051
Binary files /dev/null and b/webcit/static/icons/essen/32x32/task.png differ
diff --git a/webcit/static/icons/essen/32x32/taskday.png b/webcit/static/icons/essen/32x32/taskday.png
new file mode 100644 (file)
index 0000000..bb53aba
Binary files /dev/null and b/webcit/static/icons/essen/32x32/taskday.png differ
diff --git a/webcit/static/icons/essen/32x32/user.png b/webcit/static/icons/essen/32x32/user.png
new file mode 100644 (file)
index 0000000..292dd1c
Binary files /dev/null and b/webcit/static/icons/essen/32x32/user.png differ
diff --git a/webcit/static/icons/openid-32x32.gif b/webcit/static/icons/openid-32x32.gif
new file mode 100644 (file)
index 0000000..a840e2a
Binary files /dev/null and b/webcit/static/icons/openid-32x32.gif differ
diff --git a/webcit/static/icons/openid-small.gif b/webcit/static/icons/openid-small.gif
new file mode 100644 (file)
index 0000000..cde836c
Binary files /dev/null and b/webcit/static/icons/openid-small.gif differ
diff --git a/webcit/static/icons/resizecorner.png b/webcit/static/icons/resizecorner.png
new file mode 100644 (file)
index 0000000..fa3e382
Binary files /dev/null and b/webcit/static/icons/resizecorner.png differ
diff --git a/webcit/static/icons/resizegrippy.gif b/webcit/static/icons/resizegrippy.gif
new file mode 100644 (file)
index 0000000..3cba005
Binary files /dev/null and b/webcit/static/icons/resizegrippy.gif differ
diff --git a/webcit/static/icons/sort_none.gif b/webcit/static/icons/sort_none.gif
new file mode 100644 (file)
index 0000000..68dce00
Binary files /dev/null and b/webcit/static/icons/sort_none.gif differ
diff --git a/webcit/static/icons/throbber.gif b/webcit/static/icons/throbber.gif
new file mode 100644 (file)
index 0000000..772aa89
Binary files /dev/null and b/webcit/static/icons/throbber.gif differ
diff --git a/webcit/static/icons/up_pointer.gif b/webcit/static/icons/up_pointer.gif
new file mode 100644 (file)
index 0000000..83e5e61
Binary files /dev/null and b/webcit/static/icons/up_pointer.gif differ
index cd546c33cf2473285eda42949ca05973ea4453e7..1c01634d2441b9a5249992799108a4d20a36f9dc 100644 (file)
@@ -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=\"citadelchat_16x.gif\">&nbsp;'
+                       + '<img src=\"icons/essen/16x16/chat.png\">&nbsp;'
                        + '<input type=\"text\" size=\"72\" maxlength=\"600\" name=\"sendthis\">'
                        + '</form>'
                        + '<br></div>'
diff --git a/webcit/static/openid-32x32.gif b/webcit/static/openid-32x32.gif
deleted file mode 100644 (file)
index a840e2a..0000000
Binary files a/webcit/static/openid-32x32.gif and /dev/null differ
diff --git a/webcit/static/openid-small.gif b/webcit/static/openid-small.gif
deleted file mode 100644 (file)
index cde836c..0000000
Binary files a/webcit/static/openid-small.gif and /dev/null differ
diff --git a/webcit/static/resizecorner.png b/webcit/static/resizecorner.png
deleted file mode 100644 (file)
index fa3e382..0000000
Binary files a/webcit/static/resizecorner.png and /dev/null differ
diff --git a/webcit/static/resizegrippy.gif b/webcit/static/resizegrippy.gif
deleted file mode 100644 (file)
index 3cba005..0000000
Binary files a/webcit/static/resizegrippy.gif and /dev/null differ
diff --git a/webcit/static/sort_none.gif b/webcit/static/sort_none.gif
deleted file mode 100644 (file)
index 68dce00..0000000
Binary files a/webcit/static/sort_none.gif and /dev/null differ
index 0a8f3a63373b3f1af532a4bbc30b8183d84d121a..03b86e3224dfd9b18216710acf1da5072f48ee08 100644 (file)
        position: absolute;
        right: 0;
        top: 0;
+       text-align: right;
+       font-size: 70%;
+       font-weight: bold;
 }
 
 #banner ul.room_actions {
        list-style: none;
-       text-align: left;
        margin: 0;
 }
 #banner ul.room_actions li {
index 245fb0d2fe8f07d39f84294b98b2ed705958c36b..5256cd44a584da4bd91ba4c3107a2209ca2216df 100644 (file)
@@ -71,10 +71,9 @@ div.iconbar_text select { border: 1px solid 424b5; }
 }
 
 .ib_button, .floor {
-       margin: 3px 9px;
-       padding: 0;
+       margin: 0.2em;
        display: block;
-       font-size: 80%;
+       font-size: 90%;
        background-color: #4d555c;
        color: #F0FEFF;
        font-weight: bold;
index 16d7097c335be16224248ab23a24b28ddf0493c5..6d3778a98ef319bc86f2a8b509a3979002416fef 100644 (file)
@@ -6,52 +6,52 @@
  */
 
 .ib_button {
-    min-height: 32px;
+    min-height: 38px;
     background-repeat: no-repeat !important;
-    background-position: 3px 0px;
+    background-position: 7px 3px;
     vertical-align: middle;
 }
 .ib_button_link {
-    padding-top: 8px;
-    padding-left: 37px;
+    padding-top: 0.8em;
+    padding-left: 48px;
     height: 100%;
     min-height: 25px; /* Makes all of the 'button' to be clickable */
 }
 #ib_summary {
-    background-image: url("/static/summscreen_32x.gif");
+    background-image: url("/static/icons/essen/32x32/summary.png");
 }
 #ib_inbox {
-    background-image: url("/static/privatemess_32x.gif");
+    background-image: url("/static/icons/essen/32x32/email.png");
 }
 #ib_calendar {
-    background-image: url("/static/calarea_32x.gif");
+    background-image: url("/static/icons/essen/32x32/calendar.png");
 }
 #ib_contacts {
-    background-image: url("/static/viewcontacts_32x.gif");
+    background-image: url("/static/icons/essen/32x32/contact.png");
 }
 #ib_notes {
-    background-image: url("/static/storenotes_32x.gif");
+    background-image: url("/static/icons/essen/32x32/note.png");
 }
 #ib_tasks {
-    background-image: url("/static/taskmanag_32x.gif");
+    background-image: url("/static/icons/essen/32x32/task.png");
 }
 #ib_rooms {
-    background-image: url("/static/chatrooms_32x.gif");
+    background-image: url("/static/icons/essen/32x32/room.png");
 }
 #ib_users {
-    background-image: url("/static/usermanag_32x.gif");
+    background-image: url("/static/icons/essen/32x32/user.png");
 }
 #ib_chat {
-    background-image: url("/static/citadelchat_32x.gif");
+    background-image: url("/static/icons/essen/32x32/chat.png");
 }
 #ib_advanced, #ib_admin {
-    background-image: url("/static/advanpage2_32x.gif");
+    background-image: url("/static/icons/essen/32x32/config.png");
 }
 #ib_aide {
-    background-image: url("/static/advanpage2_32x.gif");
+    background-image: url("/static/icons/essen/32x32/config.png");
 }
 #ib_logoff {
-    background-image: url("/static/logoff_32x.gif");
+    background-image: url("/static/icons/essen/32x32/logout.png");
 }
 #citlogo {
     display: block !important;
index e90502b068ceb59f209b7427c126675260a1ccdc..b4ee10ebf5716fb61a11c81b9de1150c9be4e47a 100644 (file)
@@ -1,24 +1,25 @@
 #login_screen, #logout_screen {
        position: fixed;
-       margin: 0px;
-       top: 0px;
-       left: 0px;
-       bottom: 0px;
-       right: 0px;
-       padding: 3% 6% 3% 6%;
+       left: 0;
+       right: 0;
+       margin: 5em auto;
+       width: 42em;
        overflow: auto;
 }
 
-#login_screen .login_message, #login_screen .login_image, .login_hello, #login_screen #login_form {
+#login_screen .login_message, .login_hello, #login_screen #login_form {
        display: block;
        margin: 5px auto 5px auto;
 }
 
 #login_screen .login_message, .login_hello { width: 80% }
 
-#login_screen .login_image { width: 135px }
+#login_screen .login_image { 
+       width: 135px;
+       margin: 0 auto;
+}
 
-#login_screen .login_image img { text-align: center }
+/*#login_screen .login_image img { width: 135px }*/
 
 #login_screen #login_form {
        padding: 10px;
        text-align: center;
        font-weight: bold;
 }
+
+.logbuttons, .registernow {
+       width: 50%;
+        margin: 1em auto;
+        text-align: center;
+        display: block;
+       height: 2em;
+       line-height: 2em;
+        background-color: #4d555c;
+        font-weight: bold;
+        -khtml-border-radius: 5px;
+        -moz-border-radius: 5px;
+        border-radius: 5px;
+        behavior: url(static/styles/PIE.htc);
+}
+
+.logbuttons a:link, .registernow a:link { color: #f0feff; }
index 58aa094e22ec3ecf719124e2a48408012db03c30..9a15d1bbbec54fed437fecdbac4891aaf36e1a81 100644 (file)
@@ -13,7 +13,6 @@
 #navbar ul, .selector_top, .selector_bottom {
        width: 100%;
        margin: 0 auto 0 auto;
-       padding: 0;
        white-space: nowrap;
        text-align: center;
        vertical-align: middle;
        display: inline;
        list-style: none;
        vertical-align: middle;
-       padding: 0 0.5em;
+       padding: 0 0.2em;
 }
 
 #navbar ul li a {
+       padding: 0.3em;
        display: inline-block;
        white-space: nowrap;
 }
 
 #navbar ul li a:hover {
+       padding: 0.3em;
        background-color: #5c646b;
        border: 0px solid #5c646b;
         border-radius: 5px;
index 5fb788d735b8303ada5be8c11ed8010851615ec5..e0368b1807e62dc51761c351eb65cba500206114 100644 (file)
@@ -30,7 +30,7 @@ html, body {
 
 .address_book_popup_title { font-size: 130% }
 
-#button, #content .button_link a, input#delbutton,.attachfile,.logbuttons input,.buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td {
+#button, #content .button_link a, input#delbutton,.attachfile, .buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td {
        font-size: 100%;
 }
 
@@ -96,7 +96,7 @@ body {
 #message_list_hdr table { font-style: italic }
 
 #resize_msglist {
-       background-image: url(/static/resizegrippy.gif);
+       background-image: url(/static/icons/resizegrippy.gif);
        background-position: center;
        background-repeat: no-repeat; 
 }
@@ -389,11 +389,11 @@ input, select, .room_actions form select, .room_actions li.search input, .addres
 
 .buttons a:hover { background-color: #5c646b; }
  
-.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input {
+.button_link a, input#delbutton,.attachfile, .buttons input {
        background-color: #4d555c;
 }
  
-.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input {
+.button_link a, input#delbutton,.attachfile, .buttons input {
        border: 2px solid #5c646b;
        color: #F0FEFF;
 }
@@ -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/privatemess_16x.gif") }
+.room-private { list-style-image: url("/static/icons/essen/16x16/email.png") }
 
-.room-addr { list-style-image: url("/static/viewcontacts_16x.gif") }
+.room-addr { list-style-image: url("/static/icons/essen/16x16/contact.png") }
 
-.room-cal { list-style-image: url("/static/calarea_16x.gif") }
+.room-cal { list-style-image: url("/static/icons/essen/16x16/calendar.png") }
 
-.room-tasks { list-style-image: url("/static/taskmanag_16x.gif") }
+.room-tasks { list-style-image: url("/static/icons/essen/16x16/task.png") }
 
-.room-notes { list-style-image: url("/static/storenotes_16x.gif") }
+.room-notes { list-style-image: url("/static/icons/essen/16x16/note.png") }
 
-.room-chat { list-style-image: url("/static/chatrooms_16x.gif") }
+.room-chat { list-style-image: url("/static/icons/essen/16x16/room.png") }
 
 .room-newmsgs { font-weight: bold }
 
@@ -571,7 +571,7 @@ body {
        padding: 2px;
 }
 
-.button_link a, .attachfile, .logbuttons input,.buttons input .logbutton {
+.button_link a, .attachfile, .buttons input .logbutton {
        margin: 3px;
        padding: 2px 4px 2px 4px;
 }
@@ -723,9 +723,9 @@ div.auto_complete ul strong.highlight {
        background-position: center right;
 }
 
-.sort_ascending { background-image: url("/static/down_pointer.gif") }
+.sort_ascending { background-image: url("/static/icons/down_pointer.gif") }
 
-.sort_descending { background-image: url("/static/up_pointer.gif") }
+.sort_descending { background-image: url("/static/icons/up_pointer.gif") }
 
 #message_list_hdr > table { border-collapse: collapse }
 
@@ -798,7 +798,7 @@ table.advanced {
 
 /* Links and buttons */
 
-.logbuttons, .buttons, .registernow {
+.buttons {
        margin: 2px auto 2px auto;
        width: 96%;
        text-align: center;
@@ -976,11 +976,7 @@ li.event_unread span, a.event_read_title { font-size: 100% }
        padding: 4px;
 }
 
-.roompic {
-       height: 48px;
-       width: 48px;
-       border: none;
-}
+.roompic { border: none; }
 
 .table-row, .table-alt-row { width: 100% }
 
@@ -1164,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/bubble.gif) no-repeat top;
+       background: url(/static/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/bubble_filler.gif) repeat bottom; 
+       background: url(/static/icons/bubble_filler.gif) repeat bottom; 
        color: #022750;
        font-size: 10px;
 }
@@ -1179,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/bubble.gif) no-repeat bottom;
+       background: url(/static/icons/bubble.gif) no-repeat bottom;
 }
 
 
@@ -1325,14 +1321,10 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event
 }
 
 .openid_urlarea {
-        background: url('../openid-small.gif') no-repeat scroll 0pt 50%;
+        background: url('../icons/openid-small.gif') no-repeat scroll 0pt 50%;
         padding-left: 18px;
 }
 
-.registernow {
-       text-align: right;
-}
-
 .older_blog_posts, .newer_blog_posts {
        font-size: 110%;
 }
index 80d1b768a025dd923f9af51127aab1f1cce21185..99ffe326a47db81d92ac0c8832bdee26443a8b87 100644 (file)
@@ -1,22 +1,25 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <div id="banner">
-  <img src="static/usermanag_48x.gif">
-  <h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
+       <img src="static/icons/essen/32x32/account.png">
+       <h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
 </div>
 
 <div id="content" class="service"> 
-<?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
-<??("COND:AIDE", 2)>
+       <?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
+       <??("COND:AIDE", 2)>
  
-<!--- TODO if (message != NULL) message); -->
+       <!--- TODO if (message != NULL) message); -->
 
-<table border=0 cellspacing=10>
-<tr valign=top><td>
-  <?DOBOXED(="aide_edituser_add", _("Add users"))>
-</td><td>
- <?DOBOXED(="aide_edituser_box_select", _("Edit or Delete users"))>
-</td></tr>
-</table>
-<??("X", 2)>
+               <table border=0 cellspacing=10>
+                       <tr valign=top>
+                               <td>
+                                       <?DOBOXED(="aide_edituser_add", _("Add users"))>
+                               </td>
+                               <td>
+                                       <?DOBOXED(="aide_edituser_box_select", _("Edit or Delete users"))>
+                               </td>
+                       </tr>
+               </table>
+       <??("X", 2)>
 <?=("trailing")>
index d09bfb3b42e51cae18d4a748b9e34f41814d9ab8..147d87ce3247bef8aa03f9d8f12c4b23f54ad3d2 100644 (file)
@@ -1,4 +1,4 @@
-<img src="static/throbber.gif" /> 
+<img src="static/icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while the Citadel server is restarted... ")>
 </font>
index 971de741183a8494ff14d611f91aa210bfbe7a21..3a5a78352fdbcde541fcfdf1d4a81634df42fef0 100644 (file)
@@ -1,4 +1,4 @@
-<img src="static/throbber.gif" /> 
+<img src="static/icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while your users are being paged, the citadel server will be restarted after that... ")>
 </font>
index c6c3b82b38cf5b3096a9cfb3aa250b1dfe2fecf9..bed1454aee8fa4fcd44317a8d9793614601ef47a 100644 (file)
@@ -1,8 +1,6 @@
 <html>
-<body>
-<center>
-<h1><a href="termquit"><img src="static/logoff_32x.gif" border="0">&nbsp;<?_("Log off")></a></h1>
-<h1><a href="javascript:toggleModal(0);"><img src="static/closewindow.gif" height="32" width="32" border="0">&nbsp;<?_("Cancel")></a></h1>
-</center>
-</body>
+       <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>
+       </center></body>
 </html>
index fa10e53f2f78c0bca2dd0b80a7b7177b5006ef6c..b5ae5258cd16c804c01cff77bdf61ac6a17d23ad 100644 (file)
@@ -5,7 +5,7 @@
 
 <div id="attachments_form">
     <div id="loading">
-      <p><img src="static/throbber.gif" alt=""></p>
+      <p><img src="static/icons/throbber.gif" alt=""></p>
       <p><?_("Loading")></p>
     </div>
 </div>
 <div style="display:none" id="submit-o-matic"><ul>
 <li>
        <a href="javascript:submit_post('post');">
-               <img src="static/newmess3_24x.gif" alt="" width="24" height="24">
+               <img src="static/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)>
 </li>
 <li>
        <a href="javascript:submit_post('draft');">
-               <img src="static/folder_closed.gif" alt="" width="24" height="24">
+               <img src="static/icons/essen/16x16/draft.png" alt=""">
                <span class="navbar_link">
                <?_("Save to Drafts")>
                </span>
 </li>
 <li>
        <a href="javascript:show_attachments_form();">
-               <img src="static/diskette_24x.gif" alt="" width="24" height="24">
+               <img src="static/icons/essen/16x16/attachement.png" alt=""">
                <span class="navbar_link">
                <?_("Attachments:")>
                <span id="num_attachments"><?MSG:NATTACH></span>
 </li>
 <li>
        <a href="javascript:submit_post('cancel');">
-               <img src="static/closewindow.gif" alt="">
+               <img src="static/icons/essen/16x16/delete.png" alt="">
                <span class="navbar_link">
                <?_("Cancel")>
                </span>
 </li>
 <?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
        <a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
-               <img src="static/viewcontacts_24x.gif" alt="" width="24" height="24">
+               <img src="static/icons/essen/16x16/contact.png" alt=""">
                <span class="navbar_link">
                <?_("Contacts")>
                </span>
index 95408230c4e83063f9a01fd1cb4ddf7b02aa50a2..edec77866ad2ab6fdd18c22ecba7db8d7eb0d5e2 100644 (file)
@@ -1,28 +1,23 @@
 <div align="right">
-<a href="javascript:hide_attachments_form();">
-<?_("Close window")>&nbsp;<img src="static/closewindow.gif" border="0"></div>
-</a>
-<h2><img src="static/diskette_24x.gif" border="0">&nbsp;<?_("Attachments:")></h2>
+       <a href="javascript:hide_attachments_form();">
+               <?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></div>
+       </a>
+       <h2><img src="static/icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
+       <ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
 
-<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">
+               (Hidden iFrame for uploads because ajax cannot handle files)
+       </iframe>
 
-<iframe id="upload_target" name="upload_target" src="" style="width:0;height:0;border:0">
-(Hidden iFrame for uploads because ajax cannot handle files)
-</iframe>
+       <form name="upload_attachment_form" id="upload_attachment_form" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="upload_attachment" target="upload_target">
+               <input type="hidden" name="nonce" value="<?NONCE>">
+               <div id="gonna_upload_this">
+                       <input type="hidden" name="submit_action" value="">
+                       <?_("Attach file:")>
+                       <input name="attachfile" id="attachfile" class="attachfile" size=40 type="file" onChange="$('gonna_upload_this').style.display='none'; $('upload_throbber').style.display='block'; document.upload_attachment_form.submit(); $('attachfile').value=''; show_attachments_form(); update_attachment_count();">
+               </div>
 
-<form name="upload_attachment_form" id="upload_attachment_form" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="upload_attachment" target="upload_target">
-<input type="hidden" name="nonce" value="<?NONCE>">
-
-<div id="gonna_upload_this">
-<input type="hidden" name="submit_action" value="">
-<?_("Attach file:")>
-<input name="attachfile" id="attachfile" class="attachfile" size=40 type="file" onChange="$('gonna_upload_this').style.display='none'; $('upload_throbber').style.display='block'; document.upload_attachment_form.submit(); $('attachfile').value=''; show_attachments_form(); update_attachment_count();">
-</div>
-
-<div id="upload_throbber" style="display:none">
-<?_("Upload")>&nbsp;<img src="static/throbber.gif" border="0">
-</div>
-
-</form>
+               <div id="upload_throbber" style="display:none">
+                       <?_("Upload")>&nbsp;<img src="static/icons/throbber.gif" border="0">
+               </div>
+       </form>
index 3678d7a9e8fd82043e67dc5236e092e08f611d1f..72cef8c3c47dc460430ffb052a81ab5a34b3e718 100644 (file)
@@ -1,5 +1,5 @@
 <?!("COND:ITERATE:ISGROUPCHANGE", 1)><?!("COND:BSTR", 2, "SortOrder", "filename")>
-<tr class="<?ITERATE:ODDEVEN>"><th colspan = 4><?FILE:NAME("U", 1)></th></tr>
+       <tr class="<?ITERATE:ODDEVEN>"><th colspan = 4><?FILE:NAME("U", 1)></th></tr>
 <?!("X", 2)><?!("X", 1)>
 
 <tr class="<?ITERATE:ODDEVEN>">
@@ -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/delete.gif" alt="<?_("Delete File")>"></a></td><??("X", 4)>
+<??("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)>
 </tr>
 
 <?!("COND:ITERATE:LASTN", 2)>
index c9b14eaa831469e89b536d0e874ced7d42e847ff..8011697b95fb4aaeee2bea2070adfbd7bf085096 100644 (file)
@@ -6,7 +6,7 @@
 </div>
 <div id="loginbox_closebutton">
 <a href="javascript:toggleModal(0);">
-<?_("Close window")>&nbsp;<img src="static/closewindow.gif" border="0"></a>
+<?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></a>
 </div>
 </div>
 <br><br>
 <div id="auth_container">
 <div id="authbar">
 <ul id="button">
-<li class="ib_button" style='background-image: url("/static/citadel-button-32x32.gif");'>
+<li class="ib_button" style='background-image: url("/static/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/openid-32x32.gif");'>
+<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/icons/openid-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>
index 11d85f503797b3b76ddaf8181b2b5f61b8e045c6..7c81b1568669e384248d68e7f05729864bd6bcc6 100644 (file)
@@ -1,97 +1,96 @@
 <?=("head")>
 <?=("important_msg")>
 <div id="banner">
-<h1>
-<?_("Customize the icon bar")>
-</h1></div>
+       <h1><?_("Customize the icon bar")></h1>
+</div>
 <div id="content" class="service">
-<form method="post" action="commit_iconbar">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<table class="altern" >
-<tr><td></td><td colspan="2"><b><?_("Display icons as:")></b>
-
-<input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
-<input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
-<input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
-<br>
-<?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
-</td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br>
-</td><td><img src="image?name=hello" width="48" alt="&nbsp;">
-</td><td><b><?_("Site logo")></b><br><?_("An icon describing this site")></td></tr>
-
-<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/summscreen_48x.gif" 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/privatemess_48x.gif" 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/viewcontacts_48x.gif" 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/storenotes_48x.gif" 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/calarea_48x.gif" 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/taskmanag_48x.gif" 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/chatrooms_48x.gif" 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/usermanag_48x.gif" 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/citadelchat_48x.gif" 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/advanpage2_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Advanced options")></b><br><?_("Access to the complete menu of Citadel functions.")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br>
-</td><td><img border="0" width="48" height="48" src="static/citadel-logo.gif" alt="&nbsp;">
-</td><td><b><?_("Citadel logo")></b><br><?_("Displays the 'Powered by Citadel' icon")></td></tr>
-
-</table><br>
-
-<center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
-
+       <form method="post" action="commit_iconbar">
+       <input type="hidden" name="nonce" value="<?NONCE>">
+       <table class="altern" >
+               <tr><td></td><td colspan="2">
+                       <b><?_("Display icons as:")></b>
+                       <input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
+                       <input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
+                       <input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
+                       <br>
+                       <?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
+               </td></tr>
+               <tr class="even"><td>
+                       <input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+                       <input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br>
+                       </td>
+                       <td><img src="image?name=hello" width="120" alt="&nbsp;"></td>
+                       <td><b><?_("Site logo")></b><br><?_("An icon describing this site")></td>
+               </tr>
+               <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><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><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><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><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><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><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><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><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><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><b><?_("Advanced options")></b><br><?_("Access to the complete menu of Citadel functions.")></td>
+               </tr>
+               <tr class="odd"><td>
+                       <input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+                       <input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br>
+                       </td><td><img border="0" width="120" height="60" src="static/citadel-logo.gif" alt="&nbsp;"></td>
+                       <td><b><?_("Citadel logo")></b><br><?_("Displays the 'Powered by Citadel' icon")></td>
+               </tr>
+       </table><br>
+       <center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
 </form>
 <?=("trailing")>
index 031bf5b5824d6c1543100a7881091602a877a874..d57a936389af7c94d48f8d7adf93fd98d09a60a3 100644 (file)
@@ -1,13 +1,14 @@
 <?=("head")>
 <?=("important_msg")>
 <div id="banner">
-<h1>
-<?_("Customize the icon bar")>
-</h1></div>
+       <h1><?_("Customize the icon bar")></h1>
+</div>
 <div id="content" class="service">
-<center><table border=1 bgcolor="#ffffff"><tr><td>
-<img src="static/advanpage2_48x.gif">
-&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>
+       <center>
+               <table border=1 bgcolor="#ffffff"><tr><td>
+                       <img src="static/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>
+       </center>
 <?=("trailing")>
index cb4e8f951329254019aa5edd295228e37828f55a..96beced84490f634854b35da11fe95ec3377c80d 100644 (file)
@@ -2,22 +2,21 @@
 <!-- start login.html -->
 <div id="login_screen">
                <div class="box">
-               <div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")>
-                       <a href="http://www.citadel.org">Citadel</a>
-               </div>
-               <div class="boxcontent">
-                       <div id="hellomsg"><?SERV:MESG("hello")></div>
-               <?!("COND:IMPMSG", 1)>
-                       <div class="login_message"><?IMPORTANTMESSAGE></div>
-               <?!("X", 1)>
-                       <div class="login_image"><img src="image?name=hello" alt="">
-                               <span class="button_link">
+                       <div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")>
+                               <a href="http://www.citadel.org">Citadel</a>
+                       </div>
+                       <div class="boxcontent">
+                               <div id="hellomsg"><?SERV:MESG("hello")></div>
+                               <?!("COND:IMPMSG", 1)>
+                                       <div class="login_message"><?IMPORTANTMESSAGE></div>
+                               <?!("X", 1)>
+                               <div class="login_image"><img src="image?name=hello" alt=""></div>
+                               <span class="logbuttons">
                                        <a href="javascript:GetLoggedInFirst('do_welcome');"><?_("Log in")></a>
                                </span>
                        </div>
-</div>
+               </div>
 <!-- end login.html -->
-<?=("endbox")>
 <script type="text/javascript">
        GetLoggedInFirst('do_welcome');
 </script>
index 948096c0d5ebed21e283794c381717f704c138c6..68bbfa8c86fa3978c0c248442c27325ec9729e24 100644 (file)
@@ -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/throbber.gif" alt=""></p>
+      <p><img src="static/icons/throbber.gif" alt=""></p>
       <p><?_("Loading messages from server, please wait")></p>
     </div>
 </div>
index a581084f425f5a5c70e77ac266323fbf412eec15..5aa0cb1b9ca499b21e5adde212d5c7edb0670023 100644 (file)
@@ -1,7 +1,7 @@
 <div id="navbar"><ul>
        <li class="ungoto">
                <a href="ungoto">
-                       <img src="static/ungoto2_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/newmess2_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/readallmess3_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/newmess3_24x.gif" alt="" width="24" height="24">
+                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Enter a message")></span>
                </a>
        </li>
 <?!("COND:THISROOM:CURR_VIEW", 20, #"VIEW_ADDRESSBOOK")>
        <li class="viewcontacts">
                <a href="readfwd">
-                       <img src="static/viewcontacts_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/addnewcontact_24x.gif" alt="" width="24" height="24">
+                       <img src="static/icons/essen/16x16/addcontact.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new contact")></span>
                </a>
        </li>
 <?!("COND:THISROOM:CURR_VIEW", 30, #"VIEW_CALENDAR")>
        <li class="staskday">
                <a href="readfwd?calview=day">
-                       <img src="static/taskday2_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/monthview2_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/addevent_24x.gif" alt="" width="24" height="24">
+                       <img  src="static/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/monthview2_24x.gif" alt="" width="24" height="24">
+                       <img src="static/icons/essen/16x16/calendar.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Calendar list")></span>
                </a>
        </li>
 <?!("COND:THISROOM:CURR_VIEW", 50, #"VIEW_TASKS")>
        <li class="taskmanag">
                <a href="readfwd">
-                       <img src="static/taskmanag_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/newmess3_24x.gif" alt="" width="24" height="24">
+                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new task")></span>
                </a>
        </li>
 <?!("COND:THISROOM:CURR_VIEW", 60, #"VIEW_NOTES")>
        <li class="viewnotes">
                <a href="readfwd">
-                       <img src="static/viewnotes_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/enternewnote_24x.gif" "
-                       "alt="" width="24" height="24">
+                       <img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Add new note")></span>
                </a>
        </li>
 <?!("COND:THISROOM:CURR_VIEW", 70, #"VIEW_MAILBOX")>
        <li class="readallmess">
                <a id="m_refresh" href="readfwd">
-                       <img src="static/readallmess3_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/delete.gif" alt="" width="24" height="24">
+                       <img src="static/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/newmess3_24x.gif" alt="" width="24" height="24">
+                       <img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Write mail")></span>
                </a>
        </li>
         <??("COND:WIKI:PAGE", 81, "home")>
        <li class="readallmess">
                <a href="wiki?page=home">
-                       <img src="static/readallmess3_24x.gif" alt="" width="24" height="24">
+                       <img src="static/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/newmess3_24x.gif" alt="" width="24" height="24">
+                                       <img  src="static/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/newmess3_24x.gif" alt="" width="24" height="24">
+                               <img  src="static/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>
 <?!("COND:THISROOM:CURR_VIEW", 90, #"VIEW_BLOG")>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">
-                       <img src="static/newmess3_24x.gif" alt="" width="24" height="24">
+                       <img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("New blog post")></span>
                </a>
        </li>
        
        <li class="skipthisroom">
                <a href="skip" title="<?_("Leave all messages marked as unread, go to next room with unread messages")>">
-                       <img  src="static/skipthisroom_24x.gif" alt="" width="24" height="24">
+                       <img  src="static/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/markngo_24x.gif" alt="" width="24" height="24">
+                       <img  src="static/icons/essen/16x16/nextroom.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Goto next room")></span></a>
        </li>
 </ul></div>
index 0ab12a4582b3a8d07a0e7f6253b6417d81c22021..c364e3d025fd8d0c49353a80f19b79d51ef26542 100644 (file)
@@ -1,5 +1,5 @@
 <div class="login_infos">
-       <img src="static/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
+       <img src="static/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>
index 53d395fe5e85184a24e7949ea59609ae6122c885..9aee5442cae6b2a19162aacfd5eeb20064a2eaae 100644 (file)
@@ -3,35 +3,35 @@
                <tr valign="top">
                        <td>
                                <?_("The users listed below have access to this room. To remove a user from the access list, select the user name from the list and click 'Kick'.")>
-                               <br /><br />
+                               <br><br>
                                <center>
                                        <form method="post" action="do_invt_kick">
-                                               <input type="hidden" name="nonce" value="<?NONCE>" />
-                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
+                                               <input type="hidden" name="nonce" value="<?NONCE>">
+                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                                <select name="username" size="10" style="width:100%">
                                                        <?ITERATE("ITERATE:THISROOM:WHO_KNOWS", ="room_edit_username_list", 0, 0, -1)>
                                                </select>
-                                               <br />
-                                               <input type="submit" name="kick_button" value="<?_("Kick")>" />
+                                               <br>
+                                               <input type="submit" name="kick_button" value="<?_("Kick")>">
                                        </form>
                                </center>
                        </td>
                        <td>
                                <?_("To grant another user access to this room, enter the user name in the box below and click 'Invite'.")>
-                               <br /><br />
+                               <br><br>
                                <center>
                                        <form method="post" action="do_invt_kick">
-                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
+                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                                <input type="hidden" name="nonce" value="<?NONCE>">
                                                <?_("Invite:")>
-                                               <input type="text" name="username" id="username_id" style="width:100R"><br />
-                                               <input type="hidden" name="invite_button" value="Invite" />
-                                               <input type="submit" value="<?_("Invite")>" />
+                                               <input type="text" name="username" id="username_id" style="width:100R"><br>
+                                               <input type="hidden" name="invite_button" value="Invite">
+                                               <input type="submit" value="<?_("Invite")>">
                                        </form>
                                </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/viewcontacts_24x.gif" />
+                                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
                                        &nbsp;<?_("Users")>
                                </a>
                                <!-- Pop open an address book - end -->
index 749586551feb05d8ac25523aea17a71c58710119..62798ed313783a42c4f5b224dfdf89e128505622 100644 (file)
@@ -2,27 +2,27 @@
        <center>
                <table border="0" width="100%" cellpadding="5">
                        <tr><td valign="top">
-                       <?_("<i>The contents of this room are being mailed <b>as individual messages</b> to the following list recipients:</i><br /><br />")>
+                       <?_("<i>The contents of this room are being mailed <b>as individual messages</b> to the following list recipients:</i><br><br>")>
                        <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_listrecp_removal", 0, 0, -1, #"listrecp")>
-                       <br />
+                       <br>
                        <form method="post" action="netedit">
                          <p>
-                               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
-                               <input type="hidden" name="prefix" value="listrecp|" />
-                               <input type="hidden" name="nonce" value="<?NONCE>" />
-                               <input type="text" id="add_as_listrecp" name="line" />
-                               <input type="submit" name="add_button" value="<?_("Add")>" />
+                               <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+                               <input type="hidden" name="prefix" value="listrecp|">
+                               <input type="hidden" name="nonce" value="<?NONCE>">
+                               <input type="text" id="add_as_listrecp" name="line">
+                               <input type="submit" name="add_button" value="<?_("Add")>">
                          </p>
                        </form>
                        </td>
                        <td valign="top">
-                       <?_("<i>The contents of this room are being mailed <b>in digest form</b> to the following list recipients:</i><br /><br />")>
+                       <?_("<i>The contents of this room are being mailed <b>in digest form</b> to the following list recipients:</i><br><br>")>
                        <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_digestrecp_removal", 0, 0, -1, #"digestrecp")>
-                       <br />
+                       <br>
                        <form method="post" action="netedit">
                          <p>
-                               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
-                               <input type="hidden" name="prefix" value="digestrecp|" />
+                               <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+                               <input type="hidden" name="prefix" value="digestrecp|">
                                <input type="hidden" name="nonce" value="<?NONCE>">
                                <input type="text" id="add_as_digestrecp" name="line">
                                <input type="submit" name="add_button" value="<?_("Add")>">
                <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/viewcontacts_24x.gif" />
+                       <img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
                        &nbsp;<?_("Add recipients from Contacts or other address books")></a>
                </div>
                <!-- Pop open an address book - end -->
 
-               <br />
+               <br>
                <form method="get" action="toggle_self_service">
                        <table>
                                <!-- Public posting? -->
                                <tr>
                                        <td><?_("Allow non-subscribers to mail to this room.")></td>
-                                       <td><input type="checkbox" name="QR2_SubsOnly" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SMTP_PUBLIC", 1, 'checked="checked" ', "")> /></td>
+                                       <td><input type="checkbox" name="QR2_SubsOnly" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SMTP_PUBLIC", 1, 'checked="checked" ', "")>></td>
                                </tr>
                
                                <!-- Moderated List? -->
                                <tr>
                                        <td><?_("Room post publication needs Aide permission.")></td>
-                                       <td><input type="checkbox" name="QR2_Moderated" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_MODERATED", 1, 'checked="checked" ', "")> /></td>
+                                       <td><input type="checkbox" name="QR2_Moderated" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_MODERATED", 1, 'checked="checked" ', "")>></td>
                                </tr>
                                <!-- Self Service subscription? -->
                                <tr>
                                        <td><?_("Allow self-service subscribe/unsubscribe requests.")></td>
-                                       <td><input type="checkbox" name="QR2_SelfList" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SELFLIST", 1, 'checked="checked" ', "")> /></td>
+                                       <td><input type="checkbox" name="QR2_SelfList" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SELFLIST", 1, 'checked="checked" ', "")>></td>
                                </tr>
                                <tr>
                                <!-- Give the admin some hint how to access the subscriber interface -->
@@ -69,9 +69,9 @@
 
                                <tr>
                                        <td colspan="2" align="center">
-                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
-                                               <input type="hidden" name="nonce" value="<?NONCE>" />
-                                               <input type="submit" name="add_button" value="<?_("Save changes")>" />
+                                               <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+                                               <input type="hidden" name="nonce" value="<?NONCE>">
+                                               <input type="submit" name="add_button" value="<?_("Save changes")>">
                                        </td>
                                </tr>
                        </table>
index f3152dd4441d7d3d61aeb5f0fb1a4ea2118544ce..517ab9a0cb53f08c52ed5557496c048b474f3749 100644 (file)
@@ -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/viewcontacts_48x.gif">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/contact.png">
        <?!("X", 3)>
        <?!("COND:ROOM:TYPE_IS", 4, #"VIEW_CALENDAR")>
-               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
         <?!("X", 4)>
        <?!("COND:ROOM:TYPE_IS", 5, #"VIEW_CALBRIEF")>
-               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
        <?!("X", 5)>
        <?!("COND:ROOM:TYPE_IS", 6, #"VIEW_TASKS")>
-               <img class="roompic" alt="" src="static/taskmanag_48x.gif" width="48" height="48">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/task.png">
        <?!("X", 6)>
        <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_NOTES")>
-               <img class="roompic" alt="" src="static/storenotes_48x.gif" width="48" height="48">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/note.png">
         <?!("X", 7)>
        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_MAILBOX")>
-               <img class="roompic" alt="" src="static/privatemess_48x.gif" width="48" height="48">
+               <img class="roompic" alt="" src="static/icons/essen/32x32/email.png">
         <?!("X", 8)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
+                <img class="roompic" alt="" src="static/icons/essen/32x32/room.png">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_JOURNAL")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
+                <img class="roompic" alt="" src="static/icons/essen/32x32/chat.png">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BLOG")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
+                <img class="roompic" alt="" src="static/icons/essen/32x32/blog.png">
         <?!("X", 9)>
 <??("X", 2)>
index d9c7bb9990fa083eb5e3f58fda1242ecfa5c9b51..4fd2369dfe930da0bf80de75ccf866b300c5949b 100644 (file)
@@ -1,6 +1,11 @@
-&nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>"><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/diskette_24x.gif" alt="<?_("Has Files")>"><??("X", 1)>
-<??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")><img src="/static/rss_16x.png" alt="<?_("Networked Room")>"><??("X", 2)>
-</span>
+&nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>">
+       <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")>">
+               <??("X", 1)>
+               <??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")>
+                       <img src="/static/icons/essen/16x16/network.png" alt="<?_("Networked Room")>">
+               <??("X", 2)>
+       </span>
 </a><br>
index cb948faa5edb4d4b2e4170cc76959e6508278bf4..2fd363441c756e1137c92b475fa09a286c81345a 100644 (file)
@@ -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/citadelchat_32x.gif" alt="">
+       <img src="static/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")>">
index 4037d2b8e8440b8ad3a0077cb0d35e7949ee8cde..1b14feed0c5b1ba9285e6183d07c4e6e5dcafdcf 100644 (file)
@@ -1,5 +1,3 @@
-
-
 <div id="note-<?VNOTE:UID>"
  class="stickynote_outer"
  style=" left: <?VNOTE:POS:LEFT>px; top: <?VNOTE:POS:TOP>px; width: <?VNOTE:POS:WIDTH>px; height: <?VNOTE:POS:HEIGHT>px; background-color: #<?VNOTE:COLOR>">
 >
 <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/8paint16.gif">
+<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/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/closewindow.gif">
+  src="static/icons/closewindow.gif">
 </td></tr></table>
 </div>
 <!--end title bar div; begin body div-->
index 25ca3e457abe98bdf73fff99b85ba2dcd8abfb4b..1ef171e83f931e44650f6f0f6c696be118b823c8 100644 (file)
@@ -2,27 +2,25 @@
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 
 <script type="text/javascript">
-function ConfirmKill() { 
-return confirm('<?_("Do you really want to kill this session?")>');
-}
+       function ConfirmKill() { 
+               return confirm('<?_("Do you really want to kill this session?")>');
+       }
 </script>
 
 <div id="banner">
-<div class="banner">
-<img alt="" src="static/usermanag_48x.gif">
-<h1>
-<?_("Users currently on ")><?SERV:HUMANNODE>
-</h1></div>
-<?=("loggedinas")>
-<div id="actiondiv">
-<ul class="room_actions">
-<li class="start_page">
-       <?OFFERSTARTPAGE>
-</li></ul>
-</div>
+       <div class="banner">
+               <img alt="" src="static/icons/essen/32x32/user.png">
+               <h1><?_("Users currently on ")><?SERV:HUMANNODE></h1>
+       </div>
+       <?=("loggedinas")>
+       <div id="actiondiv">
+               <ul class="room_actions">
+                       <li class="start_page"><?OFFERSTARTPAGE></li>
+               </ul>
+       </div>
 </div>
 <div id="content" class="who_is_online">
-<?DOBOXED(="who_box_list_static", ="who_list_static_header")>
+       <?DOBOXED(="who_box_list_static", ="who_list_static_header")>
 </div>
 <script type="text/javascript">
  new Ajax.PeriodicalUpdater('do_template', 'template=wholiststatic',
index d002e249365e3b5e049143a469d10e92d2ed8480..69a4c6822ebfe119f031f0e889ab6ac03875bf1f 100644 (file)
@@ -1,18 +1,18 @@
 <div id="who_inner" >
-<table class="altern">
- <tr>
-  <th class="edit_col"> </th>
-  <th colspan="2"> </th>
-  <th><?_("User name")></th>
-  <th><?_("Room")></th>
-  <th class="host_col"><?_("From host")></th>
-</tr>
-<?ITERATE("WHOLIST", ="who_section")>
-</table>
+       <table class="altern">
              <tr>
+                       <th class="edit_col"> </th>
+                       <th colspan="2"> </th>
+                       <th><?_("User name")></th>
+                       <th><?_("Room")></th>
+                       <th class="host_col"><?_("From host")></th>
+               </tr>
+               <?ITERATE("WHOLIST", ="who_section")>
+       </table>
 </div>
 <div class="instructions">
-<?_("Click on a name to read user info.  Click on")>
-<img align="middle" src="static/citadelchat_16x.gif" alt="(p)" border="0">
-<?_("to send an instant message to that user.")>
+       <?_("Click on a name to read user info.  Click on")>
+               <img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)">
+       <?_("to send an instant message to that user.")>
 </div>
 
index c160afeb064646e3c6b270ae74093a532e67097a..1c08ee449e5a826facf773e0e67077ffd5b36c5c 100644 (file)
@@ -1,31 +1,41 @@
 <tr class="<?ITERATE:ODDEVEN>">
-<td class="edit_col">
-<??("COND:AIDE", 1)><??("WHO:ISME", 2)>
- <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")></a>
-<??("X", 2)><??("X", 1)>
-<?!("WHO:ISME", 3)>   <a href="edit_me">(<?_("edit")>)</a>  <?!("X", 3)>
-</td>
-<!-- link to page this user -->
-<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-   <img align="middle" src="static/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
-</td>
-<!-- idle flag -->
-<td width="5%">
-<?!("WHO:IDLE", 4)>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
-<??("WHO:IDLE", 5)>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
-</td>
-<td>
-<!--  username (link to user bio/photo page)  -->
-<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
-<??("WHO:NSESSIONS", 6, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
-<!-- room -->
-</td><td>
-<?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
-</td>
-   <td class="host_col">
-<!-- hostname -->
-<?WHO:HOST("X")>
-<?!("WHO:REALHOST", 8)> <br><i> <?WHO:REALHOST("X")></i><?!("X", 8)>
-</td>
+       <td class="edit_col">
+               <??("COND:AIDE", 1)><??("WHO:ISME", 2)>
+                       <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")></a>
+               <??("X", 2)><??("X", 1)>
+               <?!("WHO:ISME", 3)>   <a href="edit_me">(<?_("edit")>)</a>  <?!("X", 3)>
+       </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> 
+               </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")>)">
+                       <?!("X", 4)>
+                       <??("WHO:IDLE", 5)>
+                               <img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+                       <?!("X", 5)>
+               </td>
+               <td>
+       <!--  username (link to user bio/photo page)  -->
+               <a href="showuser?who=<?WHO:NAME("U")>">
+                       <?WHO:NAME("X")></a> 
+                               <??("WHO:NSESSIONS", 6, 1)>[<?WHO:NSESSIONS>] </a>
+                       <?!("X", 6)>
+               <!-- room -->
+               </td>
+               <td>
+                       <?WHO:ROOM>
+                       <?!("WHO:REALROOM", 7)>
+                               <br><i>  <?WHO:REALROOM("X")>  </i>
+                       <?!("X", 7)>
+               </td>
+               <td class="host_col">
+               <!-- hostname -->
+                       <?WHO:HOST("X")>
+                               <?!("WHO:REALHOST", 8)><br><i> <?WHO:REALHOST("X")></i>
+                       <?!("X", 8)>
+               </td>
 </tr>
index b9a256bfbb95ca7cd236dd6626f121acdf586a1e..9d404a941107902be9ca9b125af7ec9f0eaa8ec0 100644 (file)
@@ -1,20 +1,25 @@
 <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/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
-</td>
-<!-- idle flag -->
-<td width="5%">
-<?!("WHO:IDLE", 4)>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
-<??("WHO:IDLE", 5)>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
-</td>
-<td>
-<!--  username (link to user bio/photo page)  -->
-<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
-<??("WHO:NSESSIONS", 6, 0, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
-<!-- room -->
-</td><td>
-<?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
-</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> 
+       </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")>)">
+               <?!("X", 4)>
+               <??("WHO:IDLE", 5)>
+                       <img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+               <?!("X", 5)>
+       </td>
+       <td>
+               <!--  username (link to user bio/photo page)  -->
+               <a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
+               <??("WHO:NSESSIONS", 6, 0, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
+               <!-- room -->
+       </td>
+       <td>
+               <?WHO:ROOM>
+               <?!("WHO:REALROOM", 7)><br><i>  <?WHO:REALROOM("X")>  </i><?!("X", 7)>
+       </td>
 </tr>
diff --git a/webcit/static/throbber.gif b/webcit/static/throbber.gif
deleted file mode 100644 (file)
index 772aa89..0000000
Binary files a/webcit/static/throbber.gif and /dev/null differ
diff --git a/webcit/static/up_pointer.gif b/webcit/static/up_pointer.gif
deleted file mode 100644 (file)
index 83e5e61..0000000
Binary files a/webcit/static/up_pointer.gif and /dev/null differ
index 837fbd87ff6574af4da67923b3cb0128c985e044..c737e75fb8502c446fd16475c3ae7ccf26bd0a3f 100644 (file)
@@ -2435,9 +2435,9 @@ enum {
 };
 
 ConstStr SortIcons[] = {
-       {HKEY("static/sort_none.gif")},
-       {HKEY("static/up_pointer.gif")},
-       {HKEY("static/down_pointer.gif")},
+       {HKEY("static/icons/sort_none.gif")},
+       {HKEY("static/icons/up_pointer.gif")},
+       {HKEY("static/icons/down_pointer.gif")},
 };
 
 ConstStr SortNextOrder[] = {
index 1e0d8e160865175109f668dfa862a9e272d84817..ed7bbef4777dcffcc86ba12895d0ab1d04badbd0 100644 (file)
@@ -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/summscreen_48x.gif\"></td>");
+        wc_printf("<td><img src=\"static/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))
index 845978a7471dc7c356dc2e2aea5b9aa3c1a10e89..b9c08818ac4791acca7f03ce6309ac2040b0b1f6 100644 (file)
@@ -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/usermanag_48x.gif\">");
+       wc_printf("<img src=\"static/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/citadelchat_24x.gif\" "
+               "<img src=\"static/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);
index 3fbde0520987b241b3100fca00a0e156222deb4e..4934cf6ee4a9b39083d01f6586f4093f0e4f5e51 100644 (file)
@@ -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/viewcontacts_48x.gif\">"
+      "<img align=\"center\" src=\"static/icons/essen/32x32/contact.png\">"
       "<font size=\"+1\"><b>");
                        StrEscAppend(Target, NULL, fullname, 0, 0);
                        StrBufAppendPrintf(Target, "</b></font>");