diff --git a/UI/Contacts/UIxContactView.h b/UI/Contacts/UIxContactView.h index f27911392..e2740abf8 100644 --- a/UI/Contacts/UIxContactView.h +++ b/UI/Contacts/UIxContactView.h @@ -29,14 +29,8 @@ @interface UIxContactView : UIxComponent { NGVCard *card; - NSArray *phones; - CardElement *homeAdr; - CardElement *workAdr; - NSMutableArray *photosURL; } -//- (NSString *) fullName; -//- (NSArray *) orgUnits; - (NSString *) photoURL; @end diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m index 21998231c..8de22fdd4 100644 --- a/UI/Contacts/UIxContactView.m +++ b/UI/Contacts/UIxContactView.m @@ -47,11 +47,7 @@ { if ((self = [super init])) { - photosURL = nil; card = nil; - phones = nil; - homeAdr = nil; - workAdr = nil; } return self; @@ -60,7 +56,6 @@ - (void) dealloc { [card release]; - [photosURL release]; [super dealloc]; } @@ -217,12 +212,7 @@ { card = [[self clientObject] vCard]; if (card) - { - [card retain]; - phones = nil; - homeAdr = nil; - workAdr = nil; - } + [card retain]; else return [NSException exceptionWithHTTPStatus: 404 /* Not Found */ reason: @"could not locate contact"]; @@ -287,12 +277,7 @@ contact = [self clientObject]; card = [contact vCard]; if (card) - { - [card retain]; - phones = nil; - homeAdr = nil; - workAdr = nil; - } + [card retain]; else return [NSException exceptionWithHTTPStatus: 404 /* Not Found */ reason: @"could not locate contact"]; diff --git a/UI/Contacts/UIxListView.h b/UI/Contacts/UIxListView.h index 09d89b000..2f65d8900 100644 --- a/UI/Contacts/UIxListView.h +++ b/UI/Contacts/UIxListView.h @@ -30,7 +30,6 @@ { NGVList *list; SOGoContactGCSList *co; - id item; } @end diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m index da00ff65a..b3d47c6cd 100644 --- a/UI/Contacts/UIxListView.m +++ b/UI/Contacts/UIxListView.m @@ -30,62 +30,6 @@ @implementation UIxListView - -- (NSString *) listName -{ - return [list fn]; -} - -- (BOOL) hasNickname -{ - return [list nickname] != nil; -} -- (NSString *) listNickname -{ - return [list nickname]; -} - -- (BOOL) hasDescription -{ - return [list description] != nil; -} -- (NSString *) listDescription -{ - return [list description]; -} - -- (NSArray *) components -{ - return [list cardReferences]; -} - -- (BOOL) itemHasEmail -{ - return [[item email] length] > 0; -} - -- (NSString *) itemHref -{ - return [NSString stringWithFormat: @"mailto:%@", - [item email]]; -} - -- (NSString *) itemOnclick -{ - return [NSString stringWithFormat: @"return openMailTo('%@ <%@>');", - [item fn], [item email]]; -} - -- (NSString *) itemName -{ - return [item fn]; -} - -- (NSString *) itemEmail -{ - return [item email]; -} - - (void) checkListReferences { NSMutableArray *invalid; diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist index b716dc832..6455b527d 100644 --- a/UI/Contacts/product.plist +++ b/UI/Contacts/product.plist @@ -138,7 +138,7 @@ methods = { view = { protectedBy = "Access Contents Information"; - pageName = "UIxContactView"; + actionClass = "UIxContactView"; actionName = "data"; }; save = { @@ -183,12 +183,12 @@ methods = { view = { protectedBy = "Access Contents Information"; - pageName = "UIxListView"; + actionClass = "UIxListView"; actionName = "data"; }; properties = { protectedBy = "Access Contents Information"; - pageName = "UIxListView"; + actionClass = "UIxListView"; actionName = "properties"; }; save = { @@ -213,12 +213,12 @@ methods = { view = { protectedBy = "Access Contents Information"; - pageName = "UIxContactView"; + actionClass = "UIxContactView"; actionName = "data"; }; members = { protectedBy = "Access Contents Information"; - pageName = "UIxContactView"; + actionClass = "UIxContactView"; actionName = "members"; }; save = { diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox deleted file mode 100644 index 9f216b09b..000000000 --- a/UI/Templates/ContactsUI/UIxContactView.wox +++ /dev/null @@ -1,87 +0,0 @@ - - - - - -

-
-
-

-
- - - -
-
- -
-

-
- -
-
-

-
- -
-
-
-
-

-
- -
-
-

-
- -
-
diff --git a/UI/Templates/ContactsUI/UIxListView.wox b/UI/Templates/ContactsUI/UIxListView.wox deleted file mode 100644 index 6cffadb6c..000000000 --- a/UI/Templates/ContactsUI/UIxListView.wox +++ /dev/null @@ -1,34 +0,0 @@ - - -

-
-
-
-
-
-

-
-
-
- -
-
-
-