Skip to content

Commit bf85c06

Browse files
andris9andris9
committed
fix(templates): Allow setting brand name to replace 'EmailEngine' in the HTML title
1 parent b2c0c5a commit bf85c06

File tree

10 files changed

+36
-11
lines changed

10 files changed

+36
-11
lines changed

‎Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
1212
wait: {
1313
server: {
1414
options: {
15-
delay: 6 * 1000
15+
delay: 12 * 1000
1616
}
1717
}
1818
},

‎lib/routes-ui.js

+5
Original file line numberDiff line numberDiff line change
@@ -1234,6 +1234,7 @@ function applyRoutes(server, call) {
12341234

12351235
imapIndexer: (await settings.get('imapIndexer')) || 'full',
12361236

1237+
pageBrandName: (await settings.get('pageBrandName')) || '',
12371238
templateHeader: (await settings.get('templateHeader')) || '',
12381239
templateHtmlHead: (await settings.get('templateHtmlHead')) || '',
12391240
scriptEnv: (await settings.get('scriptEnv')) || '',
@@ -1305,6 +1306,7 @@ function applyRoutes(server, call) {
13051306
let data = {
13061307
serviceSecret: request.payload.serviceSecret,
13071308
queueKeep: request.payload.queueKeep,
1309+
pageBrandName: request.payload.pageBrandName,
13081310
templateHeader: request.payload.templateHeader,
13091311
templateHtmlHead: request.payload.templateHtmlHead,
13101312
scriptEnv: request.payload.scriptEnv,
@@ -1429,6 +1431,7 @@ function applyRoutes(server, call) {
14291431
queueKeep: settingsSchema.queueKeep.default(0),
14301432
deliveryAttempts: settingsSchema.deliveryAttempts.default(DEFAULT_DELIVERY_ATTEMPTS),
14311433
imapIndexer: settingsSchema.imapIndexer.default('full'),
1434+
pageBrandName: settingsSchema.pageBrandName.default(''),
14321435
templateHeader: settingsSchema.templateHeader.default(''),
14331436
templateHtmlHead: settingsSchema.templateHtmlHead.default(''),
14341437
scriptEnv: settingsSchema.scriptEnv.default(''),
@@ -1844,6 +1847,7 @@ return true;`
18441847
return h.view(
18451848
'config/service-preview',
18461849
{
1850+
pageBrandName: request.payload.pageBrandName,
18471851
embeddedTemplateHeader: request.payload.templateHeader,
18481852
embeddedTemplateHtmlHeadr: request.payload.templateHtmlHead
18491853
},
@@ -1866,6 +1870,7 @@ return true;`
18661870
},
18671871

18681872
payload: Joi.object({
1873+
pageBrandName: settingsSchema.pageBrandName.default(''),
18691874
templateHeader: settingsSchema.templateHeader.default(''),
18701875
templateHtmlHead: settingsSchema.templateHtmlHead.default('')
18711876
})

‎lib/schemas.js

+2
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,8 @@ const settingsSchema = {
423423

424424
timezone: Joi.string().max(100).example('Europe/Tallinn').description('Default timezone identifier'),
425425

426+
pageBrandName: Joi.string().allow('', null).max(1024).example('EmailEngine').description('Brand name to use in the HTML title element'),
427+
426428
openAiPreProcessingFn: Joi.string()
427429
.allow('')
428430
.max(512 * 1024)

‎static/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
6-
<meta name="description" content="EmailEngine Homepage" />
6+
<meta name="description" content="EmailEngine Application page; The Ultimate Email API for Developers" />
77
<title>EmailEngine</title>
88

99
<link rel="apple-touch-icon" href="/static/favicon/apple-touch-icon.png" sizes="180x180" />

‎views/config/service.hbs

+15
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,21 @@
343343
<p>These settings apply to all publicly accessible pages, such as 404 error pages, the hosted authentication
344344
form, and the virtual mailing list unsubscribe page.</p>
345345

346+
<div class="form-group">
347+
<div class="text-muted float-right code-link">[<a href="/admin/swagger#/Settings/postV1Settings"
348+
target="_blank" rel="noopener noreferrer">pageBrandName</a>]</div>
349+
350+
<label for="settingsPageBrandName">Brand name</label>
351+
<input type="text" class="form-control {{#if errors.pageBrandName}}is-invalid{{/if}}"
352+
id="settingsPageBrandName" name="pageBrandName" value="{{values.pageBrandName}}"
353+
data-lpignore="true" autocomplete="off" placeholder="Brand name like &quot;EmailEngine&quot;" />
354+
{{#if errors.pageBrandName}}
355+
<span class="invalid-feedback">{{errors.pageBrandName}}</span>
356+
{{/if}}
357+
<small class="form-text text-muted">Brand name to use in the HTML title element (defaults to
358+
<em>"EmailEngine"</em>)</small>
359+
</div>
360+
346361
<div class="form-group">
347362

348363
<div class="text-muted float-right code-link">[<a href="/admin/swagger#/Settings/postV1Settings"

‎views/layout/app.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<meta charset="utf-8">
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9-
<meta name="description" content="EmailEngine Homepage" />
9+
<meta name="description" content="EmailEngine Application page; The Ultimate Email API for Developers" />
1010
<meta name="author" content="Postal Systems OÜ">
1111

12-
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} &ndash;
12+
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} &ndash;
1313
{{pageTitle}}{{/if}}{{/if}}</title>
1414

1515
<link rel="apple-touch-icon" href="/static/favicon/apple-touch-icon.png" sizes="180x180" />

‎views/layout/login.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<meta charset="utf-8">
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9-
<meta name="description" content="EmailEngine Homepage" />
9+
<meta name="description" content="EmailEngine Application page; The Ultimate Email API for Developers" />
1010
<meta name="author" content="Postal Systems OÜ">
1111

12-
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} &ndash;
12+
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} &ndash;
1313
{{pageTitle}}{{/if}}{{/if}}</title>
1414

1515
<link rel="apple-touch-icon" href="/static/favicon/apple-touch-icon.png" sizes="180x180" />

‎views/layout/main.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7-
<meta name="description" content="EmailEngine Homepage" />
7+
<meta name="description" content="EmailEngine Application page; The Ultimate Email API for Developers" />
88
<title>EmailEngine</title>
99

1010
<link rel="apple-touch-icon" href="/static/favicon/apple-touch-icon.png" sizes="180x180" />

‎views/layout/public.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<meta charset="utf-8">
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9-
<meta name="description" content="EmailEngine Homepage" />
9+
<meta name="description" content="EmailEngine Application page; The Ultimate Email API for Developers" />
1010
<meta name="author" content="Postal Systems OÜ">
1111

12-
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}EmailEngine{{#if pageTitle}} &ndash;
12+
<title>{{#if pageTitleFull}}{{pageTitleFull}}{{else}}{{pageBrandName}}{{#if pageTitle}} &ndash;
1313
{{pageTitle}}{{/if}}{{/if}}</title>
1414

1515
<link rel="apple-touch-icon" href="/static/favicon/apple-touch-icon.png" sizes="180x180" />

‎workers/api.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -8453,7 +8453,8 @@ ${now}`,
84538453
serviceUrl,
84548454
language,
84558455
locale,
8456-
timezone
8456+
timezone,
8457+
pageBrandName
84578458
} = await settings.getMulti(
84588459
'upgrade',
84598460
'subexp',
@@ -8470,7 +8471,8 @@ ${now}`,
84708471
'serviceUrl',
84718472
'language',
84728473
'locale',
8473-
'timezone'
8474+
'timezone',
8475+
'pageBrandName'
84748476
);
84758477

84768478
const systemAlerts = [];
@@ -8614,6 +8616,7 @@ ${now}`,
86148616
}
86158617

86168618
return {
8619+
pageBrandName: pageBrandName || 'EmailEngine',
86178620
values: request.payload || {},
86188621
errors: (request.error && request.error.details) || {},
86198622
pendingMessages,

0 commit comments

Comments
 (0)