From 412d3de100d3245c7430bcae678d1efd6bbbe2d3 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 12 Nov 2007 20:04:42 +0000 Subject: [PATCH] Monotone-Parent: d63ac588bc9d6090e40d0640860dacaee66d0edb Monotone-Revision: 20c7862f09b4fde6c2067b6fa562bc2dcd72ae78 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-11-12T20:04:42 Monotone-Branch: ca.inverse.sogo --- .../ContactsUI/UIxContactsListView.wox | 2 +- UI/Templates/MailerUI/UIxMailListView.wox | 2 +- UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 +- UI/WebServerResources/SchedulerUI.css | 62 +++++++++---------- UI/WebServerResources/SchedulerUI.js | 6 +- UI/WebServerResources/UIxTaskEditor.css | 2 +- UI/WebServerResources/generic.css | 4 +- UI/WebServerResources/iefixes.css | 8 +++ 8 files changed, 48 insertions(+), 40 deletions(-) diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox index f5cb5e3da..efc8c859f 100644 --- a/UI/Templates/ContactsUI/UIxContactsListView.wox +++ b/UI/Templates/ContactsUI/UIxContactsListView.wox @@ -9,7 +9,7 @@ className="UIxContactsListViewContainer" selectorComponentClass="selectorComponentClass" title="name"> - +
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox index 31d5ed63f..a0dec12e6 100644 --- a/UI/Templates/MailerUI/UIxMailListView.wox +++ b/UI/Templates/MailerUI/UIxMailListView.wox @@ -1,6 +1,6 @@ -
-
+
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 609da77c4..cd70d984e 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -191,23 +191,19 @@ DIV#dateSelectorView margin: 0px; border: 0px; } -#dateSelector > .header A -{ width: 1em; - padding: .4em .2em; } - #dateSelector > .header #leftArrow { float: left; } #dateSelector > .header #rightArrow -{ float: right; } +{ float: right; + margin-right: 2px; } #dateSelector > .header SPAN { cursor: default; font-size: medium; vertical-align: middle; font-weight: bold; - border: 1px solid transparent; - margin: .5em .2em; } + border: 1px solid transparent; } #dateSelector > .header SPAN:hover { border-left: 1px solid #fff; @@ -221,43 +217,32 @@ DIV#dateSelectorView TABLE#dateSelectorTable { padding: 2px; } -#dateSelector TABLE#dateSelectorTable TD -{ width: 14%; } - -#dateSelector TABLE#dateSelectorTable TD TABLE TD -{ width: 100% } - #dateSelector TABLE, #dateSelector TABLE TABLE { border-collapse: collapse; margin: 0px auto; width: 100%; } +#dateSelector TABLE#dateSelectorTable TD TABLE TD +{ width: 0px; /* temp hack */ } + +#dateSelector TABLE#dateSelectorTable TD TABLE TD.activeDay, +#dateSelector TABLE#dateSelectorTable TD TABLE TD.inactiveDay, +#dateSelector TABLE#dateSelectorTable TD TABLE TD.dayOfToday +{ width: 1em; } + #dateSelector TABLE TABLE TD { cursor: pointer; margin: 0px; padding: 0px; - width: 100%; - border: 1px solid #fff; } + border: 1px solid #fff; + text-align: center; } #dateSelector TABLE TABLE TD:hover -{ color: #f00; - border: 1px solid #deebf7; } - -#dateSelector TABLE TABLE TD:hover A -{ color: #f00; } - -#dateSelector .inactiveDay -{ color: #dedfde; } - -#dateSelector .dayOfToday -{ background-color: #deebf7; - border: 1px solid #deebf7; } +{ border: 1px solid #deebf7; } #dateSelector TD SPAN -{ width: 1.5em; - height: 1.5em; - text-align: center; +{ text-align: center; display: block; } #dateSelector TD SPAN A @@ -269,6 +254,17 @@ TABLE#dateSelectorTable { background-color: #ddd; border: 1px solid #deebf7; } +#dateSelector TD.inactiveDay A +{ color: #dedfde; } + +#dateSelector TD.dayOfToday +{ background-color: #deebf7; + border: 1px solid #deebf7; } + +#dateSelector TD._selected A +{ color: #fff; } + + TABLE#eventsList { width: 100%; } @@ -287,9 +283,9 @@ TABLE#eventsList TH ._unfocused#dateSelector TD._selected, UL._unfocused > LI._selected, TABLE._unfocused#eventsList TR._selected TD -{ - background-color: #d4d0c8 !important;; - color: #fff !important;; +{ + background-color: #d4d0c8 !important; + color: #fff !important; } SPAN.dayCellLabel diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 22e7b72ab..3f3885394 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -6,6 +6,7 @@ var listFilter = 'view_today'; var listOfSelection = null; var selectedCalendarCell; +var calendarColorIndex = null; var showCompletedTasks = 0; @@ -1459,9 +1460,12 @@ function appendCalendar(folderName, folderPath) { li.setAttribute("owner", owner); // Generate new color + if (calendarColorIndex == null) + calendarColorIndex = lis.length; + calendarColorIndex++; var colorTable = [1, 1, 1]; var color; - var currentValue = lis.length + 1; + var currentValue = calendarColorIndex; var index = 0; while (currentValue) { if (currentValue & 1) diff --git a/UI/WebServerResources/UIxTaskEditor.css b/UI/WebServerResources/UIxTaskEditor.css index ec02c5e11..a6a1a1d58 100644 --- a/UI/WebServerResources/UIxTaskEditor.css +++ b/UI/WebServerResources/UIxTaskEditor.css @@ -58,7 +58,7 @@ TEXTAREA padding-bottom: 0em; } SELECT#calendarList -{ width: 7em; } +{ width: 20em; } A#changeUrlButton { margin-left: 1em; } diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index d5c1c5291..c9a2ca833 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -600,9 +600,9 @@ LI.denied LI._selected, TR._selected > TD, TD._selected -{ +{ background-color: #4b6983; - color: #fff; + color: #000 !important; } LI[class~="_selected"].denied diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css index ff0757e13..412621b26 100644 --- a/UI/WebServerResources/iefixes.css +++ b/UI/WebServerResources/iefixes.css @@ -16,11 +16,19 @@ DIV.javascriptMessagePseudoWindow, DIV.javascriptMessagePseudoTopWindow { filter: alpha(opacity=100); } +TD.headerCell, +TD.tbtv_headercell, +TD.tbtv_navcell +{ border: 1px solid #fff; + border-right: 1px solid #666; + border-bottom: 1px solid #666; } + /* MailerUI */ IMG.dragMessage { filter: alpha(opacity=70); } /* SchedulerUI */ + DIV[class~="event"]._selected > DIV.eventInside { filter: alpha(opacity=70); }