Monotone-Parent: 2ddf3577ff0d5f52e3f3dda10dce5e8c94f2421b
Monotone-Revision: aca422868e377bcf123be4fcaa0a258238b473a6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-12-17T20:45:48 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
21de09a9f0
commit
b62a6e9f7f
|
@ -1,5 +1,9 @@
|
|||
2007-12-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -attachmentNames]):
|
||||
initialize "attachmentNames" if it was NOT initialized... I think
|
||||
this was a typo.
|
||||
|
||||
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
|
||||
-fetchMailForForwarding:sourceMail]): append the signature to
|
||||
mails forwarded as attachment.
|
||||
|
|
|
@ -396,11 +396,11 @@ static NSArray *infoKeys = nil;
|
|||
{
|
||||
NSArray *a;
|
||||
|
||||
if (attachmentNames)
|
||||
if (!attachmentNames)
|
||||
{
|
||||
a = [[self clientObject] fetchAttachmentNames];
|
||||
a = [a sortedArrayUsingSelector: @selector (compare:)];
|
||||
attachmentNames = [a copy];
|
||||
ASSIGN (attachmentNames,
|
||||
[a sortedArrayUsingSelector: @selector (compare:)]);
|
||||
}
|
||||
|
||||
return attachmentNames;
|
||||
|
|
|
@ -23,15 +23,15 @@
|
|||
</div>
|
||||
|
||||
<form const:href="send" name="pageform" enctype="multipart/form-data">
|
||||
<div id="attachmentsArea">
|
||||
<var:string label:value="Attachments:" />
|
||||
<ul id="attachments">
|
||||
<var:foreach list="attachmentNames" item="attachmentName"
|
||||
><li><img rsrc:src="attachment.gif"
|
||||
/><var:string value="attachmentName"
|
||||
/></li></var:foreach>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="attachmentsArea">
|
||||
<var:string label:value="Attachments:" />
|
||||
<ul id="attachments">
|
||||
<var:foreach list="attachmentNames" item="attachmentName"
|
||||
><li><img rsrc:src="attachment.gif"
|
||||
/><var:string value="attachmentName"
|
||||
/></li></var:foreach>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="headerArea">
|
||||
<span class="headerField"><var:string label:value="From" />:</span>
|
||||
<var:popup const:name="from"
|
||||
|
@ -47,12 +47,12 @@
|
|||
><span class="headerField"><var:string label:value="Subject"
|
||||
/>:</span
|
||||
>
|
||||
<input name="subject"
|
||||
type="text"
|
||||
class="textField"
|
||||
var:value="subject"
|
||||
/></div>
|
||||
<!-- separator line --><hr/>
|
||||
<input name="subject"
|
||||
type="text"
|
||||
class="textField"
|
||||
var:value="subject"
|
||||
/></div>
|
||||
<!-- separator line --><hr/>
|
||||
</div>
|
||||
<textarea id="text" name="text" rows="30" var:value="text"/>
|
||||
<!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
|
||||
|
|
Loading…
Reference in a new issue