amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-07 14:28:52 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: f034b53abce82938ab4a4f837dfec93dbcb87a76
Monotone-Revision: bb60d6b6e8b42019515accf65d2cbe10c66291b6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-07-05T15:58:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-07-05 15:58:18 +00:00
parent 024941380e
commit 13fdd3572c
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2010-07-05 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (onCalendarModify): fixed
proper identification of web calendars and adjusted height of
popup window.
2010-07-04 Ludovic Marcotte <lmarcotte@inverse.ca>
* In the Contacts module, we prioritize the

11
UI/WebServerResources/SchedulerUI.js
View File

@@ -563,6 +563,7 @@ function onViewEventCallback(http) {
div.addClassName("right");
}
else {
//log (" left = " + left + " + " + cellDimensions.width + " - " + parseInt(cellDimensions["width"]/3));
left = left + cellDimensions["width"] - parseInt(cellDimensions["width"]/3);
div.removeClassName("right");
div.addClassName("left");
@@ -2236,25 +2237,27 @@ function onCalendarModify(event) {
var folders = $("calendarList");
var selected = folders.getSelectedNodes()[0];
var calendarID = selected.getAttribute("id");
var owner = selected.getAttribute("owner");
var url = ApplicationBaseURL + calendarID + "/properties";
var windowID = sanitizeWindowName(calendarID + " properties");
var width = 310;
var height = 350;
var height = 294;
var isWebCalendar = false;
if (UserSettings['Calendar']
&& UserSettings['Calendar']['WebCalendars']) {
var webCalendars = UserSettings['Calendar']['WebCalendars'];
var realID = calendarID.substr (1, calendarID.length - 1);
var realID = owner + ":Calendar/" + calendarID.substr (1, calendarID.length - 1);
if (webCalendars[realID]) {
isWebCalendar = true;
}
}
var owner = selected.getAttribute("owner");
if (Prototype.Browser.IE) height += 10;
if (owner == UserLogin) {
height += 20;
}
if (isWebCalendar) {
height -= 38;
height += 26;
}
else if (calendarID == "/personal") {
height -= 26;

3
UI/WebServerResources/iefixes.css
View File

@@ -95,8 +95,7 @@ BUTTON#colorButton
{ margin-top: 2px; }
DIV#propertiesTabs FIELDSET
{ margin: 0.5em;
padding: 5px; }
{ padding: 5px; }
DIV#propertiesTabs LEGEND
{ margin-bottom: 5px; }