Added code to activate color selection in javascript.

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index 5e79ba5c609c7e4dd5bdee4d82349dd84535a728..f4f31b416f30faeb8cd1f96ef9f1290f0cfea220 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -7,16 +7,16 @@
 #include "groupdav.h"
 #include "webserver.h"
 
-char *pastel_palette[] = {
-       "#bfbfbf",
-       "#ffbfbf",
-       "#bfbfff",
-       "#ffffbf",
-       "#bfffbf",
-       "#ffbfff",
-       "#bfffff",
-       "#ffbfbf",
-       "#bfbfbf"
+int pastel_palette[9][3] = {
+       { 0x80, 0x80, 0x80 },
+       { 0xff, 0x80, 0x80 },
+       { 0x80, 0x80, 0xff },
+       { 0xff, 0xff, 0x80 },
+       { 0x80, 0xff, 0x80 },
+       { 0xff, 0x80, 0xff },
+       { 0x80, 0xff, 0xff },
+       { 0xff, 0x80, 0x80 },
+       { 0x80, 0x80, 0x80 }
 };
 
 
@@ -50,17 +50,27 @@ void display_vnote_div(struct vnote *v) {
        wprintf("<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%%><tr>");
 
        wprintf("<td align=left valign=middle>");
-       wprintf("<img onclick=\"$('palette-%s').style.display = 'block';\" ", v->uid);
+       wprintf("<img onclick=\"NotesClickPalette(event,'%s')\" ", v->uid);
        wprintf("src=\"static/8paint16.gif\">");
 
        /* embed color selector */
        wprintf("<div id=\"palette-%s\" ", v->uid);
        wprintf("class=\"stickynote_palette\" ");
-       wprintf("style=\"display:none;\" >");
        wprintf("<table border=0 cellpadding=0 cellspacing=0>");
        for (i=0; i<9; ++i) {
                if ((i%3)==0) wprintf("<tr>");
-               wprintf("<td bgcolor=\"%s\"> </td>", pastel_palette[i]);
+               wprintf("<td ");
+               wprintf("onClick=\"NotesClickColor(event,'%s',%d,%d,%d)\" ",
+                       v->uid,
+                       pastel_palette[i][0],
+                       pastel_palette[i][1],
+                       pastel_palette[i][2]
+               );
+               wprintf("bgcolor=\"#%02x%02x%02x\"> </td>",
+                       pastel_palette[i][0],
+                       pastel_palette[i][1],
+                       pastel_palette[i][2]
+               );
                if (((i+1)%3)==0) wprintf("</tr>");
        }
        wprintf("</table>");
@@ -164,9 +174,9 @@ struct vnote *vnote_new_from_msg(long msgnum) {
                        if (!vnote_from_body) {
                                vnote_from_body = vnote_new();
                                vnote_from_body->uid = strdup(uid_from_headers);
-                               vnote_from_body->color_red = 0xFF;
-                               vnote_from_body->color_green = 0xFF;    // pastel yellow
-                               vnote_from_body->color_blue = 0xBF;
+                               vnote_from_body->color_red = pastel_palette[3][0];
+                               vnote_from_body->color_green = pastel_palette[3][1];
+                               vnote_from_body->color_blue = pastel_palette[3][2];
                                vnote_from_body->body = malloc(32768);
                                vnote_from_body->body[0] = 0;
                                body_len = 0;
@@ -338,9 +348,9 @@ void add_new_note(void) {
        if (v) {
                v->uid = malloc(128);
                generate_uuid(v->uid);
-               v->color_red = 0xFF;
-               v->color_green = 0xFF;  // pastel yellow
-               v->color_blue = 0xBF;
+               v->color_red = pastel_palette[3][0];
+               v->color_green = pastel_palette[3][1];
+               v->color_blue = pastel_palette[3][2];
                v->body = strdup(_("Click on any note to edit it."));
                write_vnote_to_server(v);
                vnote_free(v);