gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-19 22:58:52 +02:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

chore(rtl): address 2nd set of requested changes

Browse Source
This commit is contained in:
Elian Doran 2025-10-09 20:48:30 +03:00
parent 00b215c093
commit 492f481999
No known key found for this signature in database
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/server/src/assets/views/set_password.ejs
View File

@ -11,7 +11,7 @@
<link rel="stylesheet" href="<%= assetPath %>/stylesheets/style.css">
<script src="<%= appPath %>/runtime.js" crossorigin type="module"></script>
</head>
<body>
<body lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>">
<div class="container set-password">
<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>

2
apps/server/src/assets/views/setup.ejs
View File

@ -45,7 +45,7 @@
</style>
<script src="<%= appPath %>/runtime.js" crossorigin type="module"></script>
</head>
<body>
<body lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>">
<noscript><%= t("javascript-required") %></noscript>
<div class="container">
<div id="setup-dialog" class="col-md-12 col-lg-8 col-xl-6 mx-auto" style="padding-top: 25px; font-size: larger; display: none;">

6
apps/server/src/routes/login.ts
View File

@ -33,7 +33,8 @@ function setPasswordPage(req: Request, res: Response) {
res.render("set_password", {
error: false,
assetPath,
appPath
appPath,
currentLocale: getCurrentLocale()
});
}
@ -58,7 +59,8 @@ function setPassword(req: Request, res: Response) {
res.render("set_password", {
error,
assetPath,
appPath
appPath,
currentLocale: getCurrentLocale()
});
return;
}

6
apps/server/src/routes/setup.ts
View File

@ -6,6 +6,7 @@ import { isElectron } from "../services/utils.js";
import assetPath from "../services/asset_path.js";
import appPath from "../services/app_path.js";
import type { Request, Response } from "express";
import { getCurrentLocale } from "../services/i18n.js";
function setupPage(req: Request, res: Response) {
if (sqlInit.isDbInitialized()) {
@ -30,7 +31,8 @@ function setupPage(req: Request, res: Response) {
res.render("setup", {
syncInProgress: syncInProgress,
assetPath: assetPath,
appPath: appPath
appPath: appPath,
currentLocale: getCurrentLocale()
});
}
@ -39,7 +41,7 @@ async function handleElectronRedirect() {
const { app } = await import("electron");
// Wait for the main window to be created before closing the setup window to prevent triggering `window-all-closed`.
await windowService.createMainWindow(app);
await windowService.createMainWindow(app);
windowService.closeSetupWindow();
const tray = (await import("../services/tray.js")).default;