ARTEMIS-3485 Fix web plugin contexts
Support custom web plugin contexts defined with the `url` attribute of the `app` element in bootstrap.xml.
This commit is contained in:
parent
cbdaee4afa
commit
a648805a59
|
@ -39,7 +39,7 @@ public class PluginContextListener implements ServletContextListener {
|
|||
ServletContext context = servletContextEvent.getServletContext();
|
||||
|
||||
plugin = new HawtioPlugin();
|
||||
plugin.setContext((String)context.getInitParameter("plugin-context"));
|
||||
plugin.setContext(context.getContextPath());
|
||||
plugin.setName(context.getInitParameter("plugin-name"));
|
||||
plugin.setScripts(context.getInitParameter("plugin-scripts"));
|
||||
plugin.setDomain(null);
|
||||
|
|
|
@ -82,13 +82,6 @@ svg text {
|
|||
border-top: 3px solid #B21054;
|
||||
}
|
||||
|
||||
/* Change the background image for Login page and About modal as well as text color etc*/
|
||||
.pf-c-login, .pf-c-about-modal-box__hero {
|
||||
background-image: url("/activemq-branding/plugin/img/login-screen-background.png");
|
||||
background-size: cover;
|
||||
--pf-c-form__label--Color: white;
|
||||
}
|
||||
|
||||
.pf-c-login__main {
|
||||
grid-area: main;
|
||||
background-color: transparent;
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
*/
|
||||
var Branding = (function (Branding) {
|
||||
|
||||
|
||||
/**
|
||||
* The name of this plugin
|
||||
*/
|
||||
|
@ -33,6 +34,11 @@ var Branding = (function (Branding) {
|
|||
* The top level path of this plugin on the server
|
||||
*/
|
||||
Branding.contextPath = '/activemq-branding';
|
||||
$.get("plugin", (data) => {
|
||||
if (data.hasOwnProperty('activemq-branding')) {
|
||||
Branding.contextPath = data['activemq-branding'].Context;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* This plugin's AngularJS module instance.
|
||||
|
@ -80,6 +86,18 @@ var Branding = (function (Branding) {
|
|||
// favicon settings
|
||||
Core.applyBranding(configManager);
|
||||
|
||||
brandingStyle = `
|
||||
<style type='text/css'>
|
||||
/* Change the background image for Login page and About modal as well as text color etc */
|
||||
.pf-c-login, .pf-c-about-modal-box__hero {
|
||||
background-image: url("${Branding.contextPath}/plugin/img/login-screen-background.png");
|
||||
background-size: cover;
|
||||
--pf-c-form__label--Color: white;
|
||||
}
|
||||
</style>
|
||||
`;
|
||||
$(brandingStyle).appendTo("head");
|
||||
|
||||
Branding.log.info(Branding.pluginName, "loaded");
|
||||
}
|
||||
initPlugin.$inject = ['configManager', 'aboutService'];
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"branding": {
|
||||
"appName": "Artemis Console",
|
||||
"appLogoUrl": "/activemq-branding/plugin/img/activemq.png",
|
||||
"companyLogoUrl": "/activemq-branding/plugin/img/activemq.png",
|
||||
"css": "/activemq-branding/plugin/css/activemq.css",
|
||||
"favicon": "/activemq-branding/plugin/img/favicon.png"
|
||||
"appLogoUrl": "",
|
||||
"companyLogoUrl": "",
|
||||
"css": "",
|
||||
"favicon": ""
|
||||
},
|
||||
"login": {
|
||||
"description": "ActiveMQ Artemis Management Console",
|
||||
|
@ -20,7 +20,7 @@
|
|||
"productInfo": [],
|
||||
"additionalInfo": "",
|
||||
"copyright": "",
|
||||
"imgSrc": "/activemq-branding/plugin/img/activemq.png"
|
||||
"imgSrc": ""
|
||||
},
|
||||
"disabledRoutes": []
|
||||
}
|
|
@ -39,7 +39,7 @@ public class PluginContextListener implements ServletContextListener {
|
|||
ServletContext context = servletContextEvent.getServletContext();
|
||||
|
||||
plugin = new HawtioPlugin();
|
||||
plugin.setContext((String)context.getInitParameter("plugin-context"));
|
||||
plugin.setContext(context.getContextPath());
|
||||
plugin.setName(context.getInitParameter("plugin-name"));
|
||||
plugin.setScripts(context.getInitParameter("plugin-scripts"));
|
||||
plugin.setDomain(null);
|
||||
|
|
Loading…
Reference in New Issue