From 4c9f5cbc2190bee39df82586465e2d89c4d33eeb Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 12 Oct 2015 19:49:52 +0200 Subject: [PATCH] Start migrating the vcard editing formulars to templates --- webcit/static/roomops.js | 154 +++- webcit/static/t/test_vcard.html | 22 +- webcit/static/t/vcard/edit.html | 78 ++ webcit/static/t/vcard/edit/email.html | 1 + webcit/static/t/vcard/edit/one_email.html | 1 + webcit/static/wclib.js | 821 ++++++++++------------ webcit/vcard_edit.c | 331 +-------- 7 files changed, 626 insertions(+), 782 deletions(-) create mode 100644 webcit/static/t/vcard/edit.html create mode 100644 webcit/static/t/vcard/edit/email.html create mode 100644 webcit/static/t/vcard/edit/one_email.html diff --git a/webcit/static/roomops.js b/webcit/static/roomops.js index e91b386fe..d9c6c5ceb 100644 --- a/webcit/static/roomops.js +++ b/webcit/static/roomops.js @@ -9,7 +9,7 @@ var rooms = null; // FLOOR list var floors = null; -var roomsForFloors = new Array(); +var roomsForFloors = []; /* STRUCT KEYS */ /* LKRN etc. */ var RN_ROOM_NAME = 0; @@ -40,7 +40,7 @@ var VIEW_WIKI = 6; var VIEW_CALBRIEF = 7; var VIEW_JOURNAL = 8; -function FillRooms(callback) { +function fillRooms(callback) { var roomFlr = new Ajax.Request("json_roomflr?SortBy=byfloorroom?SortOrder=1", {method: 'get', onSuccess: function(transport) { ProcessRoomFlr(transport); callback.call(); }}); } function ProcessRoomFlr(transport) { @@ -62,7 +62,7 @@ function GetRoomsByFloorNum(flnum) { } return roomsForFloor; } -function GetMailboxRooms() { +function getMailboxRooms() { var roomsForFloor = new Array(); var x=0; for(var i=0; i 800) { + mvCommand = "g_cmd=MOVE%20" + msgIds + "|"+encodeURIComponent(room)+"|0"; + new Ajax.Request("ajax_servcmd", { + parameters: mvCommand, + method: 'post', + }); + msgIds = ""; + } + } + + } + mvCommand = "g_cmd=MOVE%20" + msgIds + "|"+encodeURIComponent(room)+"|0"; + new Ajax.Request('ajax_servcmd', { + method: 'post', + parameters: mvCommand, + onComplete: deleteAllMarkedRows()}); + } +} +function expandFloorEvent(event) { + expandFloor(event.target); +} +function expandFloor(target) { + if (target.nodeName.toLowerCase() !== "span") { + return; // ignore clicks on child UL + } + ctdlLocalPrefs.setPref("rooms_expanded", target.firstChild.nodeValue); + var parentUL = target.parentNode; + if (currentlyExpandedFloor !== null) { + currentlyExpandedFloor.className = currentlyExpandedFloor.className.replace("floor-expanded",""); + } + parentUL.className = parentUL.className + " floor-expanded"; + currentlyExpandedFloor = parentUL; +} diff --git a/webcit/static/t/test_vcard.html b/webcit/static/t/test_vcard.html index fbd886504..7c3afe287 100644 --- a/webcit/static/t/test_vcard.html +++ b/webcit/static/t/test_vcard.html @@ -1 +1,21 @@ - +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +lastname: +firstname: +middlename: +prefix: +suffix: + +VC:.tel;cell: X-----X +______________________________ + +------------------------------ + +------------------------------ + + - PLZ: + - Addr1: + - Addr2: + - City: + - state: + - zip: + - country: diff --git a/webcit/static/t/vcard/edit.html b/webcit/static/t/vcard/edit.html new file mode 100644 index 000000000..cc0430a6c --- /dev/null +++ b/webcit/static/t/vcard/edit.html @@ -0,0 +1,78 @@ + + +
+ + +
+ + + + + + + + + + + + + + + +
+ + + + +
+


+


+


+ 		+ + + + + + + + + +
+ +
+ + + + + + + + +
+ + + +
+ + + + + +

+
+
+
+
+ + + + +
+ 
+
+ diff --git a/webcit/static/t/vcard/edit/email.html b/webcit/static/t/vcard/edit/email.html new file mode 100644 index 000000000..fa0100949 --- /dev/null +++ b/webcit/static/t/vcard/edit/email.html @@ -0,0 +1 @@ + diff --git a/webcit/static/t/vcard/edit/one_email.html b/webcit/static/t/vcard/edit/one_email.html new file mode 100644 index 000000000..0ef8e5376 --- /dev/null +++ b/webcit/static/t/vcard/edit/one_email.html @@ -0,0 +1 @@ + diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 9a159a112..9c580060a 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -1,3 +1,5 @@ +/*jshint strict: false, bitwise: false */ +/*global document, window, Ajax, currentlyMarkedRows, Event, event, taskViewActivate, setTimeout, fillRooms, $, ctdlLocalPrefs, currentDropTargets, iconBarRoomList, confirm, Effect */ /* * JavaScript function library for WebCit. * @@ -22,13 +24,12 @@ var room_is_trash = 0; var currentlyExpandedFloor = null; var roomlist = null; -var currentDropTarget = null; var supportsAddEventListener = (!!document.addEventListener); var today = new Date(); var wc_log = ""; -if (document.all) {browserType = "ie"} +if (document.all) {browserType = "ie";} if (window.navigator.userAgent.toLowerCase().match("gecko")) { browserType= "gecko"; } @@ -37,7 +38,7 @@ Event.observe(window, 'load', ToggleTaskDateOrNoDateActivate); Event.observe(window, 'load', taskViewActivate); //document.observe("dom:loaded", setupPrefEngine); document.observe("dom:loaded", setupIconBar); -function CtdlRandomString() { +function ctdlRandomString() { return((Math.random()+'').substr(3)); } function strcmp ( str1, str2 ) { @@ -51,30 +52,37 @@ function strcmp ( str1, str2 ) { // * example 2: strcmp( 'owald', 'waldo' ); // * returns 2: -1 - return ( ( str1 == str2 ) ? 0 : ( ( str1 > str2 ) ? 1 : -1 ) ); + return ( ( str1 === str2 ) ? 0 : ( ( str1 > str2 ) ? 1 : -1 ) ); } -function CtdlMarkLog($Which, $Status) +function ctdlMarkLog(Which, Status) { - if ($Status) - document.getElementById($Which).checked == false; - else - document.getElementById($Which).checked == true; + if (Status) { + document.getElementById(Which).checked = false; + } + else { + document.getElementById(Which).checked = true; + } } -function ToggleLogEnable($Which) +function ToggleLogEnable(Which) { var p; - var Status = !document.getElementById($Which).checked; - if (Status) - p= encodeURI('g_cmd=LOGS ' + $Which + '|0'); - else - p= encodeURI('g_cmd=LOGS ' + $Which + '|1'); - new Ajax.Request('ajax_servcmd', { - method: 'post', - parameters: p, - onComplete: CtdlMarkLog($Which, Status) - }); + var element = document.getElementById(Which); + if (element.hasOwnProperty('checked')) { + var Status = element.checked; + if (!Status) { + p = encodeURI('g_cmd=LOGS ' + Which + '|0'); + } + else { + p = encodeURI('g_cmd=LOGS ' + Which + '|1'); + } + new Ajax.Request('ajax_servcmd', { + method: 'post', + parameters: p, + onComplete: ctdlMarkLog(Which, Status) + }); + } } function SMTPRunQueue() @@ -102,35 +110,38 @@ function NetworkSynchronizeRoom(NodeName) } function ToggleVisibility ($Which) { - if (document.getElementById) - { - if (document.getElementById($Which).style.display == "none") - document.getElementById($Which).style.display = "inline"; - else - document.getElementById($Which).style.display = "none"; + if (document.getElementById) + { + if (document.getElementById($Which).style.display === "none") { + document.getElementById($Which).style.display = "inline"; } + else { + document.getElementById($Which).style.display = "none"; + } + } } function emptyElement(element) { - childNodes = element.childNodes; + var childNodes = element.childNodes; for(var i=0; i 0) { - for (i=0; i= 0) { - extracted_string = extracted_string.substr(j+1); - } - } - } + var j, i = 0; + var extracted_string = source_string; - j = extracted_string.indexOf(delimiter); - if (j >= 0) { - extracted_string = extracted_string.substr(0, j); + if (token_num > 0) { + for (i=0; i= 0) { + extracted_string = extracted_string.substr(j+1); + } } + } + + j = extracted_string.indexOf(delimiter); + if (j >= 0) { + extracted_string = extracted_string.substr(0, j); + } - return extracted_string; + return extracted_string; } function CtdlSpawnContextMenu(event, source) { @@ -187,53 +198,54 @@ function disintergrateContextMenus(event) { } // This code handles the popups for important-messages. function hide_imsg_popup() { - if (browserType == "gecko") { - document.poppedLayer = eval('document.getElementById(\'important_message\')'); - } - else if (browserType == "ie") { - document.poppedLayer = eval('document.all[\'important_message\']'); - } - else { - document.poppedLayer = eval('document.layers[\'`important_message\']'); - } + if (browserType === "gecko") { + document.poppedLayer = eval('document.getElementById(\'important_message\')'); + } + else if (browserType === "ie") { + document.poppedLayer = eval('document.all[\'important_message\']'); + } + else { + document.poppedLayer = eval('document.layers[\'`important_message\']'); + } - document.poppedLayer.style.visibility = "hidden"; + document.poppedLayer.style.visibility = "hidden"; } function remove_something(what_to_search, new_visibility) { - if (browserType == "gecko") { - document.poppedLayer = eval('document.getElementById(\'' + what_to_search + '\')'); - } - else if (browserType == "ie") { - document.poppedLayer = eval('document.all[\'' + what_to_search + '\']'); - } - else { - document.poppedLayer = eval('document.layers[\'`' + what_to_search + '\']'); - } - if (document.poppedLayer!= null) + if (browserType === "gecko") { + document.poppedLayer = eval('document.getElementById(\'' + what_to_search + '\')'); + } + else if (browserType === "ie") { + document.poppedLayer = eval('document.all[\'' + what_to_search + '\']'); + } + else { + document.poppedLayer = eval('document.layers[\'`' + what_to_search + '\']'); + } + if (document.poppedLayer !== null) { document.poppedLayer.innerHTML = ""; + } } function unhide_imsg_popup() { - if (browserType == "gecko") { - document.poppedLayer = eval('document.getElementById(\'important_message\')'); - } - else if (browserType == "ie") { - document.poppedLayer = eval('document.all[\'important_message\']'); - } - else { - document.poppedLayer = eval('document.layers[\'`important_message\']'); - } + if (browserType === "gecko") { + document.poppedLayer = eval('document.getElementById(\'important_message\')'); + } + else if (browserType === "ie") { + document.poppedLayer = eval('document.all[\'important_message\']'); + } + else { + document.poppedLayer = eval('document.layers[\'`important_message\']'); + } - document.poppedLayer.style.visibility = "visible"; + document.poppedLayer.style.visibility = "visible"; setTimeout('hide_imsg_popup()', 5000); } function ajax_important_message(messagetext) { - if (browserType == "gecko") { + if (browserType === "gecko") { document.poppedLayer = eval('document.getElementById(\'important_message\')'); } - else if (browserType == "ie") { + else if (browserType === "ie") { document.poppedLayer = eval('document.all[\'important_message\']'); } else { @@ -259,17 +271,17 @@ function activate_iconbar_wholist_populat0r() function setupIconBar() { /* WARNING: VILE, SLEAZY HACK. We determine the state of the box based on the image loaded. */ - if ( $('expand_roomlist').src.substring($('expand_roomlist').src.length - 12) == "collapse.gif" ) { + if ( $('expand_roomlist').src.substring($('expand_roomlist').src.length - 12) === "collapse.gif" ) { $('roomlist').style.display = 'block'; $('roomlist').innerHTML = ''; - FillRooms(IconBarRoomList); + fillRooms(iconBarRoomList); } else { $('roomlist').style.display = 'none'; } /* WARNING: VILE, SLEAZY HACK. We determine the state of the box based on the image loaded. */ - if ( $('expand_wholist').src.substring($('expand_wholist').src.length - 12) == "collapse.gif" ) { + if ( $('expand_wholist').src.substring($('expand_wholist').src.length - 12) === "collapse.gif" ) { $('online_users').style.display = 'block'; activate_iconbar_wholist_populat0r(); } @@ -279,150 +291,6 @@ function setupIconBar() { } -function GenericTreeRoomList(roomlist) { - var currentExpanded = ctdlLocalPrefs.readPref("rooms_expanded"); - var curRoomName = ""; - if (document.getElementById("rmname")) { - curRoomName = getTextContent(document.getElementById("rmname")); - } - currentDropTargets = new Array(); - var iconbar = document.getElementById("iconbar"); - var ul = document.createElement("ul"); - roomlist.appendChild(ul); - // Add mailbox, because they are special - var mailboxLI = document.createElement("li"); - ul.appendChild(mailboxLI); - var mailboxSPAN = document.createElement("span"); - var _mailbox = getTextContent(document.getElementById("mbox_template")); - mailboxSPAN.appendChild(document.createTextNode(_mailbox)); - $(mailboxSPAN).observe('click', expandFloorEvent); - mailboxLI.appendChild(mailboxSPAN); - mailboxLI.className = "floor"; - var mailboxUL = document.createElement("ul"); - mailboxLI.appendChild(mailboxUL); - var mailboxRooms = GetMailboxRooms(); - for(var i=0; i 800) { - var mvCommand = "g_cmd=MOVE%20" + msgIds + "|"+encodeURIComponent(room)+"|0"; - new Ajax.Request("ajax_servcmd", { - parameters: mvCommand, - method: 'post', - }); - msgIds = ""; - } - - } - var mvCommand = "g_cmd=MOVE%20" + msgIds + "|"+encodeURIComponent(room)+"|0"; - new Ajax.Request('ajax_servcmd', { - method: 'post', - parameters: mvCommand, - onComplete: deleteAllMarkedRows()}); - } -} -function expandFloorEvent(event) { - expandFloor(event.target); -} -function expandFloor(target) { - if (target.nodeName.toLowerCase() != "span") { - return; // ignore clicks on child UL - } - ctdlLocalPrefs.setPref("rooms_expanded", target.firstChild.nodeValue); - var parentUL = target.parentNode; - if (currentlyExpandedFloor != null) { - currentlyExpandedFloor.className = currentlyExpandedFloor.className.replace("floor-expanded",""); - } - parentUL.className = parentUL.className + " floor-expanded"; - currentlyExpandedFloor = parentUL; -} // These functions handle moving sticky notes around the screen by dragging them @@ -431,69 +299,69 @@ var saved_cursor_style = 'default'; var note_was_dragged = 0; function NotesDragMouseUp(evt) { - document.onmouseup = null; - document.onmousemove = null; - if (document.layers) { - document.releaseEvents(Event.MOUSEUP | Event.MOUSEMOVE); - } + document.onmouseup = null; + document.onmousemove = null; + if (document.layers) { + document.releaseEvents(Event.MOUSEUP | Event.MOUSEMOVE); + } - d = $('note-' + uid_of_note_being_dragged); - d.style.cursor = saved_cursor_style; + var d = $('note-' + uid_of_note_being_dragged); + d.style.cursor = saved_cursor_style; - // If any motion actually occurred, submit an ajax http call to record it to the server - if (note_was_dragged > 0) { - p = 'note_uid=' + uid_of_note_being_dragged - + '&left=' + d.style.left - + '&top=' + d.style.top - + '&r=' + CtdlRandomString(); - new Ajax.Request( - 'ajax_update_note', - { - method: 'post', - parameters: p - } - ); - } + // If any motion actually occurred, submit an ajax http call to record it to the server + if (note_was_dragged > 0) { + var p = 'note_uid=' + uid_of_note_being_dragged + + '&left=' + d.style.left + + '&top=' + d.style.top + + '&r=' + ctdlRandomString(); + new Ajax.Request( + 'ajax_update_note', + { + method: 'post', + parameters: p + } + ); + } - uid_of_note_being_dragged = ''; - return true; + uid_of_note_being_dragged = ''; + return true; } - +var saved_x, saved_y; function NotesDragMouseMove(evt) { - x = (ns6 ? evt.clientX : event.clientX); - x_increment = x - saved_x; - y = (ns6 ? evt.clientY : event.clientY); - y_increment = y - saved_y; + var x = (ns6 ? evt.clientX : event.clientX); + var x_increment = x - saved_x; + var y = (ns6 ? evt.clientY : event.clientY); + var y_increment = y - saved_y; - // Move the div - d = $('note-' + uid_of_note_being_dragged); + // Move the div + var d = $('note-' + uid_of_note_being_dragged); - divTop = parseInt(d.style.top); - divLeft = parseInt(d.style.left); + var divTop = parseInt(d.style.top); + var divLeft = parseInt(d.style.left); - d.style.top = (divTop + y_increment) + 'px'; - d.style.left = (divLeft + x_increment) + 'px'; + d.style.top = (divTop + y_increment) + 'px'; + d.style.left = (divLeft + x_increment) + 'px'; - saved_x = x; - saved_y = y; - note_was_dragged = 1; - return true; + saved_x = x; + saved_y = y; + note_was_dragged = 1; + return true; } function NotesDragMouseDown(evt, uid) { - saved_x = (ns6 ? evt.clientX : event.clientX); - saved_y = (ns6 ? evt.clientY : event.clientY); - document.onmouseup = NotesDragMouseUp; - document.onmousemove = NotesDragMouseMove; - if (document.layers) { - document.captureEvents(Event.MOUSEUP | Event.MOUSEMOVE); - } - uid_of_note_being_dragged = uid; - d = $('note-' + uid_of_note_being_dragged); - saved_cursor_style = d.style.cursor; - d.style.cursor = 'move'; - return false; // disable the default action + saved_x = (ns6 ? evt.clientX : event.clientX); + saved_y = (ns6 ? evt.clientY : event.clientY); + document.onmouseup = NotesDragMouseUp; + document.onmousemove = NotesDragMouseMove; + if (document.layers) { + document.captureEvents(Event.MOUSEUP | Event.MOUSEMOVE); + } + uid_of_note_being_dragged = uid; + var d = $('note-' + uid_of_note_being_dragged); + saved_cursor_style = d.style.cursor; + d.style.cursor = 'move'; + return false; // disable the default action } @@ -501,22 +369,22 @@ function NotesDragMouseDown(evt, uid) { // It toggles the color selector visible or invisible. function NotesClickPalette(evt, uid) { - uid_of_note_being_colored = uid; - d = $('palette-' + uid_of_note_being_colored); + var uid_of_note_being_colored = uid; + var d = $('palette-' + uid_of_note_being_colored); - if (d.style.display) { - if (d.style.display == 'none') { - d.style.display = 'block'; - } - else { - d.style.display = 'none'; - } + if (d.style.display) { + if (d.style.display === 'none') { + d.style.display = 'block'; } else { - d.style.display = 'block'; + d.style.display = 'none'; } + } + else { + d.style.display = 'block'; + } - return true; + return true; } @@ -524,30 +392,30 @@ function NotesClickPalette(evt, uid) { // Sets the desired color and then closes the color selector. function NotesClickColor(evt, uid, red, green, blue, notecolor, titlecolor) { - uid_of_note_being_colored = uid; - palette_button = $('palette-' + uid_of_note_being_colored); - note_div = $('note-' + uid_of_note_being_colored); - titlebar_div = $('titlebar-' + uid_of_note_being_colored); - - // alert('FIXME red=' + red + ' green=' + green + ' blue=' + blue); - - note_div.style.backgroundColor = notecolor; - titlebar_div.style.backgroundColor = titlecolor; - palette_button.style.display = 'none'; - - // submit an ajax http call to record it to the server - p = 'note_uid=' + uid_of_note_being_colored - + '&red=' + red - + '&green=' + green - + '&blue=' + blue - + '&r=' + CtdlRandomString(); - new Ajax.Request( - 'ajax_update_note', - { - method: 'post', - parameters: p - } - ); + var uid_of_note_being_colored = uid; + var palette_button = $('palette-' + uid_of_note_being_colored); + var note_div = $('note-' + uid_of_note_being_colored); + var titlebar_div = $('titlebar-' + uid_of_note_being_colored); + + // alert('FIXME red=' + red + ' green=' + green + ' blue=' + blue); + + note_div.style.backgroundColor = notecolor; + titlebar_div.style.backgroundColor = titlecolor; + palette_button.style.display = 'none'; + + // submit an ajax http call to record it to the server + var p = 'note_uid=' + uid_of_note_being_colored + + '&red=' + red + + '&green=' + green + + '&blue=' + blue + + '&r=' + ctdlRandomString(); + new Ajax.Request( + 'ajax_update_note', + { + method: 'post', + parameters: p + } + ); } @@ -560,125 +428,138 @@ var saved_cursor_style = 'default'; var note_was_resized = 0; function NotesResizeMouseUp(evt) { - document.onmouseup = null; - document.onmousemove = null; - if (document.layers) { - document.releaseEvents(Event.MOUSEUP | Event.MOUSEMOVE); - } + document.onmouseup = null; + document.onmousemove = null; + if (document.layers) { + document.releaseEvents(Event.MOUSEUP | Event.MOUSEMOVE); + } - d = $('note-' + uid_of_note_being_resized); - d.style.cursor = saved_cursor_style; + var d = $('note-' + uid_of_note_being_resized); + d.style.cursor = saved_cursor_style; - // If any motion actually occurred, submit an ajax http call to record it to the server - if (note_was_resized > 0) { - p = 'note_uid=' + uid_of_note_being_resized - + '&width=' + d.style.width - + '&height=' + d.style.height - + '&r=' + CtdlRandomString(); - new Ajax.Request( - 'ajax_update_note', - { - method: 'post', - parameters: p - } - ); - } + // If any motion actually occurred, submit an ajax http call to record it to the server + if (note_was_resized > 0) { + var p = 'note_uid=' + uid_of_note_being_resized + + '&width=' + d.style.width + + '&height=' + d.style.height + + '&r=' + ctdlRandomString(); + new Ajax.Request( + 'ajax_update_note', + { + method: 'post', + parameters: p + } + ); + } - uid_of_note_being_resized = ''; - return false; // disable the default action + uid_of_note_being_resized = ''; + return false; // disable the default action } function NotesResizeMouseMove(evt) { - x = (ns6 ? evt.clientX : event.clientX); - x_increment = x - saved_x; - y = (ns6 ? evt.clientY : event.clientY); - y_increment = y - saved_y; - - // Move the div - d = $('note-' + uid_of_note_being_resized); + var x = (ns6 ? evt.clientX : event.clientX); + var x_increment = x - saved_x; + var y = (ns6 ? evt.clientY : event.clientY); + var y_increment = y - saved_y; - divTop = parseInt(d.style.height); - divLeft = parseInt(d.style.width); + // Move the div + var d = $('note-' + uid_of_note_being_resized); - newHeight = divTop + y_increment; - if (newHeight < 50) newHeight = 50; + var divTop = parseInt(d.style.height); + var divLeft = parseInt(d.style.width); - newWidth = divLeft + x_increment; - if (newWidth < 50) newWidth = 50; + var newHeight = divTop + y_increment; + if (newHeight < 50) { + newHeight = 50; + } - d.style.height = newHeight + 'px'; - d.style.width = newWidth + 'px'; + var newWidth = divLeft + x_increment; + if (newWidth < 50) { + newWidth = 50; + } + d.style.height = newHeight + 'px'; + d.style.width = newWidth + 'px'; - saved_x = x; - saved_y = y; - note_was_resized = 1; - return false; // disable the default action + saved_x = x; + saved_y = y; + note_was_resized = 1; + return false; // disable the default action } function NotesResizeMouseDown(evt, uid) { - saved_x = (ns6 ? evt.clientX : event.clientX); - saved_y = (ns6 ? evt.clientY : event.clientY); - document.onmouseup = NotesResizeMouseUp; - document.onmousemove = NotesResizeMouseMove; - if (document.layers) { - document.captureEvents(Event.MOUSEUP | Event.MOUSEMOVE); - } - uid_of_note_being_resized = uid; - d = $('note-' + uid_of_note_being_resized); - saved_cursor_style = d.style.cursor; - d.style.cursor = 'move'; - return false; // disable the default action + var saved_x = (ns6 ? evt.clientX : event.clientX); + var saved_y = (ns6 ? evt.clientY : event.clientY); + document.onmouseup = NotesResizeMouseUp; + document.onmousemove = NotesResizeMouseMove; + if (document.layers) { + document.captureEvents(Event.MOUSEUP | Event.MOUSEMOVE); + } + uid_of_note_being_resized = uid; + var d = $('note-' + uid_of_note_being_resized); + saved_cursor_style = d.style.cursor; + d.style.cursor = 'move'; + return false; // disable the default action } function DeleteStickyNote(evt, uid, confirmation_prompt) { - uid_of_note_being_deleted = uid; - d = $('note-' + uid_of_note_being_deleted); + var uid_of_note_being_deleted = uid; + var d = $('note-' + uid_of_note_being_deleted); - if (confirm(confirmation_prompt)) { - new Effect.Puff(d); + 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 - } - ); - } + // submit an ajax http call to delete it on the server + var p = 'note_uid=' + uid_of_note_being_deleted + + '&deletenote=yes' + + '&r=' + ctdlRandomString(); + new Ajax.Request( + 'ajax_update_note', + { + method: 'post', + parameters: p + } + ); + } } function ctdl_ts_getInnerText(el) { - if (typeof el == "string") return el; - if (typeof el == "undefined") { return el }; - if (el.innerText) return el.innerText; //Not needed but it is faster - var str = ""; - - var cs = el.childNodes; - var l = cs.length; - for (var i = 0; i < l; i++) { - switch (cs[i].nodeType) { - case 1: //ELEMENT_NODE - str += ts_getInnerText(cs[i]); - break; - case 3: //TEXT_NODE - str += cs[i].nodeValue; - break; - } + if (typeof el === "string") { + return el; + } + if (typeof el === "undefined") { + return el; + } + if (el.innerText) { + return el.innerText; //Not needed but it is faster + } + var str = ""; + + var cs = el.childNodes; + var l = cs.length; + for (var i = 0; i < l; i++) { + switch (cs[i].nodeType) { + case 1: //ELEMENT_NODE + str += ts_getInnerText(cs[i]); + break; + case 3: //TEXT_NODE + str += cs[i].nodeValue; + break; } - return str; + } + return str; } // Place a gradient loadscreen on an element, e.g to use before Ajax.updater function CtdlLoadScreen(elementid) { var elem = document.getElementById(elementid); -elem.innerHTML = "

  Loading....

"; + elem.innerHTML = "

" + + "" + + "
" + + "   Loading...." + + "

"; } @@ -687,7 +568,7 @@ elem.innerHTML = "

  Loading....

"; + + $('address_book_inner_div').innerHTML = + "

" + + "" + + "
" + + "" + + "  Loading...." + + "

"; + p = 'which_addr_book=' + which_addr_book + '&target_input=' + target_input - + '&r=' + CtdlRandomString() + + '&r=' + ctdlRandomString() + "&template=addressbook_namelist"; new Ajax.Updater( 'address_book_inner_div', @@ -719,7 +608,7 @@ function PopulateAddressBookInnerDiv(which_addr_book, target_input) { // (populate the specified target) function AddContactsToTarget(target, whichaddr) { - while (whichaddr.selectedIndex != -1) { + while (whichaddr.selectedIndex !== -1) { if (target.value.length > 0) { target.value = target.value + ', '; } @@ -746,48 +635,50 @@ function HandleRSVP(question_divname, title_divname, msgnum, cal_partnum, sc) { 0,0,0,0,0, false, false, false, false, 0, null); */ // TODO: Collapse into one function function toggleTaskDtStart(event) { - var checkBox = $('nodtstart'); - var checkBoxTime = $('dtstart_time_assoc'); - var dtstart = document.getElementById("dtstart"); - var dtstart_date = document.getElementById("dtstart_date"); - var dtstart_time = document.getElementById("dtstart_time"); - if (checkBox.checked) { - dtstart_date.style.visibility = "hidden"; - dtstart_time.style.visibility = "hidden"; + var checkBox = $('nodtstart'); + var checkBoxTime = $('dtstart_time_assoc'); + var dtstart = document.getElementById("dtstart"); + var dtstart_date = document.getElementById("dtstart_date"); + var dtstart_time = document.getElementById("dtstart_time"); + if (checkBox.checked) { + dtstart_date.style.visibility = "hidden"; + dtstart_time.style.visibility = "hidden"; + } else { + if (checkBoxTime.checked) { + dtstart_time.style.visibility = "visible"; } else { - if (checkBoxTime.checked) { - dtstart_time.style.visibility = "visible"; - } else { - dtstart_time.style.visibility = "hidden"; - } - dtstart_date.style.visibility = "visible"; - if (dtstart.value.length == 0) - dtstart.dpck._initCurrentDate(); + dtstart_time.style.visibility = "hidden"; } + dtstart_date.style.visibility = "visible"; + if (dtstart.value.length === 0) { + dtstart.dpck._initCurrentDate(); + } + } } function toggleTaskDue(event) { - var checkBox = $('nodue'); - var checkBoxTime = $('due_time_assoc'); - var due = document.getElementById("due"); - var due_date = document.getElementById("due_date"); - var due_time = document.getElementById("due_time"); - if (checkBox.checked) { - due_date.style.visibility = "hidden"; - due_time.style.visibility = "hidden"; + var checkBox = $('nodue'); + var checkBoxTime = $('due_time_assoc'); + var due = document.getElementById("due"); + var due_date = document.getElementById("due_date"); + var due_time = document.getElementById("due_time"); + if (checkBox.checked) { + due_date.style.visibility = "hidden"; + due_time.style.visibility = "hidden"; + } else { + if (checkBoxTime.checked) { + due_time.style.visibility = "visible"; } else { - if (checkBoxTime.checked) { - due_time.style.visibility = "visible"; - } else { - due_time.style.visibility = "hidden"; - } - due_date.style.visibility = "visible"; - if (due.value.length == 0) - due.dpck._initCurrentDate(); + due_time.style.visibility = "hidden"; + } + due_date.style.visibility = "visible"; + if (due.value.length === 0) { + due.dpck._initCurrentDate(); } + } } function ToggleTaskDateOrNoDateActivate(event) { var dtstart = document.getElementById("nodtstart"); - if (dtstart != null) { + if (dtstart !== null) { toggleTaskDtStart(null); toggleTaskDue(null); $('nodtstart').observe('click', toggleTaskDtStart); @@ -834,14 +725,14 @@ function RecurrenceShowHide() { $('rrule_div').style.display = 'none'; } - if ($('freq_selector').selectedIndex == 4) { + if ($('freq_selector').selectedIndex === 4) { $('weekday_selector').style.display = 'block'; } else { $('weekday_selector').style.display = 'none'; } - if ($('freq_selector').selectedIndex == 5) { + if ($('freq_selector').selectedIndex === 5) { $('monthday_selector').style.display = 'block'; } else { @@ -878,7 +769,7 @@ function RecurrenceShowHide() { $('rrmweekday').disabled = true; } - if ($('freq_selector').selectedIndex == 6) { + if ($('freq_selector').selectedIndex === 6) { $('yearday_selector').style.display = 'block'; } else { @@ -906,7 +797,7 @@ function RecurrenceShowHide() { // the attendees list is empty function EnableOrDisableCheckButton() { - if ($('attendees_box').value.length == 0) { + if ($('attendees_box').value.length === 0) { $('check_button').disabled = true; } else { @@ -918,10 +809,12 @@ function EnableOrDisableCheckButton() function launchChat(event) { -window.open('chat', 'ctdl_chat_window', 'toolbar=no,location=no,directories=no,copyhistory=no,status=no,scrollbars=yes,resizable=yes'); + window.open('chat', + 'ctdl_chat_window', + 'toolbar=no,location=no,directories=no,copyhistory=no,status=no,scrollbars=yes,resizable=yes'); } // logger -function WCLog(msg) { +function wCLog(msg) { if (!!window.console && !!console.log) { console.log(msg); } else if (!!window.opera && !!opera.postError) { @@ -938,29 +831,31 @@ function RefreshSMTPqueueDisplay() { } function DeleteSMTPqueueMsg(msgnum1, msgnum2) { - var p = encodeURI('g_cmd=DELE ' + msgnum1 + ',' + msgnum2); - new Ajax.Request( - 'ajax_servcmd', { - method: 'post', - parameters: p, - onComplete: function(transport) { ajax_important_message(transport.responseText.substr(4)); RefreshSMTPqueueDisplay();} - } - ); + var p = encodeURI('g_cmd=DELE ' + msgnum1 + ',' + msgnum2); + new Ajax.Request( + 'ajax_servcmd', { + method: 'post', + parameters: p, + onComplete: function(transport) { + ajax_important_message(transport.responseText.substr(4)); + RefreshSMTPqueueDisplay();} + } + ); } function ConfirmLogoff() { - new Ajax.Updater( - 'md-content', - 'do_template?template=confirmlogoff', - { - method: 'get', - evalScripts: true, - onSuccess: function(cl_success) { - toggleModal(1); - } - } - ); + new Ajax.Updater( + 'md-content', + 'do_template?template=confirmlogoff', + { + method: 'get', + evalScripts: true, + onSuccess: function(cl_success) { + toggleModal(1); + } + } + ); } @@ -974,7 +869,7 @@ function switch_to_lang(new_lang) { function toggle_roomlist() { /* WARNING: VILE, SLEAZY HACK. We determine the state of the box based on the image loaded. */ - if ( $('expand_roomlist').src.substring($('expand_roomlist').src.length - 12) == "collapse.gif" ) { + if ( $('expand_roomlist').src.substring($('expand_roomlist').src.length - 12) === "collapse.gif" ) { $('roomlist').style.display = 'none'; $('expand_roomlist').src = 'static/webcit_icons/expand.gif'; wstate=0; @@ -984,7 +879,7 @@ function toggle_roomlist() $('roomlist').style.display = 'block'; $('expand_roomlist').src = 'static/webcit_icons/collapse.gif'; $('roomlist').innerHTML = ''; - FillRooms(IconBarRoomList); + fillRooms(iconBarRoomList); wstate=1; } @@ -999,7 +894,7 @@ function toggle_roomlist() function toggle_wholist() { /* WARNING: VILE, SLEAZY HACK. We determine the state of the box based on the image loaded. */ - if ( $('expand_wholist').src.substring($('expand_wholist').src.length - 12) == "collapse.gif" ) { + if ( $('expand_wholist').src.substring($('expand_wholist').src.length - 12) === "collapse.gif" ) { $('online_users').style.display = 'none'; $('expand_wholist').src = 'static/webcit_icons/expand.gif'; wstate=0; diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index 067362a5f..1f0b979c2 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -600,11 +600,10 @@ void PutVcardItem(HashList *thisVC, vcField *thisField, StrBuf *ThisFieldStr, in * fields we understand, and then render them in a pretty fashion at the * end. Then we make a second pass, outputting all the fields we don't * understand in a simple two-column name/value format. - * v the vCard to display - * full display all items of the vcard? + * v the vCard to parse * msgnum Citadel message pointer */ -void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mime_attachment *Mime) +void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachment *Mime) { StrBuf *Val = NULL; StrBuf *Swap = NULL; @@ -768,8 +767,6 @@ TODO: check for layer II */ #endif FreeStrBuf(&Val); - ////free(thisname); - /// thisname = NULL; } FreeStrBuf(&thisname); FreeStrBuf(&Swap); @@ -803,7 +800,7 @@ void display_one_vcard (StrBuf *Target, struct vCard *v, int full, wc_mime_attac VC = NewHash(0, lFlathash); - parse_vcard(Target, v, VC, full, Mime); + parse_vcard(Target, v, VC, Mime); { WCTemplputParams *TP = NULL; @@ -996,59 +993,16 @@ void do_edit_vcard(long msgnum, char *partnum, wc_mime_attachment *VCAtt, const char *return_to, const char *force_room) { + HashList *VC; WCTemplputParams SubTP; wcsession *WCC = WC; message_summary *Msg = NULL; wc_mime_attachment *VCMime = NULL; struct vCard *v; - int i; - char *key, *value; char whatuser[256]; + VC = NewHash(0, lFlathash); - char lastname[256]; - char firstname[256]; - char middlename[256]; - char prefix[256]; - char suffix[256]; - char pobox[256]; - char extadr[256]; - char street[256]; - char city[256]; - char state[256]; - char zipcode[256]; - char country[256]; - char hometel[256]; - char worktel[256]; - char faxtel[256]; - char mobiletel[256]; - char primary_inetemail[256]; - char other_inetemail[SIZ]; - char extrafields[SIZ]; - char fullname[256]; - char title[256]; - char org[256]; - - lastname[0] = 0; - firstname[0] = 0; - middlename[0] = 0; - prefix[0] = 0; - suffix[0] = 0; - pobox[0] = 0; - extadr[0] = 0; - street[0] = 0; - city[0] = 0; - state[0] = 0; - zipcode[0] = 0; - country[0] = 0; - hometel[0] = 0; - worktel[0] = 0; - faxtel[0] = 0; - mobiletel[0] = 0; - primary_inetemail[0] = 0; - other_inetemail[0] = 0; - title[0] = 0; - org[0] = 0; - extrafields[0] = 0; - fullname[0] = 0; + /* Display the form */ + output_headers(1, 1, 1, 0, 0, 0); safestrncpy(whatuser, "", sizeof whatuser); @@ -1072,279 +1026,26 @@ void do_edit_vcard(long msgnum, char *partnum, else { v = VCardLoad(VCAtt->Data); } - - /* Populate the variables for our form */ - i = 0; - while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) { - char prp[256]; /* property name */ - char prm[256]; /* parameters */ - - value = vcard_get_prop(v, "", 0, i++, 0); - - extract_token(prp, key, 0, ';', sizeof prp); - safestrncpy(prm, key, sizeof prm); - remove_token(prm, 0, ';'); - - if (!strcasecmp(prp, "n")) { - extract_token(lastname, value, 0, ';', sizeof lastname); - extract_token(firstname, value, 1, ';', sizeof firstname); - extract_token(middlename, value, 2, ';', sizeof middlename); - extract_token(prefix, value, 3, ';', sizeof prefix); - extract_token(suffix, value, 4, ';', sizeof suffix); - } - - else if (!strcasecmp(prp, "fn")) { - safestrncpy(fullname, value, sizeof fullname); - } - - else if (!strcasecmp(prp, "title")) { - safestrncpy(title, value, sizeof title); - } + parse_vcard(WCC->WBuf, v, VC, NULL); - else if (!strcasecmp(prp, "org")) { - safestrncpy(org, value, sizeof org); - } - - else if (!strcasecmp(prp, "adr")) { - extract_token(pobox, value, 0, ';', sizeof pobox); - extract_token(extadr, value, 1, ';', sizeof extadr); - extract_token(street, value, 2, ';', sizeof street); - extract_token(city, value, 3, ';', sizeof city); - extract_token(state, value, 4, ';', sizeof state); - extract_token(zipcode, value, 5, ';', sizeof zipcode); - extract_token(country, value, 6, ';', sizeof country); - } - - else if (!strcasecmp(prp, "tel")) { - - if (bmstrcasestr(prm, "home")) { - extract_token(hometel, value, 0, ';', sizeof hometel); - } - else if (bmstrcasestr(prm, "work")) { - extract_token(worktel, value, 0, ';', sizeof worktel); - } - else if (bmstrcasestr(prm, "fax")) { - extract_token(faxtel, value, 0, ';', sizeof faxtel); - } - else if (bmstrcasestr(prm, "cell")) { - extract_token(mobiletel, value, 0, ';', sizeof mobiletel); - } - else { /* Missing or unknown type; put it in the home phone */ - extract_token(hometel, value, 0, ';', sizeof hometel); - } - } - - else if ( (!strcasecmp(prp, "email")) && (bmstrcasestr(prm, "internet")) ) { - if (primary_inetemail[0] == 0) { - safestrncpy(primary_inetemail, value, sizeof primary_inetemail); - } - else { - if (other_inetemail[0] != 0) { - strcat(other_inetemail, "\n"); - } - strcat(other_inetemail, value); - } - } - - /* Unrecognized properties are preserved here so we don't discard them - * just because the vCard was edited with WebCit. - */ - else { - strcat(extrafields, key); - strcat(extrafields, ":"); - strcat(extrafields, value); - strcat(extrafields, "\n"); - } - - } vcard_free(v); } - /* Display the form */ - output_headers(1, 1, 1, 0, 0, 0); - - do_template("box_begin_1"); - StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0); - do_template("box_begin_2"); - - wc_printf("
\n"); - wc_printf("\n", WC->nonce); + memset(&SubTP, 0, sizeof(WCTemplputParams)); - if (force_room != NULL) { - wc_printf("\n"); - } - else { - wc_printf("WBuf, WCC->CurRoom.name, NULL, 0, 0); - wc_printf("\">\n"); - } - - wc_printf("
\n"); - - wc_printf("" - "" - "" - "" - "" - "\n", - _("Prefix"), _("First Name"), _("Middle Name"), _("Last Name"), _("Suffix") - ); - wc_printf("", - prefix); - wc_printf("", - firstname); - wc_printf("", - middlename); - wc_printf("", - lastname); - wc_printf("
%s%s%s%s%s
\n", - suffix); - - wc_printf(""); - wc_printf("
"); - - wc_printf(_("Display name:")); - wc_printf("
" - "

\n", - fullname - ); + WCTemplputParams *TP = NULL; + WCTemplputParams SubTP; + StackContext(TP, &SubTP, VC, CTX_VCARD, 0, NULL); - wc_printf(_("Title:")); - wc_printf("
" - "

\n", - title - ); + DoTemplate(HKEY("vcard_edit"), WCC->WBuf, &SubTP); + UnStackContext(&SubTP); + } + DeleteHash(&VC); - wc_printf(_("Organization:")); - wc_printf("
" - "

\n", - org - ); - wc_printf("		"); - - wc_printf(""); - wc_printf("\n", - pobox); - wc_printf("\n", - extadr); - wc_printf("\n", - street); - wc_printf("\n", - city); - wc_printf("\n", - state); - wc_printf("\n", - zipcode); - wc_printf("\n", - country); - wc_printf("
"); - wc_printf(_("PO box:")); - wc_printf("" - "
"); - wc_printf(_("Address:")); - wc_printf("" - "
" - "
"); - wc_printf(_("City:")); - wc_printf("" - "
"); - wc_printf(_("State:")); - wc_printf("" - "
"); - wc_printf(_("ZIP code:")); - wc_printf("" - "
"); - wc_printf(_("Country:")); - wc_printf("" - "
\n"); - - wc_printf("
\n"); - - wc_printf("" - "\n", - hometel); - wc_printf("" - "\n", - worktel); - wc_printf("" - "\n", - mobiletel); - wc_printf("" - "
"); - wc_printf(_("Home telephone:")); - wc_printf(""); - wc_printf(_("Work telephone:")); - wc_printf("
"); - wc_printf(_("Mobile telephone:")); - wc_printf(""); - wc_printf(_("Fax number:")); - wc_printf("
\n", - faxtel); - - wc_printf(""); - wc_printf("
"); - - wc_printf("" - "
"); - wc_printf(_("Primary Internet e-mail address")); - wc_printf("
" - "
" - "		"); - wc_printf(_("Internet e-mail aliases")); - wc_printf("
" - "
\n"); - - wc_printf("
\n"); - - wc_printf("\n"); - - wc_printf("\n"); - - wc_printf("
\n" - "" - " " - "" - "
\n", - _("Save changes"), - _("Cancel") - ); - - wc_printf("
\n"); - do_template("box_end"); wDumpContent(1); if (Msg != NULL) { DestroyMessageSummary(Msg); -- 2.30.2