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

diff --git a/NEWS b/NEWS
index a273bf94cbf7e07b7838135c058b9cb87b4d57be..89447f0b272720d060890cc06516882c75551d9a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
 - mail folders state is now saved;
 - image attachments in emails can now be saved;
 - the status of participants in represented with an icon;
+- added the option to save attached images;
+- fixed problems with mod_ngobjweb (part of SOPE);
 - the current module can no longer be reselected from the module navigation bar;
 - many bugfixes in the Mail and Calendar modules;
 - improved handling of ACLs;

diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 73b60ebda083ed31eec38af4894d808f437c5327..f47591e7d2b9d9d6883ee5e0cb87eb46be93463f 100644 (file)
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -757,7 +757,7 @@ static GCSStringFormatter *stringFormatter = nil;
     [self errorWithFormat:@"could not open storage channel!"];
     return nil;
   }
-  if (!self->ofFlags.sameTableForQuick)
+  if (self->ofFlags.sameTableForQuick)
     quickChannel = nil;
   else {
     if ((quickChannel = [self acquireQuickChannel]) == nil) {

diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index f18682828dbe9d7d2553d9581b50d57a772cc891..76e5bb819ab2e548ed2cf4ee4668de1d141d0a6b 100644 (file)
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -18,7 +18,7 @@ DIV#freeBusyView
   margin-top: 0.5em;
   top: 2em;
   bottom: 14.5em;
-  left: 13em;
+  left: 15em;
   right: 0px;
   overflow: auto;
   border-top: 2px solid #222;
@@ -47,7 +47,7 @@ TABLE#freeBusy TD.attendees
   padding: 0px .5em;
   padding-right: 0px;
   margin: 0px;
-  width: 13em;
+  width: 15em;
   border: 0px !important;
   background-color: #d4d0c8;
   overflow: hidden;
@@ -62,10 +62,11 @@ TABLE#freeBusy TD.attendees INPUT
 { background-image: url("abcard.gif");
   background-repeat: no-repeat;
   background-position: 2px center;
-  width: 11.5em;
+  width: 12em;
   margin: 0px;
   padding-left: 24px;
-  margin-left: 5px; }
+  margin-left: 5px;
+  margin-left: 1.5em; }
 
 TABLE#freeBusy TR.needs-action TD.attendees
 { background-image: url("needs-action.png");
@@ -82,12 +83,6 @@ TABLE#freeBusy TR.accepted TD.attendees
   background-repeat: no-repeat;
   background-position: 5px center; }
 
-TABLE#freeBusy TR.needs-action INPUT,
-TABLE#freeBusy TR.accepted INPUT,
-TABLE#freeBusy TR.declined INPUT
-{ margin-left: 1.5em;
-  width: 10em; }
-
 TABLE#freeBusy TR.futureAttendee INPUT
 { background-image: none; }
 
@@ -207,7 +202,7 @@ DIV#freeBusyViewButtons
   padding: 3px;
   height: 2em;
   top: 0px;
-  left: 13em; }
+  left: 15em; }
 
 DIV#freeBusyZoomButtons
 { position: absolute;

diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 80702119ce9de9e8d4a18d35c74bf6f6257a921e..0dd08ca0dc755d3928143b069867a375f0f6b18e 100644 (file)
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -77,6 +77,9 @@ DIV#attendeesMenu
 { overflow: scroll;
   overflow-x: hidden; }
 
+DIV#attendeesView
+{ left: 0px; }
+
 DIV#freeBusyView
 { border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
@@ -93,10 +96,5 @@ TABLE#freeBusy TD.attendees
 
 TABLE#freeBusy TD.attendees INPUT
 { border-bottom: 1px solid #ccc;
-  border-right: 1px solid #ccc; }
-
-TABLE#freeBusy TR.needs-action INPUT,
-TABLE#freeBusy TR.accepted INPUT,
-TABLE#freeBusy TR.declined INPUT
-{ margin-left: 2.0em;
-  width: 10.0em; }
+  border-right: 1px solid #ccc;
+  margin-left: 2.0em; }