Monotone-Parent: 8641791497cbe0e199fc4b68731683dd533ce48e

Monotone-Revision: 8d583d2e8977d0d63e028818f6f961246d256bdd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-09T14:53:44
maint-2.0.2
Wolfgang Sourdeau 2011-12-09 14:53:44 +00:00
parent 1918939a8c
commit 7ec440bbc1
4 changed files with 92 additions and 49 deletions

View File

@ -479,24 +479,6 @@
return canLogoff;
}
- (BOOL) userHasCalendarAccess
{
SOGoUser *user;
user = [context activeUser];
return [user canAccessModule: @"Calendar"];
}
- (BOOL) userHasMailAccess
{
SOGoUser *user;
user = [context activeUser];
return [user canAccessModule: @"Mail"];
}
- (NSString *) userLanguage
{
SOGoUserDefaults *ud;

View File

@ -66,6 +66,12 @@
- (NSString *)ownPath;
- (NSString *)relativePathToUserFolderSubPath:(NSString *)_sub;
/* module access */
- (BOOL) isCalendarEnabled;
- (BOOL) isContactsEnabled;
- (BOOL) isMailEnabled;
- (BOOL) isPreferencesEnabled;
/* date selection */
- (NSCalendarDate *) selectedDate;

View File

@ -465,6 +465,45 @@ static NSMutableArray *abbrMonthLabelKeys = nil;
return result;
}
- (BOOL) userHasCalendarAccess
{
SOGoUser *user;
user = [context activeUser];
return [user canAccessModule: @"Calendar"];
}
- (BOOL) userHasMailAccess
{
SOGoUser *user;
user = [context activeUser];
return [user canAccessModule: @"Mail"];
}
#warning we might want to refine the tests here...
- (BOOL) isCalendarEnabled
{
return [self userHasCalendarAccess] && ![self singleWindowModeEnabled];
}
- (BOOL) isContactsEnabled
{
return ![self singleWindowModeEnabled];
}
- (BOOL) isMailEnabled
{
return [self userHasMailAccess];
}
- (BOOL) isPreferencesEnabled
{
return ![self singleWindowModeEnabled];
}
/* SoUser */
- (NSString *) shortUserNameForDisplay

View File

@ -38,6 +38,16 @@
<var:if-ie
><link type="text/css" rel="stylesheet" rsrc:href="iefixes.css"
/></var:if-ie>
<style type="text/css">
<var:if condition="singleWindowModeEnabled"
>.single-window-not-conditional</var:if
><var:if condition="singleWindowModeEnabled"
const:negate="YES"
>.single-window-conditional</var:if>
{
display: none !important;
}
</style>
</head>
<body var:class="bodyClasses"
@ -66,46 +76,46 @@
<var:if condition="userHasVacationEnabled"><img rsrc:src="status.vacation-msg.png" label:title="Vacation message is enabled" /></var:if>
<var:string var:value="userIdentification"/></span
></var:if>
<var:if condition="userHasCalendarAccess">
<var:if condition="isCalendar">
<span class="active"><var:string label:value="Calendar"
/></span>
</var:if>
<var:if condition="isCalendar" const:negate="YES">
<a id="calendarBannerLink"
var:href="relativeCalendarPath"
><var:string label:value="Calendar" /></a>
</var:if>
</var:if>
<var:if condition="isContacts">
<span class="active"><var:string label:value="Address Book"
/></span>
</var:if>
<var:if condition="isContacts" const:negate="YES">
<a id="contactsBannerLink"
var:href="relativeContactsPath"
><var:string label:value="Address Book" /></a>
</var:if>
<var:if condition="userHasMailAccess">
<var:if condition="isCalendarEnabled">
<var:if condition="isCalendar">
<span class="active"><var:string label:value="Calendar"
/></span>
</var:if>
<var:if condition="isCalendar" const:negate="YES">
<a id="calendarBannerLink"
var:href="relativeCalendarPath"
><var:string label:value="Calendar" /></a>
</var:if>
</var:if>
<var:if condition="isContactsEnabled">
<var:if condition="isContacts">
<span class="active"><var:string label:value="Address Book"
/></span>
</var:if>
<var:if condition="isContacts" const:negate="YES">
<a id="contactsBannerLink"
var:href="relativeContactsPath"
><var:string label:value="Address Book" /></a>
</var:if>
</var:if>
<var:if condition="isMailEnabled">
<var:if condition="isMail">
<span class="active"><var:string label:value="Mail"
<span class="active"><var:string label:value="Mail"
/></span>
</var:if>
<var:if condition="isMail" const:negate="YES">
<a id="mailBannerLink" var:href="relativeMailPath"
><var:string label:value="Mail" /></a>
</var:if>
</var:if>
<a id="preferencesBannerLink"
var:href="relativePreferencesPath"
><var:string label:value="Preferences" /></a>
<var:if condition="isSuperUser">
<var:if condition="isPreferencesEnabled">
<a id="preferencesBannerLink"
var:href="relativePreferencesPath"
><var:string label:value="Preferences" /></a>
</var:if
><var:if condition="isSuperUser">
<var:if condition="isAdministration">
<span class="active"><var:string label:value="Administration"
<span class="active"><var:string label:value="Administration"
/></span>
</var:if>
<var:if condition="isAdministration" const:negate="YES">
@ -136,6 +146,12 @@
<var:if condition="isSuperUser" const:negate="YES"
>var IsSuperUser = false;
</var:if>
var IsCalendarEnabled = <var:if condition="isCalendarEnabled">true</var:if
><var:if condition="isCalendarEnabled" const:negate="YES">false</var:if>;
var IsAddressBookEnabled = <var:if condition="isAddressBookEnabled">true</var:if
><var:if condition="isAddressBookEnabled" const:negate="YES">false</var:if>;
var IsMailEnabled = <var:if condition="isMailEnabled">true</var:if
><var:if condition="isMailEnabled" const:negate="YES">false</var:if>;
<var:if condition="usesCASAuthentication"
>var usesCASAuthentication = true;
</var:if>