self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Server: Fixed URLs

Browse Source
This commit is contained in:
Laurent Cozic
2020-12-29 23:22:57 +00:00
parent 1deab7e8d1
commit e61e8b7b94
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/server/src/services/MustacheService.ts
View File

@@ -68,7 +68,8 @@ class MustacheService {
partialContents
);
const layoutView: any = Object.assign({}, this.defaultLayoutOptions, {
const layoutView: any = Object.assign({}, {
global: this.defaultLayoutOptions,
pageName: view.name,
contentHtml: contentHtml,
cssFiles: cssFiles,

10
packages/server/src/views/layouts/default.mustache
View File

@@ -2,11 +2,11 @@
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="{{{baseUrl}}}/css/bulma.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{baseUrl}}}/css/bulma-prefers-dark.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{baseUrl}}}/css/main.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{baseUrl}}}/css/fontawesome/css/all.min.css" crossorigin="anonymous">
<script src="{{{baseUrl}}}/js/main.js"></script>
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/bulma.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/bulma-prefers-dark.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/main.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/fontawesome/css/all.min.css" crossorigin="anonymous">
<script src="{{{global.baseUrl}}}/js/main.js"></script>
{{#cssFiles}}
<link rel="stylesheet" href="{{{.}}}" crossorigin="anonymous">
{{/cssFiles}}