diff --git a/lightadmin-core/src/main/java/org/lightadmin/core/config/LightAdminConfiguration.java b/lightadmin-core/src/main/java/org/lightadmin/core/config/LightAdminConfiguration.java index 3f7e6d28..173c75b4 100644 --- a/lightadmin-core/src/main/java/org/lightadmin/core/config/LightAdminConfiguration.java +++ b/lightadmin-core/src/main/java/org/lightadmin/core/config/LightAdminConfiguration.java @@ -42,4 +42,5 @@ public interface LightAdminConfiguration { boolean isFileStreamingEnabled(); + String getCustomStylePath(); } \ No newline at end of file diff --git a/lightadmin-core/src/main/java/org/lightadmin/core/config/StandardLightAdminConfiguration.java b/lightadmin-core/src/main/java/org/lightadmin/core/config/StandardLightAdminConfiguration.java index f00624a3..8c0ddcc0 100644 --- a/lightadmin-core/src/main/java/org/lightadmin/core/config/StandardLightAdminConfiguration.java +++ b/lightadmin-core/src/main/java/org/lightadmin/core/config/StandardLightAdminConfiguration.java @@ -39,6 +39,7 @@ public class StandardLightAdminConfiguration implements LightAdminConfiguration private final boolean fileStreaming; private final String basePackage; private final boolean demoMode; + private String customStylePath; public StandardLightAdminConfiguration(ServletContext servletContext) { this.basePackage = servletContext.getInitParameter(LIGHT_ADMINISTRATION_BASE_PACKAGE); @@ -59,6 +60,8 @@ public StandardLightAdminConfiguration(ServletContext servletContext) { } else { this.securityLogoutUrl = servletContext.getContextPath() + defaultIfBlank(servletContext.getInitParameter(LIGHT_ADMINISTRATION_SECURITY_LOGOUT_URL), "#"); } + + this.customStylePath = servletContext.getInitParameter(LIGHT_ADMINISTRATION_CUSTOM_STYLE); } @Override @@ -110,6 +113,11 @@ public boolean isDemoMode() { return demoMode; } + @Override + public String getCustomStylePath() { + return customStylePath; + } + @Override public String getSecurityLogoutUrl() { return securityLogoutUrl; @@ -136,4 +144,6 @@ private String helpUrl(ServletContext servletContext) { private String urlWithoutEndSeparator(String url) { return url.endsWith("/") ? url.substring(0, url.length() - 1) : url; } + + } \ No newline at end of file diff --git a/lightadmin-core/src/main/java/org/lightadmin/core/util/LightAdminConfigurationUtils.java b/lightadmin-core/src/main/java/org/lightadmin/core/util/LightAdminConfigurationUtils.java index 1751891c..14fd8279 100644 --- a/lightadmin-core/src/main/java/org/lightadmin/core/util/LightAdminConfigurationUtils.java +++ b/lightadmin-core/src/main/java/org/lightadmin/core/util/LightAdminConfigurationUtils.java @@ -54,4 +54,5 @@ public class LightAdminConfigurationUtils { public static final String LIGHT_ADMINISTRATION_HELP_DEFAULT_URL = "http://lightadmin.org/getting-started/"; public static final String LIGHT_ADMINISTRATION_DEMO_MODE = "light:administration:demo-mode"; + public static final String LIGHT_ADMINISTRATION_CUSTOM_STYLE = "light:administration:custom-style"; } \ No newline at end of file diff --git a/lightadmin-core/src/main/java/org/lightadmin/core/view/preparer/ScreenViewPreparer.java b/lightadmin-core/src/main/java/org/lightadmin/core/view/preparer/ScreenViewPreparer.java index 4a810740..99a88081 100644 --- a/lightadmin-core/src/main/java/org/lightadmin/core/view/preparer/ScreenViewPreparer.java +++ b/lightadmin-core/src/main/java/org/lightadmin/core/view/preparer/ScreenViewPreparer.java @@ -32,6 +32,7 @@ protected void execute(Request request, AttributeContext attributeContext, Globa super.execute(request, attributeContext, configuration); addAttribute(attributeContext, "lightAdminConfiguration", lightAdminConfiguration, true); + addAttribute(attributeContext, "customStyle", lightAdminConfiguration.getCustomStylePath(), true); } @Override diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp index 9c8bb00e..522cd529 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp @@ -9,6 +9,7 @@ <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> + @@ -26,6 +27,9 @@ "> "> + + "> + diff --git a/lightadmin-sandbox/src/main/webapp/WEB-INF/web-servlet-api-2.5.xml b/lightadmin-sandbox/src/main/webapp/WEB-INF/web-servlet-api-2.5.xml index 9cd53d73..315c8c0d 100644 --- a/lightadmin-sandbox/src/main/webapp/WEB-INF/web-servlet-api-2.5.xml +++ b/lightadmin-sandbox/src/main/webapp/WEB-INF/web-servlet-api-2.5.xml @@ -17,6 +17,11 @@ false + + + + + diff --git a/lightadmin-sandbox/src/main/webapp/WEB-INF/web.xml b/lightadmin-sandbox/src/main/webapp/WEB-INF/web.xml index b9a46a8e..6276b63b 100644 --- a/lightadmin-sandbox/src/main/webapp/WEB-INF/web.xml +++ b/lightadmin-sandbox/src/main/webapp/WEB-INF/web.xml @@ -27,6 +27,11 @@ false + + + + +