From ee00ff3c4487846b8a333d1b8ebfbace491ac7b6 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 19 Jan 2022 11:56:26 +0000 Subject: [PATCH] [web] Add the meta[viewport] tag to all pages (#6301) * Always add the meta[viewport] tag * Set metadata.viewport to false on projects list page * Remove setting metadata.viewport = true * Add viewport: false to editor page GitOrigin-RevId: 6f9d4c1972e3e6fdf1b6c23cd17d57ba866fcaeb --- services/web/app/src/Features/Project/ProjectController.js | 2 ++ services/web/app/views/_metadata.pug | 2 +- services/web/app/views/general/400.pug | 2 +- services/web/app/views/general/500.pug | 2 +- services/web/app/views/general/unsupported-browser.pug | 2 +- services/web/app/views/project/token/access.pug | 3 --- services/web/app/views/subscriptions/plans-marketing.pug | 1 - services/web/app/views/user/login.pug | 3 --- services/web/app/views/user/logout.pug | 3 --- services/web/app/views/user/one_time_login.pug | 3 --- services/web/app/views/user/passwordReset.pug | 3 --- 11 files changed, 6 insertions(+), 20 deletions(-) diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 9351f53d51..ac0407a008 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -587,6 +587,7 @@ const ProjectController = { reconfirmedViaSAML, zipFileSizeLimit: Settings.maxUploadSize, isOverleaf: !!Settings.overleaf, + metadata: { viewport: false }, } const paidUser = @@ -962,6 +963,7 @@ const ProjectController = { Boolean(Settings.resetServiceWorker) && !shouldDisplayFeature('enable_pdf_caching', false), detachRole, + metadata: { viewport: false }, }) timer.done() } diff --git a/services/web/app/views/_metadata.pug b/services/web/app/views/_metadata.pug index c203c84e4f..d3006efabd 100644 --- a/services/web/app/views/_metadata.pug +++ b/services/web/app/views/_metadata.pug @@ -100,7 +100,7 @@ if (metadata && metadata.openGraphVideo) meta(property="og:video", content=metadata.openGraphVideo) //- Viewport -if metadata && metadata.viewport +if !metadata || metadata.viewport !== false meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes") //- Noindex diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug index 74f0182c33..8a759ad513 100644 --- a/services/web/app/views/general/400.pug +++ b/services/web/app/views/general/400.pug @@ -1,7 +1,7 @@ extends ../layout/layout-no-js block vars - - metadata = { title: 'Something went wrong', viewport: true } + - metadata = { title: 'Something went wrong' } block body body.full-height diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug index a2f66d0a4f..a1b716488e 100644 --- a/services/web/app/views/general/500.pug +++ b/services/web/app/views/general/500.pug @@ -1,7 +1,7 @@ extends ../layout/layout-no-js block vars - - metadata = { title: 'Something went wrong', viewport: true } + - metadata = { title: 'Something went wrong' } block body body.full-height diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug index d0e8eba5d9..a2c2216315 100644 --- a/services/web/app/views/general/unsupported-browser.pug +++ b/services/web/app/views/general/unsupported-browser.pug @@ -1,7 +1,7 @@ extends ../layout/layout-no-js block vars - - metadata = { title: 'Unsupported browser', viewport: true } + - metadata = { title: 'Unsupported browser' } block body body.full-height diff --git a/services/web/app/views/project/token/access.pug b/services/web/app/views/project/token/access.pug index a269a5183c..7e8b45d0d4 100644 --- a/services/web/app/views/project/token/access.pug +++ b/services/web/app/views/project/token/access.pug @@ -1,8 +1,5 @@ extends ../../layout -block vars - - metadata = { viewport: true } - block content script(type="template", id="overleaf-token-access-data")!= StringHelper.stringifyJsonForScript({ postUrl: postUrl, csrfToken: csrfToken}) diff --git a/services/web/app/views/subscriptions/plans-marketing.pug b/services/web/app/views/subscriptions/plans-marketing.pug index 4c0c6a09f9..a642a6811a 100644 --- a/services/web/app/views/subscriptions/plans-marketing.pug +++ b/services/web/app/views/subscriptions/plans-marketing.pug @@ -4,7 +4,6 @@ include ./plans-marketing/_mixins include ./plans-marketing/_tables block vars - - metadata = { viewport: true } - entrypoint = 'pages/user/subscription/plans' block append meta diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index 70d4d3f55e..5db9274655 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - metadata = { viewport: true } - block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/logout.pug b/services/web/app/views/user/logout.pug index 5f51e86c97..6ba5387f5d 100644 --- a/services/web/app/views/user/logout.pug +++ b/services/web/app/views/user/logout.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - metadata = { viewport: true } - block content .content.content-alt main.login-register-container#main-content diff --git a/services/web/app/views/user/one_time_login.pug b/services/web/app/views/user/one_time_login.pug index d525a3ba61..ff43d0683d 100644 --- a/services/web/app/views/user/one_time_login.pug +++ b/services/web/app/views/user/one_time_login.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - metadata = { viewport: true } - block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug index e4f1aea3ee..fbb2281d13 100644 --- a/services/web/app/views/user/passwordReset.pug +++ b/services/web/app/views/user/passwordReset.pug @@ -1,9 +1,6 @@ extends ../layout-marketing include ../_mixins/recaptcha -block vars - - metadata = { viewport: true } - block content - var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)