Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server: Make page wider only when displaying admin pages

pull/6077/head
Laurent Cozic 2022-01-29 19:21:37 +00:00
parent 603c8338c0
commit df9c460363
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/server/public/css/main.css
View File

@ -6,8 +6,8 @@ html {
font-size: 14px;
}
div.main-container,
div.navbar-container {
.is-admin-page div.main-container,
.is-admin-page div.navbar-container {
max-width: none !important;
}
@ -29,11 +29,6 @@ input.form-control {
margin-left: 0.5em;
}
/*
.navbar .logo {
height: 50px;
} */
.navbar .navbar-item img {
max-height: 3em;
}

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

@ -282,10 +282,15 @@ export default class MustacheService {
throw new Error(`Unsupported view extension: ${ext}`);
}
private formatPageName(name: string): string {
return name.replace(/[/\\]/g, '-');
}
public async renderView(view: View, globalParams: GlobalParams = null): Promise<string> {
const cssFiles = this.resolvesFilePaths('css', view.cssFiles || []);
const jsFiles = this.resolvesFilePaths('js', view.jsFiles || []);
const filePath = await this.viewFilePath(view.path);
const isAdminPage = view.path.startsWith('/admin/');
globalParams = {
...this.defaultLayoutOptions,
@ -293,7 +298,7 @@ export default class MustacheService {
adminMenu: globalParams ? this.makeAdminMenu(globalParams.currentUrl) : null,
navbarMenu: this.makeNavbar(globalParams?.currentUrl, globalParams?.owner ? !!globalParams.owner.is_admin : false),
userDisplayName: this.userDisplayName(globalParams ? globalParams.owner : null),
isAdminPage: view.path.startsWith('/admin/'),
isAdminPage,
s: {
home: _('Home'),
users: _('Users'),
@ -310,7 +315,7 @@ export default class MustacheService {
const layoutView: any = {
global: globalParams,
pageName: view.name,
pageName: this.formatPageName(view.name),
pageTitle: view.titleOverride ? view.title : `${config().appName} - ${view.title}`,
contentHtml: contentHtml,
cssFiles: cssFiles,

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

@ -19,7 +19,7 @@
<script src="{{{.}}}"></script>
{{/jsFiles}}
</head>
<body class="page-{{{pageName}}}">
<body class="page-{{{pageName}}} {{#global.isAdminPage}}is-admin-page{{/global.isAdminPage}}">
{{> navbar}}
<main class="main">
<div class="container main-container">