Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-11 11:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #899 from pano9000/fix_views-set_password

Browse Source 
fix(views/set_password): various smaller fixes
This commit is contained in:
Elian Doran 2025-01-08 19:08:03 +02:00 committed by GitHub
commit 706424e526
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/set_password.ejs
View File

@ -3,13 +3,17 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title><%= t("login.title") %></title> <title><%= t("set_password.title") %></title>
<link rel="apple-touch-icon" sizes="180x180" href="<%= assetPath %>/images/app-icons/ios/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="<%= assetPath %>/images/app-icons/ios/apple-touch-icon.png">
<link rel="shortcut icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
<link rel="stylesheet" href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="<%= assetPath %>/stylesheets/theme-light.css">
<link rel="stylesheet" href="<%= assetPath %>/stylesheets/theme-next.css">
<link rel="stylesheet" href="<%= assetPath %>/stylesheets/style.css">
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div class="col-xs-12 col-sm-10 col-md-6 col-lg-4 col-xl-4 mx-auto" style="padding-top: 25px;"> <div class="col-xs-12 col-sm-10 col-md-6 col-lg-4 col-xl-4 mx-auto pt-4">
<h1><%= t("set_password.heading") %></h1> <h1><%= t("set_password.heading") %></h1>
<% if (error) { %> <% if (error) { %>
@ -22,15 +26,15 @@
<form action="set-password" method="POST"> <form action="set-password" method="POST">
<div class="form-group"> <div class="form-group">
<label for="password"><%= t("set_password.password") %></label> <label for="password1"><%= t("set_password.password") %></label>
<div class="controls"> <div class="controls">
<input id="password" name="password1" placeholder="" class="form-control" type="password"> <input id="password1" name="password1" placeholder="" class="form-control" type="password">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password"><%= t("set_password.password-confirmation") %></label> <label for="password2"><%= t("set_password.password-confirmation") %></label>
<div class="controls"> <div class="controls">
<input id="password" name="password2" placeholder="" class="form-control" type="password"> <input id="password2" name="password2" placeholder="" class="form-control" type="password">
</div> </div>
</div> </div>
@ -45,10 +49,5 @@
// Required for correct loading of scripts in Electron // Required for correct loading of scripts in Electron
if (typeof module === 'object') {window.module = module; module = undefined;} if (typeof module === 'object') {window.module = module; module = undefined;}
</script> </script>
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="<%= assetPath %>/stylesheets/theme-light.css" rel="stylesheet" />
<link href="<%= assetPath %>/stylesheets/theme-next.css" rel="stylesheet" />
<link href="<%= assetPath %>/stylesheets/style.css" rel="stylesheet">
</body> </body>
</html> </html>

1
translations/cn/server.json
View File

@ -101,6 +101,7 @@
"button": "登录" "button": "登录"
}, },
"set_password": { "set_password": {
"title": "设置密码",
"heading": "设置密码", "heading": "设置密码",
"description": "在您可以从Web开始使用Trilium之前，您需要先设置一个密码。然后您将使用此密码登录。", "description": "在您可以从Web开始使用Trilium之前，您需要先设置一个密码。然后您将使用此密码登录。",
"password": "密码", "password": "密码",

1
translations/de/server.json
View File

@ -100,6 +100,7 @@
"button": "Anmelden" "button": "Anmelden"
}, },
"set_password": { "set_password": {
"title": "Passwort festlegen",
"heading": "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.", "description": "Bevor du Trilium im Web verwenden kannst, musst du zuerst ein Passwort festlegen. Du wirst dieses Passwort dann zur Anmeldung verwenden.",
"password": "Passwort", "password": "Passwort",

1
translations/en/server.json
View File

@ -101,6 +101,7 @@
"button": "Login" "button": "Login"
}, },
"set_password": { "set_password": {
"title": "Set Password",
"heading": "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.", "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", "password": "Password",

1
translations/es/server.json
View File

@ -101,6 +101,7 @@
"button": "Iniciar sesión" "button": "Iniciar sesión"
}, },
"set_password": { "set_password": {
"title": "Establecer contraseña",
"heading": "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.", "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", "password": "Contraseña",

1
translations/fr/server.json
View File

@ -100,6 +100,7 @@
"button": "Connexion" "button": "Connexion"
}, },
"set_password": { "set_password": {
"title": "Définir un mot de passe",
"heading": "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.", "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", "password": "Mot de passe",

1
translations/pt_br/server.json
View File

@ -101,6 +101,7 @@
"button": "Login" "button": "Login"
}, },
"set_password": { "set_password": {
"title": "Definir senha",
"heading": "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.", "description": "Antes de começar a usar o Trilium web, você precisa definir uma senha. Você usará essa senha para fazer login.",
"password": "Senha", "password": "Senha",

1
translations/ro/server.json
View File

@ -101,6 +101,7 @@
"title": "Autentificare" "title": "Autentificare"
}, },
"set_password": { "set_password": {
"title": "Setare parolă",
"heading": "Setare parolă", "heading": "Setare parolă",
"button": "Setează parola", "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.", "description": "Înainte de a putea utiliza Trilium din navigator, trebuie mai întâi setată o parolă. Ulterior această parolă va fi folosită la autentificare.",

1
translations/tw/server.json
View File

@ -100,6 +100,7 @@
"button":"登入" "button":"登入"
}, },
"set_password":{ "set_password":{
"title":"設定密碼",
"heading":"設定密碼", "heading":"設定密碼",
"description":"在您可以從Web開始使用Trilium之前，您需要先設定一個密碼。然後您將使用此密碼登錄。", "description":"在您可以從Web開始使用Trilium之前，您需要先設定一個密碼。然後您將使用此密碼登錄。",
"password":"密碼", "password":"密碼",