Monotone-Parent: eb9d7b5fce99d3950d29b0b3737f3463547818d7
Monotone-Revision: 756755f35a7b0415c98a7a403ba3c57bc62a635a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-09-14T14:06:20 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
eeaa7627b6
commit
b90a3f76b4
|
@ -1,3 +1,11 @@
|
|||
2010-09-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Common/UIxPageFrame.m (-systemAdditionalJSFiles): new web
|
||||
accessor for the new method below.
|
||||
|
||||
* SoObjects/SOGo/SOGoDomainDefaults.m (-additionalJSFiles): new
|
||||
accessor for the new "SOGoUIAdditionalJSFiles" user default.
|
||||
|
||||
2010-09-13 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* Updated Ukrainian translation - patch from
|
||||
|
|
|
@ -71,6 +71,8 @@
|
|||
|
||||
- (BOOL) iPhoneForceAllDayTransparency;
|
||||
|
||||
- (NSArray *) additionalJSFiles;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* SOGODOMAINDEFAULTS_H */
|
||||
|
|
|
@ -299,4 +299,9 @@
|
|||
return language;
|
||||
}
|
||||
|
||||
- (NSArray *) additionalJSFiles
|
||||
{
|
||||
return [self stringArrayForKey: @"SOGoUIAdditionalJSFiles"];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
NSArray *usKeys;
|
||||
NSMutableArray *additionalCSSFiles;
|
||||
NSMutableArray *additionalJSFiles;
|
||||
NSMutableArray *systemAdditionalJSFiles;
|
||||
}
|
||||
|
||||
- (NSString *) commonLocalizableStrings;
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
usKeys = nil;
|
||||
additionalJSFiles = nil;
|
||||
additionalCSSFiles = nil;
|
||||
systemAdditionalJSFiles = nil;
|
||||
}
|
||||
|
||||
return self;
|
||||
|
@ -64,6 +65,7 @@
|
|||
[usKeys release];
|
||||
[additionalJSFiles release];
|
||||
[additionalCSSFiles release];
|
||||
[systemAdditionalJSFiles release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
|
@ -318,6 +320,31 @@
|
|||
return additionalJSFiles;
|
||||
}
|
||||
|
||||
- (NSArray *) systemAdditionalJSFiles
|
||||
{
|
||||
NSArray *prefsJSFiles;
|
||||
SOGoDomainDefaults *dd;
|
||||
int count, max;
|
||||
NSString *currentFile, *filename;
|
||||
|
||||
if (!systemAdditionalJSFiles)
|
||||
{
|
||||
systemAdditionalJSFiles = [NSMutableArray new];
|
||||
dd = [[context activeUser] domainDefaults];
|
||||
prefsJSFiles = [dd additionalJSFiles];
|
||||
max = [prefsJSFiles count];
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
currentFile = [prefsJSFiles objectAtIndex: count];
|
||||
filename = [self urlForResourceFilename:
|
||||
[currentFile stringByTrimmingSpaces]];
|
||||
[systemAdditionalJSFiles addObject: filename];
|
||||
}
|
||||
}
|
||||
|
||||
return systemAdditionalJSFiles;
|
||||
}
|
||||
|
||||
- (NSString *) pageCSSURL
|
||||
{
|
||||
WOComponent *page;
|
||||
|
|
|
@ -168,6 +168,9 @@
|
|||
<var:foreach list="additionalJSFiles" item="item"
|
||||
><script type="text/javascript" var:src="item"><!-- space --></script>
|
||||
</var:foreach>
|
||||
<var:foreach list="systemAdditionalJSFiles" item="item"
|
||||
><script type="text/javascript" var:src="item"><!-- space --></script>
|
||||
</var:foreach>
|
||||
</var:if>
|
||||
<var:if condition="isCompatibleBrowser" const:negate="YES"
|
||||
><var:component className="SOGoBrowsersPanel"
|
||||
|
|
Loading…
Reference in New Issue