From 11415f5b2c190baba54444217548b89113a4765f Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Tue, 7 Jan 2025 22:38:20 +0100 Subject: [PATCH 1/4] fix(views/set_password): fix duplicate input id --- src/views/set_password.ejs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/set_password.ejs b/src/views/set_password.ejs index 855608428..daef4eee7 100644 --- a/src/views/set_password.ejs +++ b/src/views/set_password.ejs @@ -22,15 +22,15 @@
- +
- +
- +
- +
From ee5a232d209de7df6be52cc6a542a82a67d6e48d Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Tue, 7 Jan 2025 22:50:19 +0100 Subject: [PATCH 2/4] fix(views/set_password): fix "flash of unstyled content" --- src/views/set_password.ejs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/set_password.ejs b/src/views/set_password.ejs index daef4eee7..8b4285ea1 100644 --- a/src/views/set_password.ejs +++ b/src/views/set_password.ejs @@ -6,6 +6,10 @@ <%= t("login.title") %> + + + +
@@ -45,10 +49,5 @@ // Required for correct loading of scripts in Electron if (typeof module === 'object') {window.module = module; module = undefined;} - - - - - From 5bfba405a1d82a43a8145bf8a79968d9b4b0b685 Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Tue, 7 Jan 2025 23:08:36 +0100 Subject: [PATCH 3/4] fix(views/set_password): fix page title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I've added set_password.title – currently this looks like a duplicate string to set_password.heading, but there will be a separate change to this soon --- src/views/set_password.ejs | 2 +- translations/cn/server.json | 1 + translations/de/server.json | 1 + translations/en/server.json | 1 + translations/es/server.json | 1 + translations/fr/server.json | 1 + translations/pt_br/server.json | 1 + translations/ro/server.json | 1 + translations/tw/server.json | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/set_password.ejs b/src/views/set_password.ejs index 8b4285ea1..43912b6da 100644 --- a/src/views/set_password.ejs +++ b/src/views/set_password.ejs @@ -3,7 +3,7 @@ - <%= t("login.title") %> + <%= t("set_password.title") %> diff --git a/translations/cn/server.json b/translations/cn/server.json index 364dcae5f..af62aa155 100644 --- a/translations/cn/server.json +++ b/translations/cn/server.json @@ -101,6 +101,7 @@ "button": "登录" }, "set_password": { + "title": "设置密码", "heading": "设置密码", "description": "在您可以从Web开始使用Trilium之前，您需要先设置一个密码。然后您将使用此密码登录。", "password": "密码", diff --git a/translations/de/server.json b/translations/de/server.json index c5a529603..a782e3c70 100644 --- a/translations/de/server.json +++ b/translations/de/server.json @@ -100,6 +100,7 @@ "button": "Anmelden" }, "set_password": { + "title": "Passwort festlegen", "heading": "Passwort festlegen", "description": "Bevor du Trilium im Web verwenden kannst, musst du zuerst ein Passwort festlegen. Du wirst dieses Passwort dann zur Anmeldung verwenden.", "password": "Passwort", diff --git a/translations/en/server.json b/translations/en/server.json index 2e16e7f6e..fd4aa19c8 100644 --- a/translations/en/server.json +++ b/translations/en/server.json @@ -101,6 +101,7 @@ "button": "Login" }, "set_password": { + "title": "Set Password", "heading": "Set password", "description": "Before you can start using Trilium from web, you need to set a password first. You will then use this password to login.", "password": "Password", diff --git a/translations/es/server.json b/translations/es/server.json index a7ebbbe25..3f0b1f27a 100644 --- a/translations/es/server.json +++ b/translations/es/server.json @@ -101,6 +101,7 @@ "button": "Iniciar sesión" }, "set_password": { + "title": "Establecer contraseña", "heading": "Establecer contraseña", "description": "Antes de poder comenzar a usar Trilium desde la web, primero debe establecer una contraseña. Luego utilizará esta contraseña para iniciar sesión.", "password": "Contraseña", diff --git a/translations/fr/server.json b/translations/fr/server.json index 60ea3ffa2..51641c013 100644 --- a/translations/fr/server.json +++ b/translations/fr/server.json @@ -100,6 +100,7 @@ "button": "Connexion" }, "set_password": { + "title": "Définir un mot de passe", "heading": "Définir un mot de passe", "description": "Avant de pouvoir commencer à utiliser Trilium depuis le web, vous devez d'abord définir un mot de passe. Vous utiliserez ensuite ce mot de passe pour vous connecter.", "password": "Mot de passe", diff --git a/translations/pt_br/server.json b/translations/pt_br/server.json index c3fc0c550..fbca023e8 100644 --- a/translations/pt_br/server.json +++ b/translations/pt_br/server.json @@ -101,6 +101,7 @@ "button": "Login" }, "set_password": { + "title": "Definir senha", "heading": "Definir senha", "description": "Antes de começar a usar o Trilium web, você precisa definir uma senha. Você usará essa senha para fazer login.", "password": "Senha", diff --git a/translations/ro/server.json b/translations/ro/server.json index 5dad97abb..34a547c5a 100644 --- a/translations/ro/server.json +++ b/translations/ro/server.json @@ -101,6 +101,7 @@ "title": "Autentificare" }, "set_password": { + "title": "Setare parolă", "heading": "Setare parolă", "button": "Setează parola", "description": "Înainte de a putea utiliza Trilium din navigator, trebuie mai întâi setată o parolă. Ulterior această parolă va fi folosită la autentificare.", diff --git a/translations/tw/server.json b/translations/tw/server.json index 3b076e57a..717d11376 100644 --- a/translations/tw/server.json +++ b/translations/tw/server.json @@ -100,6 +100,7 @@ "button":"登入" }, "set_password":{ + "title":"設定密碼", "heading":"設定密碼", "description":"在您可以從Web開始使用Trilium之前，您需要先設定一個密碼。然後您將使用此密碼登錄。", "password":"密碼", From 5e91e398417a2c3f70117986192b0dac2826819b Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Wed, 8 Jan 2025 08:07:46 +0100 Subject: [PATCH 4/4] style(views/set_password): use bootstrap class for padding --- src/views/set_password.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/set_password.ejs b/src/views/set_password.ejs index 43912b6da..12c78bfb1 100644 --- a/src/views/set_password.ejs +++ b/src/views/set_password.ejs @@ -13,7 +13,7 @@
-
+

<%= t("set_password.heading") %>

<% if (error) { %>