git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1041 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index ac1ae32f3dfa5541d395079701784a2afd513671..49f303d4af34ed2ff9b4731e7897ce098db65219 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * 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  <wsourdeau@inverse.ca>
 
        * UI/Contacts/UIxContactView.m ([UIxContactView -workUrl]): we

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index aa881ef138400e2c96517d644c9ff89562c5852b..4d51efadb7258767afaca11577e96f35d0454076 100644 (file)
--- 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 37002e785b84668853b08507a0f2b074295f7ab1..b7175644486c8502db27accc9c5f8dd3a0f89224 100644 (file)
--- 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 dd1ab3fd8c4b795a1cf5484cf6d5363c660a18b9..5cdc7f84d8b87cefa7386c778b19f535d86664ff 100644 (file)
--- 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 a939a76f8ab407c5aee1099c99fe22c392d5d16e..349cee29c14b1e4bdf1e76080da3309d494e5ce8 100644 (file)
--- 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 37853c907c1228efe7b42b7cc752fce6cf5788ef..2ec74999b46420efb4ecd02a5820ad4a2d6a8cc1 100644 (file)
--- a/UI/Templates/SchedulerUI/UIxCalTasksListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalTasksListView.wox
@@ -7,10 +7,10 @@
     xmlns:label="OGo:label">
     <h2><var:string label:value="Tasks" /></h2>
     <label><input class="checkBox"
-        var:checked="shouldHideCompletedTasks"
+        var:checked="shouldShowCompletedTasks"
         type="checkbox"
-        onclick="return onHideCompletedTasks(this);"
-        /><var:string label:value="Hide completed tasks"
+        onclick="return onShowCompletedTasks(this);"
+        /><var:string label:value="Show completed tasks"
         /></label>
     <ul id="tasksList" multiselect="yes">
       <var:foreach list="fetchCoreTasksInfos" item="currentTask"

diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 172d13a6a2e144d172fd5d2b5c8999205d4d66e5..557a98e29a1b7bb3a1b792bb0cff357ef735092c 100644 (file)
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -315,7 +315,7 @@ DIV.contactSelection
   left: 0px;
   right: 0px;
   text-align: right;
-  background: #dbdad5;
+  background: #d4d0c8;
   border-top: 1px solid #fffffb;
   border-left: 0px;
   border-right: 0px;

diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 4a27af53bfd3379333ca267c94fa8dbb8396301d..be24c1a02fcfffd23356ca05a942964149aae5b4 100644 (file)
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -313,7 +313,7 @@ table.mailer_fieldtable
   overflow-x: hidden;
   height: 6.5em;
   border-bottom: 1px solid #808080;
-  background: #dbdad5;
+  background: #d4d0c8;
 }
 
 div.mailer_mailcontent

diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index abc6070b9cef71949f3ed95cfab83ecc22e1f865..0279dbf7b2f6141431a53c20d5153246413cf83b 100644 (file)
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -306,7 +306,7 @@ TABLE#appointmentsList TR._selected TD
 UL._unfocused > 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 2c069d7e190848613a237c137530728b206168c2..53bd748be8012dafe9e9a3897ba94d2fb4ef3e1c 100644 (file)
--- 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 f8592b78aaad61981659c302e84abe1a2e7e9696..865d314dd32ec0d67497e689c675278b88b6d462 100644 (file)
--- 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 9fa6d6c8029405abe463797c3003487f49f97a10..043fb657bae1a2c16a86faf40f1d3807a9119bf8 100644 (file)
--- 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 4169c19c1ecf0497aa0af620d45c53c4e8ad4a29..c58770e0927adb7e7ced041b31b077c0ca9c38e1 100644 (file)
--- 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; }