From: wolfgang Date: Wed, 13 Jun 2007 05:30:40 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1083 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8139275e1ae636dc24a23e518e0dd5122f5da1d6;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1083 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js index f1756edc..7cdc85ec 100644 --- a/UI/WebServerResources/JavascriptAPIExtensions.js +++ b/UI/WebServerResources/JavascriptAPIExtensions.js @@ -109,15 +109,14 @@ Date.prototype.getHourString = function() { } Date.prototype.getDisplayHoursString = function() { - var hoursString = this.getHours(); + var hoursString = "" + this.getHours(); if (hoursString.length == 1) hoursString = '0' + hoursString; - var minutesString = this.getMinutes(); + var minutesString = "" + this.getMinutes(); if (minutesString.length == 1) minutesString = '0' + minutesString; - return hoursString + ":" + minutesString; } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 2f717ac7..d5993316 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -611,7 +611,13 @@ function drawCalendarEvent(eventData, sd, ed) { var divs = new Array(); - var title = eventData[3]; + var title; + if (currentView == "monthview" + && (eventData[7] == 0)) + title = startDate.getDisplayHoursString() + " " + eventData[3]; + else + title = eventData[3]; + // log("title: " + title); // log("viewS: " + viewStartDate); var startHour = null; @@ -1419,11 +1425,16 @@ function onCalendarRemove(event) { function configureSearchField() { var searchValue = $("searchValue"); - Event.observe(searchValue, "mousedown", onSearchMouseDown.bindAsEventListener(searchValue)); - Event.observe(searchValue, "click", popupSearchMenu.bindAsEventListener(searchValue)); - Event.observe(searchValue, "blur", onSearchBlur.bindAsEventListener(searchValue)); - Event.observe(searchValue, "focus", onSearchFocus.bindAsEventListener(searchValue)); - Event.observe(searchValue, "keydown", onSearchKeyDown.bindAsEventListener(searchValue)); + Event.observe(searchValue, "mousedown", + onSearchMouseDown.bindAsEventListener(searchValue)); + Event.observe(searchValue, "click", + popupSearchMenu.bindAsEventListener(searchValue)); + Event.observe(searchValue, "blur", + onSearchBlur.bindAsEventListener(searchValue)); + Event.observe(searchValue, "focus", + onSearchFocus.bindAsEventListener(searchValue)); + Event.observe(searchValue, "keydown", + onSearchKeyDown.bindAsEventListener(searchValue)); } function configureLists() {