diff --git a/Gruntfile.js b/Gruntfile.js index 28900f80..123ec28f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,7 +12,7 @@ module.exports = function (grunt) { wait: { server: { options: { - delay: 6 * 1000 + delay: 12 * 1000 } } }, diff --git a/lib/routes-ui.js b/lib/routes-ui.js index cc2514f7..e51079ac 100644 --- a/lib/routes-ui.js +++ b/lib/routes-ui.js @@ -1234,6 +1234,7 @@ function applyRoutes(server, call) { imapIndexer: (await settings.get('imapIndexer')) || 'full', + pageBrandName: (await settings.get('pageBrandName')) || '', templateHeader: (await settings.get('templateHeader')) || '', templateHtmlHead: (await settings.get('templateHtmlHead')) || '', scriptEnv: (await settings.get('scriptEnv')) || '', @@ -1305,6 +1306,7 @@ function applyRoutes(server, call) { let data = { serviceSecret: request.payload.serviceSecret, queueKeep: request.payload.queueKeep, + pageBrandName: request.payload.pageBrandName, templateHeader: request.payload.templateHeader, templateHtmlHead: request.payload.templateHtmlHead, scriptEnv: request.payload.scriptEnv, @@ -1429,6 +1431,7 @@ function applyRoutes(server, call) { queueKeep: settingsSchema.queueKeep.default(0), deliveryAttempts: settingsSchema.deliveryAttempts.default(DEFAULT_DELIVERY_ATTEMPTS), imapIndexer: settingsSchema.imapIndexer.default('full'), + pageBrandName: settingsSchema.pageBrandName.default(''), templateHeader: settingsSchema.templateHeader.default(''), templateHtmlHead: settingsSchema.templateHtmlHead.default(''), scriptEnv: settingsSchema.scriptEnv.default(''), @@ -1844,6 +1847,7 @@ return true;` return h.view( 'config/service-preview', { + pageBrandName: request.payload.pageBrandName, embeddedTemplateHeader: request.payload.templateHeader, embeddedTemplateHtmlHeadr: request.payload.templateHtmlHead }, @@ -1866,6 +1870,7 @@ return true;` }, payload: Joi.object({ + pageBrandName: settingsSchema.pageBrandName.default(''), templateHeader: settingsSchema.templateHeader.default(''), templateHtmlHead: settingsSchema.templateHtmlHead.default('') }) diff --git a/lib/schemas.js b/lib/schemas.js index 2f9bf565..2e9c77ea 100644 --- a/lib/schemas.js +++ b/lib/schemas.js @@ -423,6 +423,8 @@ const settingsSchema = { timezone: Joi.string().max(100).example('Europe/Tallinn').description('Default timezone identifier'), + pageBrandName: Joi.string().allow('', null).max(1024).example('EmailEngine').description('Brand name to use in the HTML title element'), + openAiPreProcessingFn: Joi.string() .allow('') .max(512 * 1024) diff --git a/static/index.html b/static/index.html index 36747caa..0fb2deed 100644 --- a/static/index.html +++ b/static/index.html @@ -3,7 +3,7 @@ - + EmailEngine diff --git a/views/config/service.hbs b/views/config/service.hbs index d385caf0..5b64deb6 100644 --- a/views/config/service.hbs +++ b/views/config/service.hbs @@ -343,6 +343,21 @@

These settings apply to all publicly accessible pages, such as 404 error pages, the hosted authentication form, and the virtual mailing list unsubscribe page.

+
+
[pageBrandName]
+ + + + {{#if errors.pageBrandName}} + {{errors.pageBrandName}} + {{/if}} + Brand name to use in the HTML title element (defaults to + "EmailEngine") +
+
[ - + - {{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} – + <title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} – {{pageTitle}}{{/if}}{{/if}} diff --git a/views/layout/login.hbs b/views/layout/login.hbs index adc91eac..cdab827d 100644 --- a/views/layout/login.hbs +++ b/views/layout/login.hbs @@ -6,10 +6,10 @@ - + - {{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} – + <title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} – {{pageTitle}}{{/if}}{{/if}} diff --git a/views/layout/main.hbs b/views/layout/main.hbs index a319e1a9..a2d80828 100644 --- a/views/layout/main.hbs +++ b/views/layout/main.hbs @@ -4,7 +4,7 @@ - + EmailEngine diff --git a/views/layout/public.hbs b/views/layout/public.hbs index b291952d..03f421ed 100644 --- a/views/layout/public.hbs +++ b/views/layout/public.hbs @@ -6,10 +6,10 @@ - + - {{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} – + <title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} – {{pageTitle}}{{/if}}{{/if}} diff --git a/workers/api.js b/workers/api.js index ad64212c..2bf33599 100644 --- a/workers/api.js +++ b/workers/api.js @@ -8453,7 +8453,8 @@ ${now}`, serviceUrl, language, locale, - timezone + timezone, + pageBrandName } = await settings.getMulti( 'upgrade', 'subexp', @@ -8470,7 +8471,8 @@ ${now}`, 'serviceUrl', 'language', 'locale', - 'timezone' + 'timezone', + 'pageBrandName' ); const systemAlerts = []; @@ -8614,6 +8616,7 @@ ${now}`, } return { + pageBrandName: pageBrandName || 'EmailEngine', values: request.payload || {}, errors: (request.error && request.error.details) || {}, pendingMessages,