Monotone-Parent: 42e55c8292b29dad1cd5260453c22ca05fb07f6e
Monotone-Revision: 5ca4f59d87c4968d9506582dbf635a39d0ac2f55 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-02-19T16:45:07 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
24e065f45a
commit
586e5f5642
|
@ -1,5 +1,9 @@
|
|||
2010-02-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Common/UIxPageFrame.m (-userIdentification): ancient
|
||||
"userEmail" method, with a more generic name. Also we now return
|
||||
the user's complete name.
|
||||
|
||||
* SoObjects/Mailer/SOGoMailAccount.m (-imapAclConformsToIMAPExt:)
|
||||
now based on the server's capability string.
|
||||
|
||||
|
|
|
@ -15,7 +15,4 @@ ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
|
|||
|
||||
CommonUI_BUNDLE_LIBS += \
|
||||
-lSOGoUI \
|
||||
-lNGObjWeb \
|
||||
-lNGMime \
|
||||
-lNGStreams -lNGExtensions -lEOControl \
|
||||
-lXmlRpc -lDOM -lSaxObjC -lWOExtensions
|
||||
-lNGObjWeb
|
||||
|
|
|
@ -400,9 +400,10 @@
|
|||
&& [user isSuperUser]);
|
||||
}
|
||||
|
||||
- (NSString *) userEmail
|
||||
- (NSString *) userIdentification
|
||||
{
|
||||
return [[context activeUser] systemEmail];
|
||||
/* The "identification" term is used in the human sense here. */
|
||||
return [[context activeUser] cn];
|
||||
}
|
||||
|
||||
- (BOOL) canLogoff
|
||||
|
|
|
@ -48,9 +48,10 @@
|
|||
<div id="linkBanner" class="linkbanner">
|
||||
<var:if condition="canLogoff"
|
||||
><a id="logoff" var:href="logoffPath"
|
||||
><var:string label:value="Disconnect" /> </a
|
||||
><span id="userEmailDisplay">
|
||||
<var:string var:value="userEmail" /> | </span></var:if>
|
||||
><var:string label:value="Disconnect"/> </a
|
||||
><span id="userIdentificationDisplay">
|
||||
<var:string var:value="userIdentification"/> | </span
|
||||
></var:if>
|
||||
<var:if condition="userHasCalendarAccess">
|
||||
<var:if condition="isCalendar">
|
||||
<span class="active"><var:string label:value="Calendar"
|
||||
|
|
|
@ -157,13 +157,13 @@ DIV.linkbanner SPAN
|
|||
DIV.linkbanner A:hover
|
||||
{ color: #dd5; }
|
||||
|
||||
DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userEmailDisplay
|
||||
DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userIdentificationDisplay
|
||||
{ float: right;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
padding-right: .5em; }
|
||||
|
||||
DIV.linkbanner SPAN#userEmailDisplay
|
||||
DIV.linkbanner SPAN#userIdentificationDisplay
|
||||
{ color: #DDDDDD; }
|
||||
|
||||
.linkbannerlinks
|
||||
|
|
|
@ -44,11 +44,4 @@ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
|
|||
|
||||
BUNDLE_LIBS += \
|
||||
-lSOGoUI \
|
||||
-lSOGo \
|
||||
-lOGoContentStore \
|
||||
-lGDLContentStore \
|
||||
-lGDLAccess \
|
||||
-lNGObjWeb \
|
||||
-lNGMime -lNGCards -lNGLdap \
|
||||
-lNGStreams -lNGExtensions -lEOControl \
|
||||
-lXmlRpc -lDOM -lSaxObjC
|
||||
-lSOGo
|
||||
|
|
Loading…
Reference in New Issue