From a24b1bb7b6aa50c5721c0ecac1beb4dd2ade9d80 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 25 Aug 2006 20:45:16 +0000 Subject: [PATCH] Monotone-Parent: 85d881f3ccf755097f7f86f1eb0e9adea989feab Monotone-Revision: 2e8ad34005721407e216ea0f211d634d0dcc3e72 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-08-25T20:45:16 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/Common/UIxPageFrame.h | 2 ++ UI/Common/UIxPageFrame.m | 14 ++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index 758eb0dba..b9c0756e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-25 Wolfgang Sourdeau + + * UI/Common/UIxPageFrame.m ([UIxPageFrame -productFrameworkName]): + returns the bundle name associated to the current running product. + 2006-08-24 Wolfgang Sourdeau * UI/WebServerResources/UIxAppointmentEditor.js: fixed the AJAX diff --git a/UI/Common/UIxPageFrame.h b/UI/Common/UIxPageFrame.h index 388c91fa3..2dd1366fc 100644 --- a/UI/Common/UIxPageFrame.h +++ b/UI/Common/UIxPageFrame.h @@ -45,6 +45,8 @@ - (BOOL) hasPageSpecificCSS; - (BOOL) hasProductSpecificCSS; +- (NSString *) productFrameworkName; + - (void) setPopup: (BOOL) popup; - (BOOL) isPopup; diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 7f27fa719..76ef809b9 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -143,6 +143,15 @@ return [self urlForResourceFilename: fwJSFilename]; } +- (NSString *) productFrameworkName +{ + WOComponent *page; + + page = [[self context] page]; + + return [NSString stringWithFormat: @"%@.SOGo", [page frameworkName]]; +} + - (BOOL) hasPageSpecificJavaScript { return ([[self pageJavaScriptURL] length] > 0); @@ -177,6 +186,11 @@ return [self urlForResourceFilename: fwJSFilename]; } +- (NSString *) thisPageURL +{ + return [[[self context] page] uri]; +} + - (BOOL) hasPageSpecificCSS { return ([[self pageCSSURL] length] > 0);