diff --git a/UI/AdministrationUI/UIxAdministration.m b/UI/AdministrationUI/UIxAdministration.m index 7718996e0..249d46e5f 100644 --- a/UI/AdministrationUI/UIxAdministration.m +++ b/UI/AdministrationUI/UIxAdministration.m @@ -43,6 +43,11 @@ [super dealloc]; } +- (NSString *) moduleName +{ + return [self commonLabelForKey: @"Administration"]; +} + - (NSString *) modulePath { return @"Administration"; diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index d6d72cf1d..e4dc5d9bb 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -1,7 +1,7 @@ /* Copyright (C) 2004-2005 SKYRIX Software AG - Copyright (C) 2005-2015 Inverse inc. + Copyright (C) 2005-2022 Inverse inc. This file is part of SOGo. @@ -91,15 +91,13 @@ NSString *pageTitle; SOGoSystemDefaults *sd; - if ([self isUIxDebugEnabled]) - pageTitle = title; - else - { - sd = [SOGoSystemDefaults sharedSystemDefaults]; - pageTitle = [sd pageTitle]; - if (pageTitle == nil || ![pageTitle length]) - pageTitle = (@"SOGo"); - } + sd = [SOGoSystemDefaults sharedSystemDefaults]; + pageTitle = [sd pageTitle]; + if (pageTitle == nil || ![pageTitle length]) + pageTitle = (@"SOGo"); + + if ([title length]) + pageTitle = [NSString stringWithFormat: @"%@ | %@", title, pageTitle]; return pageTitle; } diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index 9fd14bcd5..50efa560d 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -1,6 +1,6 @@ /* UIxContactFoldersView.m - this file is part of SOGo * - * Copyright (C) 2006-2021 Inverse inc. + * Copyright (C) 2006-2022 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,6 +60,11 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK; return self; } +- (NSString *) moduleName +{ + return [self commonLabelForKey: @"Address Book"]; +} + - (NSString *) modulePath { return @"Contacts"; diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 7b6be85dd..73d62e5f4 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2014 Inverse inc. + Copyright (C) 2007-2022 Inverse inc. This file is part of SOGo. @@ -74,6 +74,11 @@ [super dealloc]; } +- (NSString *) moduleName +{ + return [self commonLabelForKey: @"Mail"]; +} + - (NSString *) modulePath { return @"Mail"; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 1b0888f20..6450cf92b 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1,6 +1,6 @@ /* UIxPreferences.m - this file is part of SOGo * - * Copyright (C) 2007-2021 Inverse inc. + * Copyright (C) 2007-2022 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -160,6 +160,11 @@ static NSArray *reminderValues = nil; [super dealloc]; } +- (NSString *) moduleName +{ + return [self commonLabelForKey: @"Preferences"]; +} + - (NSString *) modulePath { return @"Preferences"; diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m index e32335253..38b358177 100644 --- a/UI/Scheduler/UIxCalMainView.m +++ b/UI/Scheduler/UIxCalMainView.m @@ -1,6 +1,6 @@ /* UIxCalMainView.m - this file is part of SOGo * - * Copyright (C) 2006-2019 Inverse inc. + * Copyright (C) 2006-2022 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,6 +39,12 @@ @implementation UIxCalMainView + +- (NSString *) moduleName +{ + return [self commonLabelForKey: @"Calendar"]; +} + - (NSString *) modulePath { return @"Calendar"; diff --git a/UI/Templates/AdministrationUI/UIxAdministration.wox b/UI/Templates/AdministrationUI/UIxAdministration.wox index ed8ce3cd0..3c7e5b82d 100644 --- a/UI/Templates/AdministrationUI/UIxAdministration.wox +++ b/UI/Templates/AdministrationUI/UIxAdministration.wox @@ -6,7 +6,7 @@ xmlns:rsrc="OGo:url" xmlns:label="OGo:label" className="UIxPageFrame" - title="title" + title="moduleName" const:jsFiles="Common.js, Administration.js, Administration.services.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js"> diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 78b2ff636..e33588a2f 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -7,7 +7,7 @@ xmlns:rsrc="OGo:url" xmlns:label="OGo:label" className="UIxPageFrame" - title="title" + title="moduleName" const:jsFiles="vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Mailer.services.js, Contacts.js, Contacts.services.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js">