From 54a172f1b5379c0e1f09af08784e6aed0bd7b464 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 25 Apr 2011 20:31:41 +0000
Subject: [PATCH] Monotone-Parent: ebf5d04af1fdc137c11102add2126351433fdd38
 Monotone-Revision: 2f66db18c248ef4670f83c5c56b70ab703fede49

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-25T20:31:41
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/SchedulerUI.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index f0d9cf492..0b1429a77 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -226,7 +226,10 @@ function deleteEvent() {
                         }
                         if (sortedNodes[calendar].indexOf(nodes[i].cname) < 0) {
                             sortedNodes[calendar].push(nodes[i].cname);
-                            events.push(nodes[i].down('td').allTextContent());
+                            if (nodes[i].tagName == 'TR')
+                                events.push(nodes[i].down('td').allTextContent()); // extract the first column only
+                            else
+                                events.push(nodes[i].allTextContent());
                         }
                     }
                 }
@@ -294,17 +297,13 @@ function deleteEvent() {
             }
             if (i > 0) {
                 var p = createElement("p");
-                var str = "";
+                var label = _("eventDeleteConfirmation");
                 if (Prototype.Browser.IE)
-                    str = label.formatted('<br><br> - <b>' + events.join('</b><br> - <b>') + '</b><br><br>');
+                    label = label.formatted('<br><br> - <b>' + events.join('</b><br> - <b>') + '</b><br><br>');
                 else
-                    str = label.formatted('<ul><li>' + events.join('<li>') + '</ul>');
-                p.innerHTML = str;
-                showConfirmDialog(_("Warning"), p, deleteEventFromListConfirm);
-                
-                var p = new Element("p").update(_("eventDeleteConfirmation").formatted('<ul><li>' + events.join("<li>") + '</ul>'));
-                showConfirmDialog(_("Warning"), p,
-                                  deleteEventFromViewConfirm, deleteEventCancel);
+                    label = label.formatted('<ul><li>' + events.join('<li>') + '</ul>');
+                p.innerHTML = label;
+                showConfirmDialog(_("Warning"), p, deleteEventFromListConfirm, deleteEventCancel);
             }
             else
                 showAlertDialog(_("You don't have the required privileges to perform the operation."));