From: helge Date: Tue, 26 Oct 2004 12:53:37 +0000 (+0000) Subject: work on layout X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c353097f295c70ecef1cf6333a0b66896512327;p=scalable-opengroupware.org work on layout git-svn-id: http://svn.opengroupware.org/SOGo/trunk@424 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 121db387..7152649e 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,5 +1,8 @@ 2004-10-26 Helge Hess + * UIxMailEditorAttach.wox, mailer.css: work on layout, added delete + action (v0.9.47) + * added new UIxMailEditorAttach component to manage draft attachments (v0.9.46) diff --git a/SOGo/UI/Mailer/README b/SOGo/UI/Mailer/README index f4d6165f..01404aed 100644 --- a/SOGo/UI/Mailer/README +++ b/SOGo/UI/Mailer/README @@ -7,6 +7,7 @@ SOGO Mailer UI TODO ==== - a lot ;-> +- SOPE: does not recognize ! Components ========== diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/Mailer/UIxMailEditorAttach.m index 54525848..efae6dfa 100644 --- a/SOGo/UI/Mailer/UIxMailEditorAttach.m +++ b/SOGo/UI/Mailer/UIxMailEditorAttach.m @@ -39,6 +39,7 @@ NSData *fileData1; NSData *fileData2; NSData *fileData3; + NSString *attachmentName; } @end @@ -49,6 +50,7 @@ @implementation UIxMailEditorAttach - (void)dealloc { + [self->attachmentName release]; [self->filePath1 release]; [self->filePath2 release]; [self->filePath3 release]; @@ -60,6 +62,13 @@ /* accessors */ +- (void)setAttachmentName:(NSString *)_value { + ASSIGNCOPY(self->attachmentName, _value); +} +- (NSString *)attachmentName { + return self->attachmentName; +} + - (void)setFilePath1:(NSString *)_value { ASSIGNCOPY(self->filePath1, _value); } @@ -138,4 +147,9 @@ return self; } +- (id)deleteAttachmentAction { + [self logWithFormat:@"delete attachment: %@", [self attachmentName]]; + return self; +} + @end /* UIxMailEditorAttach */ diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.wox b/SOGo/UI/Mailer/UIxMailEditorAttach.wox index fbb566d1..d0c4aa5f 100644 --- a/SOGo/UI/Mailer/UIxMailEditorAttach.wox +++ b/SOGo/UI/Mailer/UIxMailEditorAttach.wox @@ -17,42 +17,74 @@ - +

Attach

- - - - - - - - - - -

- - -
- -

Attachments

- -

- - + enctype="multipart/form-data" + id="attachment_form" + > +

+ + + + - + + - -

File:
	File:

+ + File: + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + +

+ Attachments +	+ +
	+ delete +

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version index 1493e282..ea2cd5d9 100644 --- a/SOGo/UI/Mailer/Version +++ b/SOGo/UI/Mailer/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=46 +SUBMINOR_VERSION:=47 # v0.9.43 requires NGObjWeb v4.3.73 # v0.9.42 requires NGObjWeb v4.3.72 diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css index 81f56581..37d00d0c 100644 --- a/SOGo/UI/Mailer/mailer.css +++ b/SOGo/UI/Mailer/mailer.css @@ -343,3 +343,33 @@ div#compose_text textarea { width: 100%; height: 280px; } + +/* attachment editor */ + +form#attachment_form { + background-color: #D4D0C8; + padding: 1px; +} + +div#attachment_list { + border-top-color: white; + border-top-width: 1; + border-top-style: solid; +} + +form#attachment_form input { + font-size: 10px; +} + +div#attachment_upload { + border-bottom-color: #808080; + border-bottom-width: 1; + border-bottom-style: solid; + padding: 4px; +} + +td.attachment_uplabel { + width: 15%; + font-size: 11px; + text-align: left; +} diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist index fa297475..a9f84089 100644 --- a/SOGo/UI/Mailer/product.plist +++ b/SOGo/UI/Mailer/product.plist @@ -347,6 +347,7 @@ pageName = "UIxMailEditor"; actionName = "save"; }; + viewAttachments = { protectedBy = "View"; pageName = "UIxMailEditorAttach"; @@ -357,6 +358,12 @@ pageName = "UIxMailEditorAttach"; actionName = "attach"; }; + deleteAttachment = { + protectedBy = "View"; + pageName = "UIxMailEditorAttach"; + actionName = "deleteAttachment"; + }; + send = { protectedBy = "View"; pageName = "UIxMailEditor";