diff -Nbaur --exclude=config.make --exclude=configure --exclude='SOGoCASSession.*' --exclude='LDAPSource.*' --exclude='SOGoUserManager.*' --exclude='*.css' SOGo-1.3.4-dist/SoObjects/SOGo/SOGoSystemDefaults.h SOGo-1.3.4/SoObjects/SOGo/SOGoSystemDefaults.h --- SOGo-1.3.4-dist/SoObjects/SOGo/SOGoSystemDefaults.h 2010-11-17 17:30:03.000000000 +0100 +++ SOGo-1.3.4/SoObjects/SOGo/SOGoSystemDefaults.h 2010-12-07 13:07:32.000000000 +0100 @@ -59,6 +59,8 @@ - (BOOL) uixDebugEnabled; +- (NSString *) pageTitle; + - (NSArray *) supportedLanguages; - (NSString *) loginSuffix; diff -Nbaur --exclude=config.make --exclude=configure --exclude='SOGoCASSession.*' --exclude='LDAPSource.*' --exclude='SOGoUserManager.*' --exclude='*.css' SOGo-1.3.4-dist/SoObjects/SOGo/SOGoSystemDefaults.m SOGo-1.3.4/SoObjects/SOGo/SOGoSystemDefaults.m --- SOGo-1.3.4-dist/SoObjects/SOGo/SOGoSystemDefaults.m 2010-11-17 17:30:03.000000000 +0100 +++ SOGo-1.3.4/SoObjects/SOGo/SOGoSystemDefaults.m 2010-12-07 13:08:25.000000000 +0100 @@ -271,6 +271,11 @@ return [self boolForKey: @"SOGoUIxDebugEnabled"]; } +- (NSString *) pageTitle +{ + return [self stringForKey: @"SOGoPageTitle"]; +} + - (NSArray *) supportedLanguages { return [self stringArrayForKey: @"SOGoSupportedLanguages"]; diff -Nbaur --exclude=config.make --exclude=configure --exclude='SOGoCASSession.*' --exclude='LDAPSource.*' --exclude='SOGoUserManager.*' --exclude='*.css' SOGo-1.3.4-dist/UI/Common/UIxPageFrame.h SOGo-1.3.4/UI/Common/UIxPageFrame.h --- SOGo-1.3.4-dist/UI/Common/UIxPageFrame.h 2010-11-17 17:30:03.000000000 +0100 +++ SOGo-1.3.4/UI/Common/UIxPageFrame.h 2010-12-08 15:34:53.000000000 +0100 @@ -37,6 +37,7 @@ @interface UIxPageFrame : UIxComponent { NSString *title; + NSString *pageTitle; NSString *toolbar; id item; BOOL isPopup; diff -Nbaur --exclude=config.make --exclude=configure --exclude='SOGoCASSession.*' --exclude='LDAPSource.*' --exclude='SOGoUserManager.*' --exclude='*.css' SOGo-1.3.4-dist/UI/Common/UIxPageFrame.m SOGo-1.3.4/UI/Common/UIxPageFrame.m --- SOGo-1.3.4-dist/UI/Common/UIxPageFrame.m 2010-11-17 17:30:03.000000000 +0100 +++ SOGo-1.3.4/UI/Common/UIxPageFrame.m 2010-12-08 15:34:21.000000000 +0100 @@ -84,6 +84,19 @@ return [self labelForKey: @"SOGo"]; } +- (NSString *) pageTitle +{ + NSString *pageTitle; + SOGoSystemDefaults *sd; + + sd = [SOGoSystemDefaults sharedSystemDefaults]; + pageTitle = [sd pageTitle]; + if ([pageTitle length]) + return pageTitle; + + return title; +} + - (void) setItem: (id) _item { ASSIGN (item, _item); diff -Nbaur --exclude=config.make --exclude=configure --exclude='SOGoCASSession.*' --exclude='LDAPSource.*' --exclude='SOGoUserManager.*' --exclude='*.css' SOGo-1.3.4-dist/UI/Templates/UIxPageFrame.wox SOGo-1.3.4/UI/Templates/UIxPageFrame.wox --- SOGo-1.3.4-dist/UI/Templates/UIxPageFrame.wox 2010-11-17 17:30:03.000000000 +0100 +++ SOGo-1.3.4/UI/Templates/UIxPageFrame.wox 2010-12-08 15:35:34.000000000 +0100 @@ -13,7 +13,7 @@ xml:lang="en" const:lang="en">