fixes

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@305 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 7607695a070ed6e2bddf7c377ffe34599cabfd34..8e9599686b378d5ddd11f55d8f557a645ff87039 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -657,6 +657,42 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD494D1806F6EB3A00E51EC9 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailAccount.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD494D1906F6EB3A00E51EC9 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailAccount.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD494D1A06F6EB3A00E51EC9 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailAccounts.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD494D1B06F6EB3A00E51EC9 = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailAccounts.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                AD5ED0AF06B1385700E3EC4B = {
                        fileEncoding = 4;
                        isa = PBXFileReference;
@@ -1658,6 +1694,10 @@
                        children = (
                                ADDF4D6A06DE0BAB00C4E7F8,
                                ADDF4D6D06DE0BAB00C4E7F8,
+                               AD494D1A06F6EB3A00E51EC9,
+                               AD494D1B06F6EB3A00E51EC9,
+                               AD494D1806F6EB3A00E51EC9,
+                               AD494D1906F6EB3A00E51EC9,
                                ADDF4D6F06DE0BAB00C4E7F8,
                                ADDF4D7006DE0BAB00C4E7F8,
                                ADDF4D7106DE0BAB00C4E7F8,

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index cac29e12d9843229994753568b6ca84bf9eeee28..c2f66d90453b4aeec1d5dd1649e8e1328c3491b2 100644 (file)
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.11
+
+       * UIxContactSelector.m: changed width of satellite window to 800px
+
+       * UIxContactsSelectionView.m: hardcoded paths to stylesheets due to
+         resource lookup problems.
+
+       * French.lproj/defaults.plist: copied the English strings here
+
 2004-09-13  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.10

diff --git a/SOGo/UI/Contacts/French.lproj/default.strings b/SOGo/UI/Contacts/French.lproj/default.strings
index 6cf7ce7dba5343e22a46377b3f38504fde88191b..a7ef693ed7add1bbe600bd5d1430de0e3dc30fff 100644 (file)
--- a/SOGo/UI/Contacts/French.lproj/default.strings
+++ b/SOGo/UI/Contacts/French.lproj/default.strings
@@ -1 +1,30 @@
 /* this file is in ISO-8859-1 format! */
+
+"Addressbook"       = "Addressbook";
+"Contact viewer"    = "Contact Viewer";
+"Contact editor"    = "Contact Editor";
+
+"Name"              = "Name";
+"Lastname"          = "Lastname";
+"Firstname"         = "Firstname";
+"EMail"             = "Email";
+"Phone"             = "Phone";
+"Fax"               = "Fax";
+"Location"          = "Location";
+"Organisation"      = "Organisation";
+"Unit"              = "Unit";
+"Common"            = "Common";
+
+"Addresses"         = "Addresses";
+"Postal"            = "Postal";
+"Home"              = "Home";
+"Extended"          = "Extended";
+"URL"               = "URL";
+
+/* button labels */
+
+"new"               = "new";
+"edit"              = "edit";
+"delete"            = "delete";
+"Save"              = "Save";
+"Cancel"            = "Cancel";

diff --git a/SOGo/UI/Contacts/UIxContactSelector.m b/SOGo/UI/Contacts/UIxContactSelector.m
index 32434cbb85ac18265676272a63622ca63fa8c732..54a4521e6daf73ed3a7d3c98f5fc8c1862dd7820 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactSelector.m
+++ b/SOGo/UI/Contacts/UIxContactSelector.m
@@ -101,7 +101,7 @@
   static NSString *codeFmt = \
   @"function %@() {\n"
   @"  var url = '../../Contacts/select?callback=%@';\n"
-  @"  var contactsWindow = window.open(url, '%@', 'width=420, height=400, left=10, top=10, toolbar=no, dependent=yes, menubar=no, location=no, resizable=yes, scrollbars=yes, directories=no, status=no');\n"
+  @"  var contactsWindow = window.open(url, '%@', 'width=600, height=400, left=10, top=10, toolbar=no, dependent=yes, menubar=no, location=no, resizable=yes, scrollbars=yes, directories=no, status=no');\n"
   @"  contactsWindow.focus();\n"
   @"}";
   return [NSString stringWithFormat:codeFmt,

diff --git a/SOGo/UI/Contacts/UIxContactsSelectionView.wox b/SOGo/UI/Contacts/UIxContactsSelectionView.wox
index b33b194dd0e04dd6ae6ca484f223539ace0344c0..0eaf9df7f6e1afd399fc24c1af5b364347cf6206 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactsSelectionView.wox
+++ b/SOGo/UI/Contacts/UIxContactsSelectionView.wox
@@ -12,8 +12,18 @@
     <meta name="description" content="SOGo Web Interface"/>
     <meta name="author" content="SKYRIX Software AG"/>
     <meta name="robots" content="stop"/>
+    <!-- THIS DOESN'T WORK
     <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
     <link type="text/css" rel="stylesheet" rsrc:href="calendar.css"/>
+    -->
+    <link type="text/css"
+          rel="stylesheet"
+          href="/sogod/so/ControlPanel/Products/CommonUI/Resources/uix.css"
+    />
+    <link type="text/css"
+          rel="stylesheet"
+          href="/sogod/so/ControlPanel/Products/CommonUI/Resources/calendar.css"
+    />
     <link href="mailto:hh@skyrix.com" rev="made"/>
     <style>
       table.contacttableview {

diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version
index 317960a726fc24e656b0d801367866c318018c26..c351558f441a4d159527ee99c46d76a467ff4349 100644 (file)
--- a/SOGo/UI/Contacts/Version
+++ b/SOGo/UI/Contacts/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11