amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-03 12:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Add support for themes

Browse Source
This commit is contained in:
Francis Lachapelle
2014-08-06 16:01:05 -04:00
parent 16d04e998f
commit 77b80e27c6
5 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
UI/SOGoUI/UIxComponent.m
View File

@@ -49,6 +49,7 @@
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserFolder.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/WOContext+SOGo.h>
#import <SOGo/WOResourceManager+SOGo.h>
#import "UIxJSClose.h"
@@ -149,6 +150,7 @@ static SoProduct *commonProduct = nil;
if (!userDefaults)
ASSIGN (userDefaults, [SOGoSystemDefaults sharedSystemDefaults]);
language = [userDefaults language];
ASSIGN (languages, [context resourceLookupLanguages]);
ASSIGN (locale,
[[self resourceManager] localeForLanguageNamed: language]);
}
@@ -536,7 +538,6 @@ static SoProduct *commonProduct = nil;
- (NSString *) labelForKey: (NSString *) _str
withResourceManager: (WOResourceManager *) rm
{
NSArray *languages;
NSString *lKey, *lTable, *lVal;
NSRange r;
@@ -546,10 +547,6 @@ static SoProduct *commonProduct = nil;
if (rm == nil)
[self warnWithFormat:@"missing resource manager!"];
/* lookup languages */
languages = [context resourceLookupLanguages];
/* get parameters */
r = [_str rangeOfString:@"/"];
@@ -710,9 +707,27 @@ static SoProduct *commonProduct = nil;
- (WOResponse *) redirectToLocation: (NSString *) newLocation
{
WOResponse *response;
NSURL *url;
NSMutableString *location;
NSString *theme, *query;
location = [NSMutableString stringWithString: newLocation];
theme = [[context request] formValueForKey: @"theme"];
if ([theme length])
{
url = [NSURL URLWithString: newLocation];
query = [url query];
if ([query length])
{
if ([query rangeOfString: @"theme="].length == 0)
[location appendFormat: @"&theme=%@", theme];
}
else
[location appendFormat: @"?theme=%@", theme];
}
response = [self responseWithStatus: 302];
[response setHeader: newLocation forKey: @"location"];
[response setHeader: location forKey: @"location"];
return response;
}