diff --git a/packages/server/public/css/main.css b/packages/server/public/css/main.css index 847c77ae3d..8543161d17 100644 --- a/packages/server/public/css/main.css +++ b/packages/server/public/css/main.css @@ -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; } diff --git a/packages/server/src/services/MustacheService.ts b/packages/server/src/services/MustacheService.ts index 00ba1d5c06..7bd49771d4 100644 --- a/packages/server/src/services/MustacheService.ts +++ b/packages/server/src/services/MustacheService.ts @@ -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 { 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, diff --git a/packages/server/src/views/layouts/default.mustache b/packages/server/src/views/layouts/default.mustache index 32365c1e4c..db692f2942 100644 --- a/packages/server/src/views/layouts/default.mustache +++ b/packages/server/src/views/layouts/default.mustache @@ -19,7 +19,7 @@ {{/jsFiles}} - + {{> navbar}}