Color selector for sticky notes is now opaque instead

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index b4a08b469d14cda35049f6dfc3e570224cb09205..1fcb6213d5870eff42a2d65344a4f1ea23eb01e1 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -7,10 +7,24 @@
 #include "groupdav.h"
 #include "webserver.h"
 
+char *pastel_palette[] = {
+       "#808080",
+       "#ff8080",
+       "#8080ff",
+       "#ffff80",
+       "#80ff80",
+       "#ff80ff",
+       "#80ffff",
+       "#ff8080",
+       "#808080"
+};
+
+
 /*
  * Display a <div> containing a rendered sticky note.
  */
 void display_vnote_div(struct vnote *v) {
+       int i;
 
        /* begin outer div */
 
@@ -34,7 +48,26 @@ void display_vnote_div(struct vnote *v) {
        wprintf("\">");
 
        wprintf("<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%%><tr>");
-       wprintf("<td></td>");   // nothing in the title bar, it's just for dragging
+
+       wprintf("<td align=left valign=middle>");
+       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("<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]);
+               if (((i+1)%3)==0) wprintf("</tr>");
+       }
+       wprintf("</table>");
+       wprintf("</div>");
+
+       wprintf("</td>");
+
+       wprintf("<td></td>");   // nothing in the title bar, it's just for resizing
 
        wprintf("<td align=right valign=middle>");
        wprintf("<img onclick=\"DeleteStickyNote(event,'%s','%s')\" ", v->uid, _("Delete this note?") );
@@ -130,6 +163,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 = 0x80;
                                vnote_from_body->body = malloc(32768);
                                vnote_from_body->body[0] = 0;
                                body_len = 0;
@@ -162,6 +198,26 @@ struct vnote *vnote_new_from_msg(long msgnum) {
 }
 
 
+/*
+ * Serialize a vnote and write it to the server
+ */
+void write_vnote_to_server(struct vnote *v) 
+{
+       char buf[1024];
+
+       serv_puts("ENT0 1|||4");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '4') {
+               serv_puts("Content-type: text/vnote");
+               serv_puts("");
+               serv_puts(vnote_serialize(v));
+               serv_puts("000");
+       }
+}
+
+
+
+
 /*
  * Background ajax call to receive updates from the browser when a note is moved, resized, or updated.
  */
@@ -188,6 +244,7 @@ void ajax_update_note(void) {
                return;
        }
        msgnum = atol(&buf[4]);
+       lprintf(9, "Note msg = %ld\n", msgnum);
 
        // Was this request a delete operation?  If so, nuke it...
        if (havebstr("deletenote")) {
@@ -229,14 +286,7 @@ void ajax_update_note(void) {
        }
 
        /* Serialize it and save it to the message base.  Server will delete the old one. */
-       serv_puts("ENT0 1|||4");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '4') {
-               serv_puts("Content-type: text/vnote");
-               serv_puts("");
-               serv_puts(vnote_serialize(v));
-               serv_puts("000");
-       }
+       write_vnote_to_server(v);
 
        begin_ajax_response();
        if (v->body) {
@@ -275,3 +325,25 @@ void display_note(long msgnum, int unread) {
        }
 }
 
+
+
+/*
+ * Create a new note
+ */
+void add_new_note(void) {
+       struct vnote *v;
+
+       v = vnote_new();
+       if (v) {
+               v->uid = malloc(128);
+               generate_uuid(v->uid);
+               v->color_red = 0xFF;
+               v->color_green = 0xff;  // pastel yellow
+               v->color_blue = 0x80;
+               v->body = strdup(_("Click on any note to edit it."));
+               write_vnote_to_server(v);
+               vnote_free(v);
+       }
+       
+       readloop("readfwd");
+}