From 68fff252babd550b91252f5cfa0b05b4b019131d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 12 Dec 2011 17:01:10 +0000 Subject: [PATCH] Fixed confirmation dialog box when deleting too many events (bug #1297). Monotone-Parent: 9460deffbf939afae0a607ea07e015924c93fd01 Monotone-Revision: 6c7df05d6446c77649d60795ea43d844c59e9838 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-12T17:01:10 --- NEWS | 1 + UI/WebServerResources/SchedulerUI.js | 4 ++-- UI/WebServerResources/generic.css | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 17057a0f5..cd774fecf 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,7 @@ Enhancements Bug Fixes - fixed encoding of headers in sogo-ealarm-notify + - fixed confirmation dialog box when deleting too many events 1.3-20111130 (1.3.10) --------------------- diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 7b6b973dc..63381b8b6 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -255,7 +255,7 @@ function deleteEvent() { eventsToDelete.push(sortedNodes[calendars[i]]); } if (i > 0) { - var p = createElement("p"); + var p = createElement("p", null, ["list"]); var str = ""; if (Prototype.Browser.IE) str = label.formatted('

- ' + events.join('
- ') + '

'); @@ -313,7 +313,7 @@ function deleteEvent() { eventsToDelete.push(sortedNodes[calendars[i]]); } if (i > 0) { - var p = createElement("p"); + var p = createElement("p", null, ["list"]); var label = _("eventDeleteConfirmation"); if (Prototype.Browser.IE) label = label.formatted('

- ' + events.join('
- ') + '

'); diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index aa00e01f3..febb88576 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -619,6 +619,10 @@ DIV.dialog.none P DIV.dialog.none P.prompt { text-align: right; } +DIV.dialog P.list +{ max-height: 200px; + overflow-y: auto; } + DIV#bgFrameDiv { position: absolute; top: 0px; left: 0px;