* The 'delete' button on sticky notes now works.
authorArt Cancro <ajc@citadel.org>
Tue, 6 May 2008 16:44:46 +0000 (16:44 +0000)
committerArt Cancro <ajc@citadel.org>
Tue, 6 May 2008 16:44:46 +0000 (16:44 +0000)
* Removed old-style notes interface.  The new one is now required.

webcit/messages.c
webcit/notes.c
webcit/static/wclib.js
webcit/webcit.c

index ab45068e9d0c99ad801bc08e1d743d2ddf01e000..212734d237bef082d6c77e1793107c5a68d90fce 100644 (file)
@@ -2471,7 +2471,6 @@ void readloop(char *oper)
        }
 
        if (is_notes) {
-               wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
                wprintf("<div id=\"new_notes_here\"></div>\n");
        }
 
@@ -2712,13 +2711,6 @@ void readloop(char *oper)
                /** end bbview scroller */
        }
 
-       if (is_notes)
-       {
-               wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
-       }
-
-
-
        for (a = 0; a < nummsgs; ++a) {
                if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
@@ -2882,40 +2874,6 @@ void readloop(char *oper)
                /** end bbview scroller */
        }
        
-       if (is_notes)
-       {
-//             wprintf ("</div>\n");
-               wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
-               wprintf ("<script type=\"text/javascript\">\n");
-//             wprintf ("//<![CDATA[\n");
-               wprintf ("Droppables.add(\"wastebin\",\n");
-               wprintf ("\t{\n");
-               wprintf ("\t\taccept:'notes',\n");
-               wprintf ("\t\tonDrop:function(element)\n");
-               wprintf ("\t\t{\n");
-               wprintf ("\t\t\tElement.hide(element);\n");
-               wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
-               wprintf ("\t\t\t{\n");
-               wprintf ("\t\t\t\tasynchronous:true,\n");
-               wprintf ("\t\t\t\tevalScripts:true,\n");
-               wprintf ("\t\t\t\tonComplete:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tonLoading:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.show('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
-               wprintf ("\t\t\t})\n");
-               wprintf ("\t\t}\n");
-               wprintf ("\t})\n");
-//             wprintf ("//]]>\n");
-               wprintf ("</script>\n");
-       }
-
-
-
 DONE:
        if (is_tasks) {
                do_tasks_view();        /** Render the task list */
index 7497746ca5dc3e4ecf6775e5b326925a2867ec09..b4a08b469d14cda35049f6dfc3e570224cb09205 100644 (file)
@@ -7,161 +7,6 @@
 #include "groupdav.h"
 #include "webserver.h"
 
-
-/*
- * Uncomment this #define in order to get the new vNote-based sticky notes view.
- * We're keeping both versions here so that I can work on the new view without breaking
- * the existing implementation prior to completion.
- */
-
-/* #define NEW_NOTES_VIEW */
-
-
-#ifndef NEW_NOTES_VIEW
-/*
- * display sticky notes
- *
- * msgnum = Message number on the local server of the note to be displayed
- */
-void display_note(long msgnum, int unread)
-{
-       char buf[SIZ];
-       char notetext[SIZ];
-       char display_notetext[SIZ];
-       char eid[128];
-       int in_text = 0;
-       int i, len;
-
-       serv_printf("MSG0 %ld", msgnum);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wprintf("%s<br />\n", &buf[4]);
-               return;
-       }
-
-       strcpy(notetext, "");
-       strcpy(eid, "");
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-               /* Fill the buffer */
-               if ( (in_text) && (strlen(notetext) < SIZ-256) ) {
-                       strcat(notetext, buf);
-               }
-
-               if ( (!in_text) && (!strncasecmp(buf, "exti=", 5)) ) {
-                       safestrncpy(eid, &buf[5], sizeof eid);
-               }
-
-               if ( (!in_text) && (!strcasecmp(buf, "text")) ) {
-                       in_text = 1;
-               }
-       }
-
-       /* Now sanitize the buffer */
-       len = strlen(notetext);
-       for (i=0; i<len; ++i) {
-               if (isspace(notetext[i])) notetext[i] = ' ';
-       }
-
-       /* Make it HTML-happy and print it. */
-       stresc(display_notetext, SIZ, notetext, 0, 0);
-
-       /* Lets try it as a draggable */
-       if (!IsEmptyStr(eid)) {
-               wprintf ("<IMG ALIGN=MIDDLE src=\"static/storenotes_48x.gif\" id=\"note_%s\" alt=\"Note\" ", eid); 
-               wprintf ("class=\"notes\">\n");
-               wprintf ("<script type=\"text/javascript\">\n");
-               wprintf ("new Draggable (\"note_%s\", {revert:true})\n", eid);
-               wprintf ("</script>\n");
-       }
-       else {
-               wprintf ("<IMG ALIGN=MIDDLE src=\"static/storenotes_48x.gif\" id=\"note_%ld\" ", msgnum); 
-               wprintf ("class=\"notes\">\n");
-               wprintf ("<script type=\"text/javascript\">\n");
-               wprintf ("new Draggable (\"note_%ld\", {revert:true})\n", msgnum);
-               wprintf ("</script>\n");
-       }
-       
-       if (!IsEmptyStr(eid)) {
-               wprintf("<span id=\"note%s\">%s</span><br />\n", eid, display_notetext);
-       }
-       else {
-               wprintf("<span id=\"note%ld\">%s</span><br />\n", msgnum, display_notetext);
-       }
-
-       /* Offer in-place editing. */
-       if (!IsEmptyStr(eid)) {
-               wprintf("<script type=\"text/javascript\">"
-                       "new Ajax.InPlaceEditor('note%s', 'updatenote?nonce=%ld?eid=%s', {rows:5,cols:72});"
-                       "</script>\n",
-                       eid,
-                       WC->nonce,
-                       eid
-               );
-       }
-}
-#endif
-
-
-/*
- * This gets called by the Ajax.InPlaceEditor when we save a note.
- */
-void updatenote(void)
-{
-       char buf[SIZ];
-       char notetext[SIZ];
-       char display_notetext[SIZ];
-       long msgnum;
-       int in_text = 0;
-       int i, len;
-
-       serv_printf("ENT0 1||0|0||||||%s", bstr("eid"));
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '4') {
-               text_to_server(bstr("value"));
-               serv_puts("000");
-       }
-
-       begin_ajax_response();
-       msgnum = locate_message_by_uid(bstr("eid"));
-       if (msgnum >= 0L) {
-               serv_printf("MSG0 %ld", msgnum);
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       strcpy(notetext, "");
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               
-                               /* Fill the buffer */
-                               if ( (in_text) && (strlen(notetext) < SIZ-256) ) {
-                                       strcat(notetext, buf);
-                               }
-               
-                               if ( (!in_text) && (!strcasecmp(buf, "text")) ) {
-                                       in_text = 1;
-                               }
-                       }
-                       /* Now sanitize the buffer */
-                       len = strlen(notetext);
-                       for (i=0; i<len; ++i) {
-                               if (isspace(notetext[i])) notetext[i] = ' ';
-                       }
-               
-                       /* Make it HTML-happy and print it. */
-                       stresc(display_notetext, SIZ, notetext, 0, 0);
-                       wprintf("%s\n", display_notetext);
-               }
-       }
-       else {
-               wprintf("%s", _("An error has occurred."));
-       }
-
-       end_ajax_response();
-}
-
-
-
-
-
 /*
  * Display a <div> containing a rendered sticky note.
  */
@@ -191,9 +36,9 @@ void display_vnote_div(struct vnote *v) {
        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=right valign=middle "
-               // "onclick=\"javascript:$('address_book_popup').style.display='none';\" "
-               "><img src=\"static/closewindow.gif\">");
+       wprintf("<td align=right valign=middle>");
+       wprintf("<img onclick=\"DeleteStickyNote(event,'%s','%s')\" ", v->uid, _("Delete this note?") );
+       wprintf("src=\"static/closewindow.gif\">");
        wprintf("</td></tr></table>");
 
        wprintf("</div>\n");
@@ -343,6 +188,20 @@ void ajax_update_note(void) {
                return;
        }
        msgnum = atol(&buf[4]);
+
+       // Was this request a delete operation?  If so, nuke it...
+       if (havebstr("deletenote")) {
+               if (!strcasecmp(bstr("deletenote"), "yes")) {
+                       serv_printf("DELE %ld", msgnum);
+                       serv_getln(buf, sizeof buf);
+                       begin_ajax_response();
+                       wprintf("%s", buf);
+                       end_ajax_response();
+                       return;
+               }
+       }
+
+       // If we get to this point it's an update, not a delete
        v = vnote_new_from_msg(msgnum);
        if (!v) {
                begin_ajax_response();
@@ -391,10 +250,6 @@ void ajax_update_note(void) {
 
 
 
-
-
-#ifdef NEW_NOTES_VIEW
-
 /*
  * display sticky notes
  *
@@ -420,4 +275,3 @@ void display_note(long msgnum, int unread) {
        }
 }
 
-#endif
index 853f01b353721f78f4a0f51e536f0176c77f6f62..5eec5d0d4a45043610bc51bd078ce758319c809a 100644 (file)
@@ -571,13 +571,26 @@ function NotesResizeMouseDown(evt, uid) {
 }
 
 
+function DeleteStickyNote(evt, uid, confirmation_prompt) {
+       uid_of_note_being_deleted = uid;
+       d = $('note-' + uid_of_note_being_deleted);
 
+       if (confirm(confirmation_prompt)) {
+               new Effect.Puff(d);
 
-
-
-
-
-
+               // submit an ajax http call to delete it on the server
+               p = 'note_uid=' + uid_of_note_being_deleted
+                       + '&deletenote=yes'
+                       + '&r=' + CtdlRandomString();
+               new Ajax.Request(
+                       'ajax_update_note',
+                       {
+                               method: 'post',
+                               parameters: p
+                       }
+               );
+       }
+}
 
 
 
@@ -723,23 +736,6 @@ function ctdl_ts_getInnerText(el) {
 }
 
 
-
-// This function handles the creation of new notes in the "Notes" view.
-//
-function add_new_note() {
-
-       new_eid = CtdlRandomString();
-
-       $('new_notes_here').innerHTML = $('new_notes_here').innerHTML
-               + '<IMG ALIGN=MIDDLE src=\"static/storenotes_48x.gif\" id=\"' + new_eid + '\" alt=\"Note\" class=\"notes\">'
-               + '<script type=\"text/javascript\">new Draggable (\"%s\", {revert:true})</script>'
-               + '<span id=\"note' + new_eid + '\">' + Date() + '</span><br />'
-       ;
-
-       new Ajax.InPlaceEditor('note' + new_eid,
-               'updatenote?eid=' + new_eid , {rows:5,cols:72});
-}
-
 function CtdlShowRaw(msgnum) {
 var customnav = document.createElement("span");
 var mode_citadel = document.createElement("a");
index 0d16385cb075478d631940cdc27ba74df14dc056..7aefacf22476b7c7c74e07d90f4d9a58286c6d12 100644 (file)
@@ -2063,8 +2063,6 @@ void session_loop(struct httprequest *req)
                dump_vars();
                wprintf("</PRE><hr />\n");
                wDumpContent(1);
-       } else if (!strcasecmp(action, "updatenote")) {
-               updatenote();
        } else if (!strcasecmp(action, "ajax_update_note")) {
                ajax_update_note();
        } else if (!strcasecmp(action, "display_room_directory")) {