From fd2def3309d7187422e4542dc72cd5f06259f799 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 28 Aug 2020 21:25:54 +0200 Subject: [PATCH] Some small fixes --- ccm-core/src/ccm-admin-dashboard/src/main.ts | 3 +++ .../src/main/java/org/libreccm/ui/admin/DashboardApp.java | 8 ++++---- .../main/resources/templates/admin-ui/admin-ui.html.ftl | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ccm-core/src/ccm-admin-dashboard/src/main.ts b/ccm-core/src/ccm-admin-dashboard/src/main.ts index ca1371436..ae74ca065 100644 --- a/ccm-core/src/ccm-admin-dashboard/src/main.ts +++ b/ccm-core/src/ccm-admin-dashboard/src/main.ts @@ -5,6 +5,9 @@ import store from "./store"; import {BootstrapVue, IconsPlugin} from "bootstrap-vue"; +import 'bootstrap/dist/css/bootstrap.css' +import 'bootstrap-vue/dist/bootstrap-vue.css' + Vue.config.productionTip = false; Vue.use(BootstrapVue); diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java b/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java index 47d0c564f..89c605929 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java @@ -70,16 +70,16 @@ public class DashboardApp implements AdminUiApp { @Override public String[] getJsFilesUrls() { return new String[]{ - "/_admin/systeminformation/js/chunk-vendors.js", - "/_admin/systeminformation/js/app.js" + "/_admin/dashboard/js/chunk-vendors.js", + "/_admin/dashboard/js/app.js" }; } @Override public String[] getCssFilesUrls() { return new String[]{ - "/_admin/systeminformation/css/chunk-vendors.css", - "/_admin/systeminformation/css/app.css" + "/_admin/dashboard/css/chunk-vendors.css", + "/_admin/dashboard/css/app.css" }; } diff --git a/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl b/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl index e7613687c..4d8885f8c 100644 --- a/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl +++ b/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl @@ -18,7 +18,7 @@ LibreCCM - ${activeApp.label} -
+
<#list activeApp.jsFilesUrls as jsFile>