diff --git a/src/main/java/com/structurizr/lite/web/AbstractController.java b/src/main/java/com/structurizr/lite/web/AbstractController.java index eae4179..579abab 100644 --- a/src/main/java/com/structurizr/lite/web/AbstractController.java +++ b/src/main/java/com/structurizr/lite/web/AbstractController.java @@ -4,13 +4,18 @@ import com.structurizr.lite.component.workspace.WorkspaceComponent; import com.structurizr.lite.util.RandomGuidGenerator; import com.structurizr.lite.util.Version; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.Base64; import java.util.TimeZone; @@ -20,6 +25,10 @@ public abstract class AbstractController { private static final String REFERER_POLICY_HEADER = "Referrer-Policy"; private static final String REFERER_POLICY_VALUE = "strict-origin-when-cross-origin"; private static final String SCRIPT_NONCE_ATTRIBUTE = "scriptNonce"; + + private static final Log log = LogFactory.getLog(AbstractController.class); + private static final String STRUCTURIZR_CSS_FILENAME = "structurizr.css"; + private static final String STRUCTURIZR_JS_FILENAME = "structurizr.js"; protected WorkspaceComponent workspaceComponent; @@ -48,6 +57,24 @@ protected void addCommonAttributes(ModelMap model, String pageTitle, boolean sho model.addAttribute("showHeader", showHeaderAndFooter); model.addAttribute("showFooter", showHeaderAndFooter); model.addAttribute("version", new Version()); + + File cssFile = new File(Configuration.getInstance().getDataDirectory(), STRUCTURIZR_CSS_FILENAME); + if (cssFile.exists()) { + try { + model.addAttribute("css", Files.readString(cssFile.toPath())); + } catch (IOException ioe) { + log.warn(ioe); + } + } + + File jsFile = new File(Configuration.getInstance().getDataDirectory(), STRUCTURIZR_JS_FILENAME); + if (jsFile.exists()) { + try { + model.addAttribute("js", Files.readString(jsFile.toPath())); + } catch (IOException ioe) { + log.warn(ioe); + } + } if (pageTitle == null || pageTitle.trim().length() == 0) { model.addAttribute("pageTitle", "Structurizr"); @@ -81,4 +108,4 @@ public void setWorkspaceComponent(WorkspaceComponent workspaceComponent) { this.workspaceComponent = workspaceComponent; } -} \ No newline at end of file +} diff --git a/src/main/webapp/WEB-INF/fragments/prelude.jspf b/src/main/webapp/WEB-INF/fragments/prelude.jspf index da2b0a8..9d457b5 100644 --- a/src/main/webapp/WEB-INF/fragments/prelude.jspf +++ b/src/main/webapp/WEB-INF/fragments/prelude.jspf @@ -18,6 +18,13 @@ + + + + + @@ -29,6 +36,16 @@ + + + +