diff --git a/app/server/lib/sendAppPage.ts b/app/server/lib/sendAppPage.ts
index 38f3dcb5e9c..a37869fc6ea 100644
--- a/app/server/lib/sendAppPage.ts
+++ b/app/server/lib/sendAppPage.ts
@@ -157,7 +157,7 @@ export function makeSendAppPage({ server, staticDir, tag, testLogin, baseDomain
const staticTag = options.tag || tag;
// If boot tag is used, serve assets locally, otherwise respect
// APP_STATIC_URL.
- const staticOrigin = staticTag === 'boot' ? '' : (process.env.APP_STATIC_URL || '');
+ const staticOrigin = staticTag === 'boot' ? '' : (process.env.APP_STATIC_URL || config.homeUrl || '');
const staticBaseUrl = `${staticOrigin}/v/${staticTag}/`;
const customHeadHtmlSnippet = server.create.getExtraHeadHtml?.() ?? "";
const warning = testLogin ? "
Authentication is not enforced
" : "";
@@ -172,8 +172,8 @@ export function makeSendAppPage({ server, staticDir, tag, testLogin, baseDomain
).join('\n');
const content = fileContent
.replace("", warning)
- .replace("", getPageTitle(req, config))
- .replace("", getPageMetadataHtmlSnippet(config))
+ .replace("", getPageTitle(config) ?? (translate(req, 'Loading') + "..."))
+ .replace("", getPageMetadataHtmlSnippet(req, config, staticBaseUrl))
.replace("", getPageTitleSuffix(server.getGristConfig()))
.replace("", `` + tagManagerSnippet)
.replace("", preloads)
@@ -269,11 +269,10 @@ function configuredPageTitleSuffix() {
*
* Note: The string returned is escaped and safe to insert into HTML.
*/
-function getPageTitle(req: express.Request, config: GristLoadConfig): string {
+function getPageTitle(config: GristLoadConfig): string|null {
const maybeDoc = getDocFromConfig(config);
- if (!maybeDoc) { return translate(req, 'Loading') + "..."; }
- return handlebars.Utils.escapeExpression(maybeDoc.name);
+ return maybeDoc && handlebars.Utils.escapeExpression(maybeDoc.name);
}
/**
@@ -284,25 +283,26 @@ function getPageTitle(req: express.Request, config: GristLoadConfig): string {
*
* Note: The string returned is escaped and safe to insert into HTML.
*/
-function getPageMetadataHtmlSnippet(config: GristLoadConfig): string {
+function getPageMetadataHtmlSnippet(req: express.Request, config: GristLoadConfig, staticBaseUrl: string): string {
const metadataElements: string[] = [];
const maybeDoc = getDocFromConfig(config);
- const description = maybeDoc?.options?.description;
- if (description) {
- const content = handlebars.Utils.escapeExpression(description);
- metadataElements.push(``);
- metadataElements.push(``);
- metadataElements.push(``);
- }
+ const description = maybeDoc?.options?.description ?? String(translate(req, 'gristMetaDescription'));
+ const escapedDescription = handlebars.Utils.escapeExpression(description);
+ metadataElements.push(``);
+ metadataElements.push(``);
+ metadataElements.push(``);
- const icon = maybeDoc?.options?.icon;
- if (icon) {
- const content = handlebars.Utils.escapeExpression(icon);
- metadataElements.push(``);
- metadataElements.push(``);
- metadataElements.push(``);
- }
+ const icon = maybeDoc?.options?.icon ?? new URL('img/icon-grist.png', staticBaseUrl).href;
+ const escapedIcon = handlebars.Utils.escapeExpression(icon);
+ metadataElements.push(``);
+ metadataElements.push(``);
+ metadataElements.push(``);
+
+ const title = (getPageTitle(config) ?? translate(req, 'Welcome')) + getPageTitleSuffix(config);
+ // NB: We don't generate the content of the tag here.
+ metadataElements.push(``);
+ metadataElements.push(``);
return metadataElements.join('\n');
}
diff --git a/static/img/icon-grist.png b/static/img/icon-grist.png
new file mode 100644
index 00000000000..f4e9f56f93c
Binary files /dev/null and b/static/img/icon-grist.png differ
diff --git a/static/locales/en.server.json b/static/locales/en.server.json
index 3023c47ad28..7be757b677d 100644
--- a/static/locales/en.server.json
+++ b/static/locales/en.server.json
@@ -1,6 +1,8 @@
{
"sendAppPage": {
- "Loading": "Loading"
+ "Loading": "Loading",
+ "gristMetaDescription": "Grist is the evolution of spreadsheets.",
+ "Welcome": "Welcome"
},
"oidc": {
"emailNotVerifiedError": "Please verify your email with the identity provider, and log in again."