merge of '5f7a29adfa72a5c2257226be59358d6ef7642557'
and 'add28d9d67adcd6d59ae80bdec669e2794e55fc3' Monotone-Parent: 5f7a29adfa72a5c2257226be59358d6ef7642557 Monotone-Parent: add28d9d67adcd6d59ae80bdec669e2794e55fc3 Monotone-Revision: f14f194e02808a128112c1844ba759925e48c6e7 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-10-21T21:59:43 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
ddfba84ebe
|
@ -1,3 +1,9 @@
|
||||||
|
2008-10-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
|
||||||
|
-contactSearchAction]): fixed typing of "contacts", which actually
|
||||||
|
is an NSArray.
|
||||||
|
|
||||||
2008-10-17 Francis Lachapelle <flachapelle@inverse.ca>
|
2008-10-17 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the
|
* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the
|
||||||
|
|
|
@ -141,7 +141,7 @@ withSearchOn: (NSString *) contact
|
||||||
return email;
|
return email;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSDictionary *) _responseForResults: (NSArray *) results
|
- (NSArray *) _responseForResults: (NSArray *) results
|
||||||
{
|
{
|
||||||
NSEnumerator *contacts;
|
NSEnumerator *contacts;
|
||||||
NSString *email, *infoKey, *info;
|
NSString *email, *infoKey, *info;
|
||||||
|
@ -255,7 +255,8 @@ withSearchOn: (NSString *) contact
|
||||||
|
|
||||||
- (id <WOActionResults>) contactSearchAction
|
- (id <WOActionResults>) contactSearchAction
|
||||||
{
|
{
|
||||||
NSDictionary *contacts, *data;
|
NSDictionary *data;
|
||||||
|
NSArray *contacts;
|
||||||
NSString *searchText;
|
NSString *searchText;
|
||||||
id <WOActionResults> result;
|
id <WOActionResults> result;
|
||||||
LDAPUserManager *um;
|
LDAPUserManager *um;
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
><var:foreach list="columnsDisplayOrder" item="currentColumn">
|
><var:foreach list="columnsDisplayOrder" item="currentColumn">
|
||||||
<td var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
|
<td var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
|
||||||
<var:if condition="currentColumn.value" const:value="Invisible">
|
<var:if condition="currentColumn.value" const:value="Invisible">
|
||||||
<img rsrc:src="empty.gif" width="100%" height="100%" label:title="void" />
|
<img rsrc:src="empty.gif" width="100%" height="100%" const:title="" />
|
||||||
</var:if>
|
</var:if>
|
||||||
<var:if condition="currentColumn.value" const:value="Attachment">
|
<var:if condition="currentColumn.value" const:value="Attachment">
|
||||||
<img rsrc:src="title_attachment_14x14.png" var:title="currentColumn.value" width="14"
|
<img rsrc:src="title_attachment_14x14.png" label:title="$currentColumn.value" width="14"
|
||||||
height="14"/>
|
height="14"/>
|
||||||
</var:if>
|
</var:if>
|
||||||
<var:if condition="currentColumn.value" const:value="Unread">
|
<var:if condition="currentColumn.value" const:value="Unread">
|
||||||
<img rsrc:src="title_read_14x14.png" var:title="currentColumn.value" />
|
<img rsrc:src="title_read_14x14.png" label:title="$currentColumn.value" />
|
||||||
</var:if>
|
</var:if>
|
||||||
<var:if condition="currentColumn.value" const:value="Invisible" const:negate="YES">
|
<var:if condition="currentColumn.value" const:value="Invisible" const:negate="YES">
|
||||||
<var:if condition="currentColumn.value" const:value="Attachment" const:negate="YES">
|
<var:if condition="currentColumn.value" const:value="Attachment" const:negate="YES">
|
||||||
|
|
Loading…
Reference in a new issue