From: wolfgang Date: Tue, 3 Apr 2007 14:24:35 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1041 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360656c5a47d345a936740745f09ffd3f4ef8509;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1041 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/ChangeLog b/ChangeLog index ac1ae32f..49f303d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-04-03 Wolfgang Sourdeau + + * UI/Scheduler/UIxCalTasksListView.m ([UIxCalTasksListView + -shouldDisplayCurrentTask]): the current task is not displayed if + it is NOT completed or if the "showCompletedTasks" flag is set. + The logic was inverted in Lightning and is now in SOGo too. + 2007-04-02 Wolfgang Sourdeau * UI/Contacts/UIxContactView.m ([UIxContactView -workUrl]): we diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index aa881ef1..4d51efad 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -314,7 +314,7 @@ validate_invalid_enddate = "Incorrect enddate field!"; validate_endbeforestart = "Enddate is before startdate!"; "Tasks" = "Tasks"; -"Hide completed tasks" = "Hide completed tasks"; +"Show completed tasks" = "Show completed tasks"; /* tabs */ "Task" = "Task"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 37002e78..b7175644 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -315,7 +315,7 @@ validate_invalid_enddate = "La date de fin est invalide !"; validate_endbeforestart = "La date de fin est avant la date de début !"; "Tasks" = "Tâches"; -"Hide completed tasks" = "Masquer les tâches accomplies"; +"Show completed tasks" = "Afficher les tâches accomplies"; /* tabs */ "Task" = "Tâche"; diff --git a/UI/Scheduler/UIxCalTasksListView.h b/UI/Scheduler/UIxCalTasksListView.h index dd1ab3fd..5cdc7f84 100644 --- a/UI/Scheduler/UIxCalTasksListView.h +++ b/UI/Scheduler/UIxCalTasksListView.h @@ -32,8 +32,8 @@ NSCalendarDate *startDate; NSCalendarDate *endDate; - BOOL knowsToHide; - BOOL hideCompleted; + BOOL knowsToShow; + BOOL showCompleted; NSDictionary *currentTask; } diff --git a/UI/Scheduler/UIxCalTasksListView.m b/UI/Scheduler/UIxCalTasksListView.m index a939a76f..349cee29 100644 --- a/UI/Scheduler/UIxCalTasksListView.m +++ b/UI/Scheduler/UIxCalTasksListView.m @@ -39,8 +39,8 @@ { startDate = nil; endDate = nil; - knowsToHide = NO; - hideCompleted = NO; + knowsToShow = NO; + showCompleted = NO; } return self; @@ -105,27 +105,27 @@ - (BOOL) shouldDisplayCurrentTask { - if (!knowsToHide) + if (!knowsToShow) { - hideCompleted - = [[self queryParameterForKey: @"hide-completed"] intValue]; - knowsToHide = YES; + showCompleted + = [[self queryParameterForKey: @"show-completed"] intValue]; + knowsToShow = YES; } - return !(hideCompleted - && [[currentTask objectForKey: @"status"] intValue] == 1); + return ([[currentTask objectForKey: @"status"] intValue] != 1 + || showCompleted); } -- (BOOL) shouldHideCompletedTasks +- (BOOL) shouldShowCompletedTasks { - if (!knowsToHide) + if (!knowsToShow) { - hideCompleted - = [[self queryParameterForKey: @"hide-completed"] intValue]; - knowsToHide = YES; + showCompleted + = [[self queryParameterForKey: @"show-completed"] intValue]; + knowsToShow = YES; } - return hideCompleted; + return showCompleted; } - (BOOL) isCurrentTaskCompleted diff --git a/UI/Templates/SchedulerUI/UIxCalTasksListView.wox b/UI/Templates/SchedulerUI/UIxCalTasksListView.wox index 37853c90..2ec74999 100644 --- a/UI/Templates/SchedulerUI/UIxCalTasksListView.wox +++ b/UI/Templates/SchedulerUI/UIxCalTasksListView.wox @@ -7,10 +7,10 @@ xmlns:label="OGo:label">

    LI._selected, TABLE._unfocused#appointmentsList TR._selected TD { - background: #dbdad5 !important;; + background: #d4d0c8 !important;; color: #fff !important;; } @@ -319,7 +319,7 @@ SPAN.weeksHeader, SPAN.monthsHeader { display: block; white-space: nowrap; - background: #dbdad5; + background: #d4d0c8; overflow: hidden; width: 100%; margin: 0px; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 2c069d7e..53bd748b 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -7,7 +7,7 @@ var listFilter = 'view_today'; var listOfSelection = null; var selectedCalendarCell; -var hideCompletedTasks = 0; +var showCompletedTasks = 0; var currentDay = ''; var currentView = "dayview"; @@ -632,7 +632,7 @@ function refreshAppointments() { } function refreshTasks() { - return _loadTasksHref("taskslist?hide-completed=" + hideCompletedTasks); + return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks); } function refreshAppointmentsAndDisplay() { @@ -817,8 +817,8 @@ function changeMonthCalendarDisplayOfSelectedDay(node) { node.addClassName("selectedDay"); } -function onHideCompletedTasks(node) { - hideCompletedTasks = (node.checked ? 1 : 0); +function onShowCompletedTasks(node) { + showCompletedTasks = (node.checked ? 1 : 0); return refreshTasks(); } diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css index f8592b78..865d314d 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.css +++ b/UI/WebServerResources/UIxAttendeesEditor.css @@ -33,7 +33,7 @@ TABLE#freeBusy TD.attendees margin: 0px; width: 11em; border: 0px !important; - background: #dbdad5 !important; + background: #d4d0c8 !important; overflow: hidden; left: 0px; } diff --git a/UI/WebServerResources/UIxContactEditor.css b/UI/WebServerResources/UIxContactEditor.css index 9fa6d6c8..043fb657 100644 --- a/UI/WebServerResources/UIxContactEditor.css +++ b/UI/WebServerResources/UIxContactEditor.css @@ -36,7 +36,7 @@ SPAN.caption border-left: 2px solid #fffffb; border-bottom: 2px solid #888; border-right: 2px solid #888; - background-color: #dbdad5; + background-color: #d4d0c8; -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight; -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight; -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index 4169c19c..c58770e0 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -12,7 +12,7 @@ BODY color: #000000; font-family: Bitstream VeraSans, Tahoma; font-size: 10pt; - background-color: #dbdad5; + background-color: #d4d0c8; border: 0px; margin: 0px; padding: 0px; @@ -325,7 +325,7 @@ INPUT.button border-left: 2px solid #fffffb; border-bottom: 2px solid #888; border-right: 2px solid #888; - background-color: #dbdad5; + background-color: #d4d0c8; -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight; -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight; -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; @@ -356,8 +356,8 @@ DIV#toolbar margin: 0px; padding: 0px; /* background: #f00; - */ height: 4em; - background-color: #dbdad5; + */ height: 4.2m; + background-color: #d4d0c8; white-space: nowrap; overflow: auto; } @@ -624,7 +624,7 @@ td.tbtv_subject_headercell DIV.dragHandle { position: absolute; z-index: 1; - background: #dbdad5; } + background: #d4d0c8; } DIV.dragHandle:active { background: #99a; } @@ -745,7 +745,7 @@ DIV.tabsContainer { position: relative; color: #000; - background: #dbdad5; + background: #d4d0c8; margin-top: 1.5em; border-top: 2px solid #fffffb; border-left: 2px solid #fffffb; @@ -787,7 +787,7 @@ DIV.tabsContainer > UL LI.active DIV.tabsContainer > UL LI.active { z-index: 5; - background: #dbdad5; + background: #d4d0c8; padding-top: 2px; padding-bottom: 2px; margin-top: -2px; }