From: wolfgang Date: Fri, 2 Mar 2007 22:28:13 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1029 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4e0708dea8ef9665c6d5ea6fdba16f96af3c7a;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1029 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m index 1f46861c..1e83db2f 100644 --- a/UI/Scheduler/UIxCalInlineAptView.m +++ b/UI/Scheduler/UIxCalInlineAptView.m @@ -209,8 +209,7 @@ deltaStart = (([startDate hourOfDay] * 60 + [startDate minuteOfHour] - dayStartHour * 60) / 15); - return [NSString stringWithFormat: @"appointment ownerIs%@ starts%d lasts%d", - [appointment objectForKey: @"owner"], + return [NSString stringWithFormat: @"appointment starts%d lasts%d", deltaStart, deltaLength, [startDate dayOfWeek]]; } diff --git a/UI/Templates/SchedulerUI/UIxCalCalendarsListView.wox b/UI/Templates/SchedulerUI/UIxCalCalendarsListView.wox index 52f01c74..b19ec1dc 100644 --- a/UI/Templates/SchedulerUI/UIxCalCalendarsListView.wox +++ b/UI/Templates/SchedulerUI/UIxCalCalendarsListView.wox @@ -11,7 +11,7 @@ { background-color: !important; } - DIV[class~='appointment'].ownerIs + TABLE.monthOverview DIV[owner~=''].appointment { background-color: !important; } diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox index cfe188f3..64d5c6f2 100644 --- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox +++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox @@ -7,7 +7,16 @@ xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url"> -
- +
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index edc70623..a94bcd8b 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -670,26 +670,6 @@ DIV.daysViewFor7Days DIV.day0 { left: 85.7142%; border-right: 1px solid #397d94; } -TABLE.monthOverview DIV.appointment -{ margin: 0px; - margin-top: 1px; - padding: 1px; - border: 0px; - height: auto; - width: auto; - position: static; - overflow: hidden; - background-color: #fff; } - -TABLE.monthOverview DIV.appointmentInside -{ cursor: default; - margin: 0px; - padding: 1px; - border: 0px; - height: auto; - width: auto; - position: static; } - DIV.daysView > DIV.hours { position: absolute; border: 0px; @@ -834,12 +814,12 @@ DIV.appointments > DIV.appointment position: absolute; left: 0px; right: 0px; - padding: 0px; } + padding: 1px; } DIV[class~="appointment"]._selected > DIV.appointmentInside -{ background-color: #ffa !important; } +{ -moz-opacity: 0.7; } -DIV.appointment > DIV +DIV.appointment > DIV.appointmentInside { position: absolute; overflow: hidden; top: 2px; @@ -847,6 +827,78 @@ DIV.appointment > DIV left: 2px; right: 2px; } +DIV.shadow +{ position: absolute; + background-color: #000; } + +DIV.shadow1 +{ left: 0px; + right: 0px; + top: 2px; + bottom: 0px; + -moz-opacity: 0.1; } + +DIV.shadow2 +{ left: 1px; + right: 1px; + top: 3px; + bottom: -2px; + -moz-opacity: 0.1; + -moz-border-radius: 3px; } + +DIV.shadow3 +{ left: 2px; + right: 2px; + top: 4px; + bottom: 0px; + -moz-opacity: 0.4; } + +DIV.shadow4 +{ left: 3px; + right: 3px; + top: 5px; + bottom: 1px; + -moz-opacity: 0.4; } + +DIV.gradient, DIV.text +{ position: absolute; + top: 2px; + left: 2px; + right: 2px; + bottom: 2px; + overflow: hidden; } + +DIV.gradient > IMG +{ height: 100%; + width: 100%; } + +TABLE.monthOverview DIV.appointment +{ margin: 0px; + margin-top: 1px; + padding: 1px; + border: 0px; + height: auto; + width: auto; + position: static; + overflow: hidden; + background-color: #fff; } + +TABLE.monthOverview DIV.appointmentInside +{ cursor: default; + margin: 0px; + padding: 1px; + border: 0px; + height: auto; + width: auto; + position: static; } + +TABLE.monthOverview DIV.shadow, +TABLE.monthOverview DIV.gradient +{ display: none; } + +TABLE.monthOverview DIV.text +{ position: static; } + DIV[class~="appointment"].starts0 { top: 0.000000%; }