LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow js/img/css subfolders in WebServerResources

Browse source
This commit is contained in:
Francis Lachapelle 2014-06-19 15:54:12 -04:00
parent 24f01e72c2
commit fbe412db08
1 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
UI/Common/UIxPageFrame.m
View file

@ -202,7 +202,7 @@
return (siteFavicon return (siteFavicon
? siteFavicon ? siteFavicon
: [self urlForResourceFilename: @"sogo.ico"]); : [self urlForResourceFilename: @"img/sogo.ico"]);
} }
/* page based JavaScript */ /* page based JavaScript */
@ -256,8 +256,7 @@
if (isPopup) if (isPopup)
rc = @""; rc = @"";
else else
rc = [NSString stringWithFormat: @"var clabels = %@;", rc = [NSString stringWithFormat: @"var clabels = %@;", [self _stringsForFramework: nil]];
[self _stringsForFramework: nil]];
return rc; return rc;
} }
@ -268,32 +267,31 @@
frameworkName = [[context page] frameworkName]; frameworkName = [[context page] frameworkName];
return [NSString stringWithFormat: @"var labels = %@;", return [NSString stringWithFormat: @"var labels = %@;", [self _stringsForFramework: frameworkName]];
[self _stringsForFramework: frameworkName]];
} }
- (NSString *) pageJavaScriptURL - (NSString *) pageJavaScriptURL
{ {
WOComponent *page; WOComponent *page;
NSString *pageJSFilename; NSString *filename;
page = [context page]; page = [context page];
pageJSFilename = [NSString stringWithFormat: @"%@.js", filename = [NSString stringWithFormat: @"js/%@.js", NSStringFromClass([page class])];
NSStringFromClass([page class])]; NSLog(@"pageJavaScript => %@", filename);
return [self urlForResourceFilename: pageJSFilename]; return [self urlForResourceFilename: filename];
} }
- (NSString *) productJavaScriptURL - (NSString *) productJavaScriptURL
{ {
WOComponent *page; WOComponent *page;
NSString *fwJSFilename; NSString *filename;
page = [context page]; page = [context page];
fwJSFilename = [NSString stringWithFormat: @"%@.js", filename = [NSString stringWithFormat: @"js/%@.js", [page frameworkName]];
[page frameworkName]]; NSLog(@"productJavaScript => %@", filename);
return [self urlForResourceFilename: fwJSFilename]; return [self urlForResourceFilename: filename];
} }
- (BOOL) hasPageSpecificJavaScript - (BOOL) hasPageSpecificJavaScript
@ -314,12 +312,10 @@
[additionalCSSFiles release]; [additionalCSSFiles release];
additionalCSSFiles = [NSMutableArray new]; additionalCSSFiles = [NSMutableArray new];
cssFiles cssFiles = [[newCSSFiles componentsSeparatedByString: @","] objectEnumerator];
= [[newCSSFiles componentsSeparatedByString: @","] objectEnumerator];
while ((currentFile = [cssFiles nextObject])) while ((currentFile = [cssFiles nextObject]))
{ {
filename = [self urlForResourceFilename: filename = [self urlForResourceFilename: [NSString stringWithFormat: @"css/%@", [currentFile stringByTrimmingSpaces]]];
[currentFile stringByTrimmingSpaces]];
[additionalCSSFiles addObject: filename]; [additionalCSSFiles addObject: filename];
} }
} }
@ -340,8 +336,7 @@
jsFiles = [[newJSFiles componentsSeparatedByString: @","] objectEnumerator]; jsFiles = [[newJSFiles componentsSeparatedByString: @","] objectEnumerator];
while ((currentFile = [jsFiles nextObject])) while ((currentFile = [jsFiles nextObject]))
{ {
filename = [self urlForResourceFilename: filename = [self urlForResourceFilename: [NSString stringWithFormat: @"js/%@", [currentFile stringByTrimmingSpaces]]];
[currentFile stringByTrimmingSpaces]];
[additionalJSFiles addObject: filename]; [additionalJSFiles addObject: filename];
} }
} }
@ -367,8 +362,7 @@
for (count = 0; count < max; count++) for (count = 0; count < max; count++)
{ {
currentFile = [prefsJSFiles objectAtIndex: count]; currentFile = [prefsJSFiles objectAtIndex: count];
filename = [self urlForResourceFilename: filename = [self urlForResourceFilename: [currentFile stringByTrimmingSpaces]];
[currentFile stringByTrimmingSpaces]];
[systemAdditionalJSFiles addObject: filename]; [systemAdditionalJSFiles addObject: filename];
} }
} }
@ -379,25 +373,25 @@
- (NSString *) pageCSSURL - (NSString *) pageCSSURL
{ {
WOComponent *page; WOComponent *page;
NSString *pageJSFilename; NSString *filename;
page = [context page]; page = [context page];
pageJSFilename = [NSString stringWithFormat: @"%@.css", filename = [NSString stringWithFormat: @"css/%@.css",
NSStringFromClass([page class])]; NSStringFromClass([page class])];
return [self urlForResourceFilename: pageJSFilename]; return [self urlForResourceFilename: filename];
} }
- (NSString *) productCSSURL - (NSString *) productCSSURL
{ {
WOComponent *page; WOComponent *page;
NSString *fwJSFilename; NSString *filename;
page = [context page]; page = [context page];
fwJSFilename = [NSString stringWithFormat: @"%@.css", filename = [NSString stringWithFormat: @"css/%@.css",
[page frameworkName]]; [page frameworkName]];
return [self urlForResourceFilename: fwJSFilename]; return [self urlForResourceFilename: filename];
} }
- (NSString *) thisPageURL - (NSString *) thisPageURL
@ -620,4 +614,14 @@
return [[[context activeUser] domainDefaults] searchMinimumWordLength]; return [[[context activeUser] domainDefaults] searchMinimumWordLength];
} }
- (id) contentMediaComponent
{
//NSString *name = [self->pageName stringValueInComponent: [context component]];
NSString *name = [[[self->context component] parent] name];
NSLog(@"************ loading %@", name);
return [self pageWithName: @"UIxContactFoldersView"];
}
@end /* UIxPageFrame */ @end /* UIxPageFrame */