From 4c4025b355813391e2b86e016cc751d42db2e8e2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 20 May 2010 23:31:09 +0000 Subject: [PATCH] Monotone-Parent: 5a4a7c1db4a25a06a5e157e4f3556f764c632fa8 Monotone-Revision: c8714a5bb8116ebf638f97df599f31ea8cc0cdcb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-05-20T23:31:09 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/WebServerResources/SchedulerUI.css | 3 +++ UI/WebServerResources/SchedulerUI.js | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 08801c37d..e9047a7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-20 Wolfgang Sourdeau + + * UI/WebServerResources/SchedulerUI.js: (newEventDIV): we now add + a span with class "location" when the location field is available. + 2010-05-18 Wolfgang Sourdeau * SoObjects/Appointments/iCalEvent+SOGo.m (-quickRecord): extract diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 158083838..233f1bbd7 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -1296,6 +1296,9 @@ DIV.event._selected > DIV.eventInside { -moz-opacity: 0.7; opacity: 0.7; } +DIV.text > SPAN.location +{ font-size: smaller; } + DIV.gradient, DIV.text { position: absolute; top: 1px; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 78c2f5c0f..b0d5e409a 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1361,6 +1361,16 @@ function newEventDIV(eventRep, event) { eventCell.addClassName("starts" + eventRep.start); eventCell.addClassName("lasts" + eventRep.length); + if (event[6]) { + var inside = eventCell.childNodesWithTag("div")[0]; + var textDiv = inside.childNodesWithTag("div")[1]; + textDiv.appendChild(createElement("br")); + var span = createElement("span", null, "location"); + var text = getLabel("Location:") + event[6]; + span.appendChild(document.createTextNode(text)); + textDiv.appendChild(span); + } + return eventCell; }