From c00f818407089a74a0a83e11ee75a011c1be01d3 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 1 Jun 2007 20:35:51 +0000 Subject: [PATCH] Monotone-Parent: 13eeb49749c2fffd30ec7595581aa47c40de5671 Monotone-Revision: 0444b46399c9927608800ce991a1f206d6d1112f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T20:35:51 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.css | 17 ----------------- UI/WebServerResources/ContactsUI.js | 7 ++----- UI/WebServerResources/SchedulerUI.css | 13 ------------- UI/WebServerResources/SchedulerUI.js | 17 +++++------------ .../UIxCalUserRightsEditor.css | 4 ++-- .../UIxContactsUserRightsEditor.css | 4 ++-- .../UIxMailUserRightsEditor.css | 4 ++-- UI/WebServerResources/generic.css | 18 ++++++++++++++++++ 8 files changed, 31 insertions(+), 53 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 89eefdd8b..e11714e9a 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -145,11 +145,6 @@ UL#contactFolders -moz-border-left-colors: #9c9a94 #000; overflow: auto; } -UL#contactFolders LI.denied -{ background: #fefefe; - font-style: italic; - color: #f33; } - DIV#contactFoldersList LI { padding: .2em 1em; @@ -158,12 +153,6 @@ DIV#contactFoldersList LI white-space: nowrap; } -DIV#contactFoldersList LI._selected -{ - background: #4b6983; - color: #fff; -} - .treecell { color: black; @@ -204,12 +193,6 @@ TABLE#contactsList TD IMG margin-right: .2em; } -TABLE#contactsList TR._selected TD -{ - background: #4b6983; - color: #fff; -} - TABLE#contactsList TR._deleted TD { text-decoration: line-through; diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 264ccac5a..0bfa6a7dc 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -3,7 +3,7 @@ var cachedContacts = new Array(); var currentContactFolder = '/personal'; -var usersRightsWindowHeight = 180; +var usersRightsWindowHeight = 200; var usersRightsWindowWidth = 450; function openContactWindow(sender, url) { @@ -561,10 +561,7 @@ function lookupDeniedFolders() { function deniedFoldersLookupCallback(http) { if (http.readyState == 4) { - var denied = true; - - if (http.status == 200) - denied = (http.responseText == "0"); + var denied = (http.status != 204) var entry = $(http.callbackData); if (denied) entry.addClassName("denied"); diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 92f4c6e57..f127a277c 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -81,11 +81,6 @@ UL#calendarList UL#calendarList LI { white-space: nowrap; } -UL#calendarList LI.denied -{ background-color: #fefefe; - font-style: italic; - color: #f33; } - UL#tasksList { position: absolute; width: 100%; @@ -303,14 +298,6 @@ TABLE#appointmentsList td.tbtv_subject_headercell, TABLE#appointmentsList td.headerLocation { width: 35%; } -#dateSelector TD._selected, -UL > LI._selected, -TABLE#appointmentsList TR._selected TD -{ - background: #4b6983 !important; - color: #fff !important; -} - ._unfocused#dateSelector TD._selected, UL._unfocused > LI._selected, TABLE._unfocused#appointmentsList TR._selected TD diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 3070c4923..42738a712 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -911,20 +911,13 @@ function calendarStatusCallback(http) { } function calendarEntryCallback(http) { - var disabled = true; - - if (http.readyState == 4) { - if (http.status == 200) - disabled = (http.responseText == "0"); + if (http.readyState == 4) { + var denied = (http.status != 204) var entry = $(http.callbackData); - var input = entry.childNodesWithTag("input")[0]; - input.disabled = disabled; - if (disabled) { - input.checked = false; - $(entry).addClassName("denied"); - } + if (denied) + entry.addClassName("denied"); else - $(entry).removeClassName("denied"); + entry.removeClassName("denied"); } } diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.css b/UI/WebServerResources/UIxCalUserRightsEditor.css index eaea5734b..3e7b6991b 100644 --- a/UI/WebServerResources/UIxCalUserRightsEditor.css +++ b/UI/WebServerResources/UIxCalUserRightsEditor.css @@ -1,7 +1,7 @@ DIV.title { color: #000; vertical-align: bottom; - padding-top: 15px; + padding-top: 8px; padding-left: 1em; height: 33px; background-color: #fff; @@ -9,7 +9,7 @@ DIV.title DIV.title SPAN.value { margin-left: 1em; - font-size: 18px; + font-size: 14px; font-weight: bold; } DIV.calendarUserRights diff --git a/UI/WebServerResources/UIxContactsUserRightsEditor.css b/UI/WebServerResources/UIxContactsUserRightsEditor.css index eaea5734b..3e7b6991b 100644 --- a/UI/WebServerResources/UIxContactsUserRightsEditor.css +++ b/UI/WebServerResources/UIxContactsUserRightsEditor.css @@ -1,7 +1,7 @@ DIV.title { color: #000; vertical-align: bottom; - padding-top: 15px; + padding-top: 8px; padding-left: 1em; height: 33px; background-color: #fff; @@ -9,7 +9,7 @@ DIV.title DIV.title SPAN.value { margin-left: 1em; - font-size: 18px; + font-size: 14px; font-weight: bold; } DIV.calendarUserRights diff --git a/UI/WebServerResources/UIxMailUserRightsEditor.css b/UI/WebServerResources/UIxMailUserRightsEditor.css index eaea5734b..3e7b6991b 100644 --- a/UI/WebServerResources/UIxMailUserRightsEditor.css +++ b/UI/WebServerResources/UIxMailUserRightsEditor.css @@ -1,7 +1,7 @@ DIV.title { color: #000; vertical-align: bottom; - padding-top: 15px; + padding-top: 8px; padding-left: 1em; height: 33px; background-color: #fff; @@ -9,7 +9,7 @@ DIV.title DIV.title SPAN.value { margin-left: 1em; - font-size: 18px; + font-size: 14px; font-weight: bold; } DIV.calendarUserRights diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index ca630042b..6c1ff9194 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -556,6 +556,24 @@ A[class~="_disabled"].button:active { color: #999; background: inherit; } +LI.denied +{ background-color: #fefefe; + font-style: italic; + color: #f33; } + +LI._selected, +TR._selected > TD, +TD._selected +{ + background-color: #4b6983; + color: #fff; +} + +LI[class~="_selected"].denied +{ + background-color: #f33; +} + /* folder tree (js) )*/ DIV.dTreeNode A SPAN.nodeName {