diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox index 929a66ca5..7d769af30 100644 --- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox +++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox @@ -26,10 +26,7 @@ >
+ >
+ diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox index 48cb8e082..b80c661a2 100644 --- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox +++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox @@ -20,7 +20,7 @@ label:value="Public Event" />
  • -
  • diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index fec8322af..f84dcd5a4 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1054,6 +1054,7 @@ function appendCalendar(folderName, folder) { checkBox.type = "checkbox"; checkBox.addEventListener("change", updateCalendarStatus, false); li.appendChild(checkBox); + li.appendChild(document.createTextNode(" ")); var colorBox = document.createElement("div"); colorBox.appendChild(document.createTextNode("OO")); colorBox.addClassName("colorBox"); @@ -1068,6 +1069,10 @@ function appendCalendar(folderName, folder) { var contactId = folder.split(":")[0]; var styles = document.getElementsByTagName("style"); + + var url = URLForFolderID(folder) + "/canAccessContent"; + triggerAjaxRequest(url, calendarEntryCallback, folder); + styles[0].innerHTML += ('.ownerIs' + contactId + ' {' + ' background-color: ' + color diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js index 525a9b1c6..8e2945d2f 100644 --- a/UI/WebServerResources/UIxComponentEditor.js +++ b/UI/WebServerResources/UIxComponentEditor.js @@ -78,9 +78,8 @@ function onChangeCalendar(event) { else ownerLogin = UserLogin; urlElems[urlElems.length-4] = ownerLogin; - + form.setAttribute("action", urlElems.join("/")); - log ("after: " + form.getAttribute("action")); } function refreshAttendees() { @@ -153,5 +152,9 @@ function onComponentEditorLoad(event) { initializeAttendeesHref(); initializeDocumentHref(); initializePrivacyMenu(); - $("calendarList").addEventListener("change", onChangeCalendar, false); + var list = $("calendarList"); + list.addEventListener("change", onChangeCalendar, false); + var onSelectionChangeEvent = document.createEvent("Event"); + onSelectionChangeEvent.initEvent("change", false, false); + list.dispatchEvent(onSelectionChangeEvent); }