From 3143aa9324e381b881493d18b67a20a0e11c7196 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 30 Jun 2009 17:54:13 +0000
Subject: [PATCH 1/3] Monotone-Parent: f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36
 Monotone-Revision: e8ee048170e91221cb7aac2c0e4e394db83bf2e2

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-30T17:54:13
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                |   4 +
 UI/Templates/UIxPageFrame.wox            |   1 -
 UI/WebServerResources/ContactsUI.js      |   3 -
 UI/WebServerResources/MailerUI.css       |  17 ++
 UI/WebServerResources/MailerUI.js        |  88 ++++++++
 UI/WebServerResources/SOGoDragAndDrop.js | 255 -----------------------
 UI/WebServerResources/ckeditor/config.js |   6 +
 UI/WebServerResources/message-copy.gif   | Bin 0 -> 30415 bytes
 UI/WebServerResources/message.gif        | Bin 0 -> 586 bytes
 9 files changed, 115 insertions(+), 259 deletions(-)
 delete mode 100644 UI/WebServerResources/SOGoDragAndDrop.js
 create mode 100644 UI/WebServerResources/message-copy.gif
 create mode 100644 UI/WebServerResources/message.gif

diff --git a/ChangeLog b/ChangeLog
index 9055d4296..c16c464dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-30  Cyril Robert <crobert@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js: Added drag & drop support!
+
 2009-06-29  Cyril Robert <crobert@inverse.ca>
 
 	* UI/WebServerResources/ContactsUI.js: Added drag & drop support!
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 45e2fb7fa..e4af5e05d 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -126,7 +126,6 @@
 	  <script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="generic.js"><!-- space --></script>
-	  <script type="text/javascript" rsrc:src="SOGoDragAndDrop.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space --></script>
     <script type="text/javascript" rsrc:src="scriptaculous/scriptaculous.js"><!-- space --></script>
 	  <var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 57dd4bc6c..6d9e8c8df 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1068,7 +1068,6 @@ function initContacts(event) {
 function configureDragAndDrop () {
   var mainElement = new Element ("div", {id: "dragDropVisual"});
   document.body.appendChild(mainElement);
-  log ("1");
   mainElement.absolutize ();
   mainElement.style.display = "none";
 
@@ -1079,11 +1078,9 @@ function configureDragAndDrop () {
                    onEnd: stopDragging,
                    onDrag: whileDragging
                  });
-  log ("2");
 
   var drops = $$("ul#contactFolders li");
   drops.each (function (drop) {
-              log ("3");
                 if (!drop.hasClassName ("remote"))
                   Droppables.add (drop.id, 
                                   {
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 7c7264cf3..6bcf022cc 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -805,3 +805,20 @@ DIV#rightDragHandle
   { position: static;
     overflow: visible; }
 }
+
+DIV#dragDropVisual
+{
+  background-image: url(/SOGo.woa/WebServerResources/message.gif);
+  background-repeat: no-repeat;
+  background-position: 4px 2px;
+  width: 5px;
+  height: 20px;
+  padding-left: 24px;
+  padding-top: 5px;
+}
+
+DIV.copy
+{
+  background-image: url(/SOGo.woa/WebServerResources/message-copy.gif) !important; 
+  background-position: 1px -2px !important;
+}
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 053298630..91bcdca26 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -660,6 +660,7 @@ function messageListCallback(http) {
       table = $('messageList');
       configureMessageListEvents(table);
       TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
+      setTimeout ('configureDragAndDrop ();', 500);
     }
     configureMessageListBodyEvents(table);
 
@@ -2221,3 +2222,90 @@ Mailbox.prototype = {
 	}
 };
 
+
+
+
+function configureDragAndDrop () {
+  var mainElement = new Element ("div", {id: "dragDropVisual"});
+  document.body.appendChild(mainElement);
+  mainElement.absolutize ();
+  mainElement.style.display = "none";
+
+  new Draggable ("dragDropVisual", 
+                 { 
+                   handle: "messageList", 
+                   onStart: startDragging,
+                   onEnd: stopDragging,
+                   onDrag: whileDragging
+                 });
+
+  var drops = $$("div#dmailboxTree1 div.dTreeNode a.node span.nodeName");
+  drops.each (function (drop) {
+                  drop.identify ()
+                  Droppables.add (drop.id, 
+                                  {
+                                    hoverclass: "genericHoverClass",
+                                    onDrop: dropAction
+                                  });
+              });
+
+}
+
+function startDragging (itm, e) {
+  var handle = $("dragDropVisual");
+  var count = $('messageList').getSelectedRowsId().length;
+
+    handle.style.display = "block";
+    handle.update (count);
+    if (e.shiftKey)
+      handle.addClassName ("copy");
+}
+
+function whileDragging (itm, e) {
+  var handle = $("dragDropVisual");
+  if (e.shiftKey)
+    handle.addClassName ("copy");
+  else if (handle.hasClassName ("copy"))
+    handle.removeClassName ("copy");
+}
+
+function stopDragging () {
+  var handle = $("dragDropVisual");
+  handle.style.display = "none";
+  if (handle.hasClassName ("copy"))
+    handle.removeClassName ("copy");
+}
+
+function dropAction (dropped, zone, e) {
+  var action = "move";
+  var destination = zone.up ("div.dTreeNode").readAttribute ("dataname");
+  
+  if ($("dragDropVisual").hasClassName ("copy"))
+    action = "copy";
+
+  dropSelectedContacts (action, destination);
+}
+
+function dropSelectedContacts (action, targetMailbox) {
+  var messageList = $("messageList").down("TBODY");
+  var rows = messageList.getSelectedNodes();
+  var uids = new Array(); // message IDs
+  var paths = new Array(); // row IDs
+
+  for (var i = 0; i < rows.length; i++) {
+    var uid = rows[i].readAttribute("id").substr(4);
+    var path = Mailer.currentMailbox + "/" + uid;
+    rows[i].hide();
+    uids.push(uid);
+    paths.push(path);
+  }
+
+  var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/" + action + "Messages";
+  var parameters = "uid=" + uids.join(",") + "&folder=" + targetMailbox;
+  var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths, "folder": targetMailbox };
+  triggerAjaxRequest(url, refreshCurrentFolder, data, parameters,
+    { "Content-type": "application/x-www-form-urlencoded" });
+
+  return false;
+}
+
diff --git a/UI/WebServerResources/SOGoDragAndDrop.js b/UI/WebServerResources/SOGoDragAndDrop.js
deleted file mode 100644
index 6e6b25f2c..000000000
--- a/UI/WebServerResources/SOGoDragAndDrop.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: java; tab-width: 2; c-tab-always-indent: t; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-
-/* drag and drop */
-
-/* HTMLElement interface */
-var SOGODragAndDropSourceInterface = {
- _removeGestureHandlers: function () {
-    window.removeEventListener("mousemove", this.dragGestureMouseMoveHandler, false);
-    window.removeEventListener("mouseup", this.dragGestureMouseUpHandler, false);
-    document._dragGestureStartPoint = null;
-    document._currentMouseGestureObject = null;
-  },
- bind: function() {
-    this.addEventListener("mousedown", this.dragGestureMouseDownHandler, false);
-  },
- dragGestureMouseDownHandler: function (event) {
-    if (event.button == 0) {
-      document._dragGestureStartPoint = new Array(event.clientX,
-                                                  event.clientY);
-      document._currentMouseGestureObject = this;
-      window.addEventListener("mousemove", this.dragGestureMouseMoveHandler,
-                              false);
-      window.addEventListener("mouseup", this.dragGestureMouseUpHandler,
-                              false);
-    }
-  },
- dragGestureMouseUpHandler: function (event) {
-    document._currentMouseGestureObject._removeGestureHandlers();
-  },
- dragGestureMouseMoveHandler: function (event) {
-    var deltaX = event.clientX - document._dragGestureStartPoint[0];
-    var deltaY = event.clientY - document._dragGestureStartPoint[1];
-    if (Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) > 10) {
-      event.returnValue = true;
-      event.cancelBubble = true;
-      var object = document._currentMouseGestureObject;
-      var point = document._dragGestureStartPoint;
-      document.DNDManager.startDragging(object, point);
-      document._currentMouseGestureObject._removeGestureHandlers();
-    }
-  }
-};
-
-/* DNDManager */
-document.DNDManager = {
- lastSource: 0,
- lastDestination: 0,
- sources: new Array(),
- destinations: new Array(),
- registerSource: function (source) {
-		var id = source.getAttribute("id");
-		if (!id) {
-			id = "_dndSource" + (this.lastSource + 1);
-			source.setAttribute("id", id);
-		}
-		this.sources[id] = source;
-		this.lastSource++;
-		source.addInterface(SOGODragAndDropSourceInterface);
-	},
- registerDestination: function (destination) {
-		var id = destination.getAttribute("id");
-		if (!id) {
-			id = "_dndDestination" + (this.lastDestination + 1);
-			destination.setAttribute("id", id);
-		}
-		this.destinations[id] = destination;
-		this.lastDestination++;
-	},
- _lookupSource: function (target) {
-		var source = null;
-		var id = target.getAttribute("id");
-		if (id)
-			source = document.DNDManager.sources[id];
-		return source;
-	},
- _lookupDestination: function (target) {
-		var destination = null;
-		var id = target.getAttribute("id");
-		if (id)
-			destination = document.DNDManager.destinations[id];
-		return destination;
-	},
- startDragging: function (object, point) {
-		var source = document.DNDManager._lookupSource (object);
-		if (source) {
-			document.DNDManager.currentDndOperation = new document.DNDOperation(source, point);
-			window.addEventListener("mouseup",
-															document.DNDManager.destinationDrop, false);
-			window.addEventListener("mouseover",
-															document.DNDManager.destinationEnter, false);
-			window.addEventListener("mousemove",
-															document.DNDManager.destinationOver, false);
-			window.addEventListener("mouseout",
-															document.DNDManager.destinationExit, false);
-		}
-	},
- destinationEnter: function (event) {
-		var operation = document.DNDManager.currentDndOperation;
-		var destination = document.DNDManager._lookupDestination (event.target);
-		if (operation && destination && destination.dndAcceptType) {
-			operation.type = null;
-			var i = 0;
-			while (operation.type == null
-						 && i < operation.types.length) {
-				if (destination.dndAcceptType(operation.types[i])) {
-					operation.type = operation.types[i];
-					operation.setDestination(destination);
-					if (destination.dndEnter)
-						destination.dndEnter(event, operation.source, operation.type);
-				}
-				else
-					i++;
-			}
-		}
-	},
- destinationExit: function (event) {
-		var operation = document.DNDManager.currentDndOperation;
-		if (operation
-				&& operation.destination == event.target) {
-			if (operation.destination.dndExit)
-				event.target.dndExit();
-			operation.setDestination(null);
-		}
-	},
- destinationOver: function (event) {
-	},
- destinationDrop: function (event) {
-		var operation = document.DNDManager.currentDndOperation;
-		if (operation) {
-			window.removeEventListener("mouseup",
-																 document.DNDManager.destinationDrop, false);
-			window.removeEventListener("mouseover",
-																 document.DNDManager.destinationEnter, false);
-			window.removeEventListener("mousemove",
-																 document.DNDManager.destinationOver, false);
-			window.removeEventListener("mouseout",
-																 document.DNDManager.destinationExit, false);
-			if (operation.destination == event.target) {
-				if (operation.destination.dndExit) {
-					operation.destination.dndExit();
-				}
-				if (operation.destination.dndDrop) {
-					var data = null;
-					if (operation.source.dndDataForType)
-						data = operation.source.dndDataForType(operation.type);
-					var result = operation.destination.dndDrop(data);
-					if (operation.ghost) {
-						if (result)
-							operation.bustGhost();
-						else
-							operation.chaseGhost();
-					}
-				}
-				else
-					if (operation.ghost)
-						operation.chaseGhost();
-			} else {
-				if (operation.ghost)
-					operation.chaseGhost();
-			}
-			document.DNDManager.currentDndOperation = null;
-		}
-	},
- currentDndOperation: null
-};
-
-/* DNDOperation */
-document.DNDOperation = function (source, point) {
-	this.startPoint = point;
-	this.source = source;
-	if (source.dndTypes) {
-		this.types = source.dndTypes();
-	}
-	this.type = null;
-	this.destination = null;
-	if (source.dndGhost) {
-		var ghost = source.dndGhost();
-		ghost.style.position = "absolute;";
-		ghost.style.zIndex = 10000;
-		ghost.style.MozOpacity = 0.8;
-		document.body.appendChild(ghost);
-		this.ghost = ghost;
-
-		document.addEventListener("mousemove", this.moveGhost, false);
-	}
-
-	return this;
-};
-
-document.DNDOperation.prototype.setDestination = function(destination) {
-  this.destination = destination;
-};
-
-document.DNDOperation.prototype.moveGhost = function(event) {
-	var offsetX = event.clientX;
-	var offsetY = event.clientY;
-	if (document.DNDManager.currentDndOperation.ghost.ghostOffsetX)
-		offsetX += document.DNDManager.currentDndOperation.ghost.ghostOffsetX;
-	if (document.DNDManager.currentDndOperation.ghost.ghostOffsetY)
-		offsetY += document.DNDManager.currentDndOperation.ghost.ghostOffsetY;
-	
-	document.DNDManager.currentDndOperation.ghost.style.left = offsetX + "px;";
-	document.DNDManager.currentDndOperation.ghost.style.top = offsetY + "px;";
-};
-
-document.DNDOperation.prototype.bustGhost = function() {
-	document._dyingOperation = this;
-	document.removeEventListener("mousemove", this.moveGhost, false);
-	this.ghost.bustStep = 10;
-	setTimeout("document._dyingOperation._fadeGhost();", 50);
-};
-
-document.DNDOperation.prototype.chaseGhost = function() {
-	document._dyingOperation = this;
-	document.removeEventListener("mousemove", this.moveGhost, false);
-	this.ghost.bustStep = 25;
-	this.ghost.chaseStep = 25;
-	this.ghost.style.overflow = "hidden;"
-	this.ghost.style.whiteSpace = "nowrap;";
-	this.ghost.chaseDeltaX = ((this.ghost.cascadeLeftOffset() - this.startPoint[0])
-														/ this.ghost.chaseStep);
-	this.ghost.chaseDeltaY = ((this.ghost.cascadeTopOffset() - this.startPoint[1])
-														/ this.ghost.chaseStep);
-	setTimeout("document._dyingOperation._chaseGhost();", 20);
-};
-
-document.DNDOperation.prototype._chaseGhost = function() {
-	if (this.ghost.chaseStep) {
-		var newLeft = this.ghost.cascadeLeftOffset() - this.ghost.chaseDeltaX; 
-		var newTop = this.ghost.cascadeTopOffset() - this.ghost.chaseDeltaY;
-		this.ghost.style.MozOpacity = (0.04 * this.ghost.chaseStep);
-		this.ghost.style.left = newLeft + "px;";
-		this.ghost.style.top = newTop + "px;";
-		this.ghost.chaseStep--;
-		setTimeout("document._dyingOperation._chaseGhost();", 20);
-	}
-	else {
-		document.body.removeChild(this.ghost);
-		this.ghost = null;
-	}
-};
-
-document.DNDOperation.prototype._fadeGhost = function() {
-	if (this.ghost.bustStep) {
-		this.ghost.style.MozOpacity = (0.1 * this.ghost.bustStep);
-		this.ghost.style.width = (this.ghost.offsetWidth * .7) + "px;";
-		this.ghost.style.height = (this.ghost.offsetHeight * .7) + "px;";
-		this.ghost.bustStep--;
-		setTimeout("document._dyingOperation._fadeGhost();", 50);
-	}
-	else {
-		document.body.removeChild(this.ghost);
-		this.ghost = null;
-	}
-};
diff --git a/UI/WebServerResources/ckeditor/config.js b/UI/WebServerResources/ckeditor/config.js
index 4c0768d2c..99cc4d09b 100644
--- a/UI/WebServerResources/ckeditor/config.js
+++ b/UI/WebServerResources/ckeditor/config.js
@@ -8,4 +8,10 @@ CKEDITOR.editorConfig = function( config )
 	// Define changes to default configuration here. For example:
 	// config.language = 'fr';
 	config.skin = 'kama';
+  //TODO: This should work to remove the bottom DOM information, but doesn't
+  // This way is on an instance of the config object
+  config.removePlugins = "elementspath,kplahj";
 };
+
+// This way is global / static
+CKEDITOR.config.removePlugins = "elementspath,kplahj";
diff --git a/UI/WebServerResources/message-copy.gif b/UI/WebServerResources/message-copy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..439161e26598f9caa71e8050babf89fc902a9971
GIT binary patch
literal 30415
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
K*;5d~^!Xp6R;_6O

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/message.gif b/UI/WebServerResources/message.gif
new file mode 100644
index 0000000000000000000000000000000000000000..229134c981bebd603de7f56bf79f59638d2210d1
GIT binary patch
literal 586
zcmb`EOHUJF6o$VVB8aHfh@u7+)QDQ|MnTjfa<K>%0}@k}iv1%7Z+J;Wl1W_P${4kU
zx@l<Br759tQ)W7yai-JG<(mtWX`9}u3#U%~4W7l>oO7NhdC#D2ptEbr49q|VwW?OD
zs-nuGED9pzVUkG_IDuoh{zuPcbJQ=2VOT{`X_{GIugJ0jp(qG2nPf#-W_g~XX@Vq;
z(<l)oDbly(Tl~JLrL;A54T?~J0>^WB49B7vilLqbkK5y(|2UuE3|a|7p6A(koT4a_
zAaF?%SvE=2)aq))<8dpJghnDO%gakXUoM+9HgsLDR4V0ixl}3@i^W2rkk99HIb)d3
zWHRY=I+aRknx?9%qA0Q~O9oLCA%ub;7$%P6Se8vB5)8w{<8j(B8Di1^6R}tf$8ik9
zP!tV^!=X?p7z_pi0l(kx^?L1gyOGkrwElBz`(0-Ozy&NdZtW+a{>u~B^wVe0U%Z@o
z_4>`*Y4CXV{oEV?o32?K`&w^a7(Q6na(V<gex<i>|Im)xqj#D*%;%8q$)3SmBcmI~
z&RT|!b|KrWyDob-Puy#N^l+jcIcDuWX}i0};jmxaI^KX>?Y!Y^doX$A{Gm&`_d1ZM
zvvrH@K(qbK_`Zhw$aQD`z-&_o=x=O3aq0*DH8eG|-L$iP;X}{opNQq~FlZV3_G#sv
JYl8`N{{;&VH4Xp(

literal 0
HcmV?d00001


From 784f5bffccdadb1557d7ef043352d64f2f1846e0 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 30 Jun 2009 18:01:14 +0000
Subject: [PATCH 2/3] Monotone-Parent: e8ee048170e91221cb7aac2c0e4e394db83bf2e2
 Monotone-Revision: 77d6f1cf85f2204c8e5f316ee513551508049ec9

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-30T18:01:14
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  | 1 +
 UI/MailPartViewers/UIxMailPartHTMLViewer.m | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c16c464dd..277457780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-06-30  Cyril Robert <crobert@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js: Added drag & drop support!
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m: Removed an extra NSLog
 
 2009-06-29  Cyril Robert <crobert@inverse.ca>
 
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index dc0a571dd..814eeb2e4 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -426,7 +426,7 @@ _xmlCharsetForCharset (NSString *charset)
             }
           else
             {
-              NSLog (@"%@", _localName);
+              //NSLog (@"%@", _localName);
               [result appendFormat: @"</%@>", _localName];
             }
         }

From db2c2ed702b806cb7d2ed3413e51dbd4a4c2aa1a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 30 Jun 2009 18:49:53 +0000
Subject: [PATCH 3/3] Monotone-Parent: 77d6f1cf85f2204c8e5f316ee513551508049ec9
 Monotone-Revision: 78e483b4fe68843e9833d79d7bde59ac5321291c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-30T18:49:53
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/UIxJSClose.wox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/Templates/UIxJSClose.wox b/UI/Templates/UIxJSClose.wox
index bb209932a..c110cb054 100644
--- a/UI/Templates/UIxJSClose.wox
+++ b/UI/Templates/UIxJSClose.wox
@@ -6,7 +6,7 @@
 <html><head></head><body style="background-color: #dbdad5;"
         ><script type="text/javascript"
           ><var:if condition="hasRefreshMethod"
-            >window.opener.setTimeout('<var:string value="refreshMethod"
+            >if (window.opener) window.opener.setTimeout('<var:string value="refreshMethod"
               const:escapeHTML="NO" />;', 50);</var:if
             >window.close();</script
 ></body></html