From be8739f658a5ad0c8e468988d2348fd3eecd6411 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 2 Nov 2006 22:05:03 +0000 Subject: [PATCH] Monotone-Parent: bf564e0891d80423226b26b83ed9a1ba7983bff5 Monotone-Revision: 62549471f18965b7b2503aa161e5f3bcffbf413f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-11-02T22:05:03 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.css | 11 +++--- UI/WebServerResources/SchedulerUI.css | 48 ++++++++++++++++++++++++--- UI/WebServerResources/SchedulerUI.js | 3 +- UI/WebServerResources/generic.css | 18 +++++----- UI/WebServerResources/generic.js | 8 ++--- 5 files changed, 64 insertions(+), 24 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 0145fbb12..8454f6eca 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -67,10 +67,9 @@ DIV#contactsListContent .titlediv { - height: 24px; - vertical-align: middle; - padding-top: 6px; - padding-left: 6px; + line-height: 2em; + vertical-align: bottom; + padding-left: 1em; } table.titletable @@ -122,10 +121,12 @@ DIV#contactFoldersList DIV#contactFoldersList > DIV.toolbar { width: 100%; background: #f00; + padding: 0px; + margin: 0px; border-top: 1px solid #aaa; border-left: 1px solid #aaa; } -DIV#contactFoldersList UL +UL#contactFolders { list-style-type: none; list-style-image: none; clear: both; diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index c0a784630..85a2d6b0a 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -292,24 +292,62 @@ TABLE._unfocused#appointmentsList TR._selected TD } TABLE.dayOverview, -TABLE.weekOverview +TABLE.weekOverview, +TABLE.monthOverview { margin: 0 auto; padding: 1em; border-collapse: collapse; } +TABLE.monthOverview +{ position: absolute; + display: table; + margin: 0px auto; + padding: 0px; + width: 98%; + height: 98%; } + +TABLE.monthOverview +{ min-width: 60em; + min-height: 25em; } + +TABLE.monthOverview DIV.appointmentView +{ border: 0px; + margin: 0px; + padding: 0px; } + +TABLE.monthOverview TD.contentOfDay +{ vertical-align: top; } + +SPAN.dayCellLabel +{ color: #77a; + font-weight: bold; } + TABLE.weekOverview TD.dayOfToday { background-color: #deebf7; } -TABLE.weekOverview TD.weekEndDay +TABLE.monthOverview TD.dayOfToday +{ border: 3px solid #99f; + background-color: #deebf7; } + +TABLE.weekOverview TD.weekEndDay, +TABLE.monthOverview TD.weekEndDay { background-color: #fffbe7; } -TABLE.weekOverview TD.selectedDay +TABLE.monthOverview TD.dayOfAnotherMonth +{ background-color: #eef; } + +TABLE.weekOverview TD.selectedDay, +TABLE.monthOverview TD.selectedDay { background-color: #ffe79c; } TABLE.dayOverview TD, TABLE.weekOverview TD { border: 1px solid #99f; } +TABLE.monthOverview TD +{ border: 2px solid #99f; + height: 15%; } + TABLE.dayOverview TD.header { text-align: center; color: #77a; @@ -317,10 +355,12 @@ TABLE.dayOverview TD.header font-weight: bold; background: #eef; } -TABLE.weekOverview TD.header +TABLE.weekOverview TD.header, +TABLE.monthOverview TD.header { text-align: center; color: #77a; width: 14%; + height: 2em; font-weight: bold; background: #eef; } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 0a0859c61..656586557 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -673,7 +673,8 @@ function onCalendarSelectDay(event, node) { var day = node.getAttribute("day"); - changeCalendarDisplayOfSelectedDay(node); + if (currentView != 'dayview') + changeCalendarDisplayOfSelectedDay(node); changeDateSelectorDisplay(day); event.cancelBubble = true; diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index 6fdda50a3..f5b28f1ae 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -3,7 +3,7 @@ /* common stuff */ /* Bitstream VeraSans, , Tahoma, FreeSans, Helvetica, sans-serif */ -body +BODY { position: absolute; top: 0px; left: 0px; @@ -475,7 +475,10 @@ SPAN.toolbarButton:active { background-image: url('submenu-active.gif') !important; } DIV#logConsole -{ z-index: 1000; +{ position: absolute; + overflow: auto; + display: none; + z-index: 1000; -moz-opacity: 0.7; border-top: 2px solid #fffffb; border-left: 2px solid #fffffb; @@ -485,15 +488,12 @@ DIV#logConsole -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent; font-family: monospace; font-weight: bold; - position: absolute; background: #000; color: #ddd; top: 1em; left: 0px; right: 0px; - height: 15em; - overflow: auto; - visibility: hidden; } + height: 15em; } /* content lists */ td.tbtv_actcell @@ -625,8 +625,7 @@ INPUT#searchValue color: #aaa; } DIV#noJavascriptError -{ - position: absolute; +{ position: absolute; background: #999; -moz-opacity: 0.6; z-index: 2; @@ -637,8 +636,7 @@ DIV#noJavascriptError text-align: center; } DIV.noJavascriptErrorMessage -{ - position: absolute; +{ position: absolute; z-index: 2; border-top: 2px solid #fffffb; border-left: 2px solid #fffffb; diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 0b42529e7..279bff086 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -557,11 +557,11 @@ function onLogDblClick(event) function toggleLogConsole() { var logConsole = document.getElementById('logConsole'); - var visibility = '' + logConsole.style.visibility; - if (visibility.length == 0) { - logConsole.style.visibility = 'visible;'; + var display = '' + logConsole.style.display; + if (display.length == 0) { + logConsole.style.display = 'block;'; } else { - logConsole.style.visibility = ''; + logConsole.style.display = ''; } return false;