From de273973b4a701fa6cc88a1b9ab1cb285e14b717 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 17 Dec 2014 14:58:20 -0500 Subject: [PATCH] Add wox templates to Mail and Contacts modules --- UI/Contacts/UIxContactFoldersView.m | 12 + UI/Contacts/product.plist | 4 + UI/MailerUI/UIxMailMainFrame.m | 34 +- UI/MailerUI/product.plist | 4 + .../ContactsUI/UIxContactEditorTemplate.wox | 279 ++++++++++++++ .../ContactsUI/UIxContactFoldersView.wox | 361 +----------------- .../ContactsUI/UIxContactViewTemplate.wox | 90 +++++ .../ContactsUI/UIxContactsUserFolders.wox | 1 + .../MailerUI/UIxMailFolderTemplate.wox | 28 ++ UI/Templates/MailerUI/UIxMailMainFrame.wox | 46 +-- UI/Templates/MailerUI/UIxMailViewTemplate.wox | 34 ++ UI/WebServerResources/js/ContactsUI.js | 2 +- 12 files changed, 469 insertions(+), 426 deletions(-) create mode 100644 UI/Templates/ContactsUI/UIxContactEditorTemplate.wox create mode 100644 UI/Templates/ContactsUI/UIxContactViewTemplate.wox create mode 100644 UI/Templates/MailerUI/UIxMailFolderTemplate.wox create mode 100644 UI/Templates/MailerUI/UIxMailViewTemplate.wox diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index 3a85187cb..4b3ceefb3 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -426,3 +426,15 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK; } @end + +@interface UIxContactViewTemplate : UIxComponent +@end + +@implementation UIxContactViewTemplate +@end + +@interface UIxContactEditorTemplate : UIxComponent +@end + +@implementation UIxContactEditorTemplate +@end diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist index 5a3198fd8..5b30b53ed 100644 --- a/UI/Contacts/product.plist +++ b/UI/Contacts/product.plist @@ -47,6 +47,10 @@ pageName = "UIxContactFoldersView"; actionName = "checkRights"; }; + contactEditorTemplate = { + protectedBy = "View"; + pageName = "UIxContactEditorTemplate"; + }; userFoldersTemplate = { protectedBy = "View"; pageName = "UIxContactsUserFolders"; diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index c5299797b..1f9353b3d 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -174,28 +174,6 @@ return [u hasSuffix:@"/"] ? @"view" : @"#"; } -- (NSString *) inboxData -{ - SOGoMailAccounts *accounts; - SOGoMailAccount *account; - SOGoMailFolder *inbox; - NSDictionary *data; - UIxMailListActions *actions; - - [self _setupContext]; - -#warning this code is dirty: we should not invoke UIxMailListActions from here! - actions = [[[UIxMailListActions new] initWithRequest: [context request]] autorelease]; - accounts = [self clientObject]; - - account = [accounts lookupName: @"0" inContext: context acquire: NO]; - inbox = [account inboxFolderInContext: context]; - - data = [actions getUIDsInFolder: inbox withHeaders: YES]; - - return [data jsonRepresentation]; -} - - (id ) composeAction { id contact; @@ -731,3 +709,15 @@ } @end /* UIxMailMainFrame */ + +@interface UIxMailFolderTemplate : UIxComponent +@end + +@implementation UIxMailFolderTemplate +@end + +@interface UIxMailViewTemplate : UIxComponent +@end + +@implementation UIxMailViewTemplate +@end diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index 163a4ad27..23cbebe71 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -337,6 +337,10 @@ protectedBy = "View"; pageName = "UIxMailSearch"; }; + viewerTemplate = { + protectedBy = "View"; + pageName = "UIxMailViewTemplate"; + }; editorTemplate = { protectedBy = "View"; pageName = "UIxMailEditor"; diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox new file mode 100644 index 000000000..f131e5b9b --- /dev/null +++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox @@ -0,0 +1,279 @@ + + +
+
+

+
{{card.$description()}} + {{category.value}} +
+
+
+
+ + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ + + + + + + +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+ diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 2b569b288..375630f07 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -254,365 +254,8 @@ - - + + diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox new file mode 100644 index 000000000..1901b8ccc --- /dev/null +++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox @@ -0,0 +1,90 @@ + + +
+
+

+
{{card.$description()}} + {{category.value}} +
+
+
+ + + + +
+
+
+ +
+
+ {{card.$birthday() | date}} +
+
+
+ +
+
+ {{ref.$fullname()}} + +
+
+
+
+
+
+ +
+
+ {{email.value}} +
+
+
+
+
+
+ +
+
+ {{phone.value}} +
+
+
+
+
+
+ +
+
+ {{url.value}} +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox index cdb4d7a2f..f3a6e5aa6 100644 --- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox +++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox @@ -4,6 +4,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" + xmlns:label="OGo:label" xmlns:uix="OGo:uix">
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox new file mode 100644 index 000000000..8963ef2f1 --- /dev/null +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -0,0 +1,28 @@ + + + +
+ diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index 64b4fee15..db3fe4b17 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -270,53 +270,11 @@ diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox new file mode 100644 index 000000000..68a024ba4 --- /dev/null +++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox @@ -0,0 +1,34 @@ + + +
+

+
+ + - + +
+

+ {{flag}} +

+
+
+
+ + + + +
+
+ diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js index 7757e523a..1691c2699 100644 --- a/UI/WebServerResources/js/ContactsUI.js +++ b/UI/WebServerResources/js/ContactsUI.js @@ -74,7 +74,7 @@ }) .state('addressbook.card.editor', { url: '/edit', - templateUrl: 'cardEditor.html', + templateUrl: 'contactEditorTemplate', // UI/Templates/Contacts/UIxContactEditorTemplate.wox controller: 'CardCtrl' });