DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

3221 Self-host Bootstrap CSS

Browse Source
This commit is contained in:
Andreas Svanberg 2023-10-17 10:43:30 +02:00
parent 3ca4e99e99
commit 3ee6b3372b
3 changed files with 2 additions and 2 deletions
view/src/main/java/se/su/dsv/scipro
SciProApplication.java
basepages
BasePage.htmlBasePage.java

1
view/src/main/java/se/su/dsv/scipro/SciProApplication.java

@ -150,7 +150,6 @@ public class SciProApplication extends LifecycleManagedWebApplication {
getCspSettings().blocking()
// whitelist all css files coming from self
.add(CSPDirective.STYLE_SRC, CSPDirectiveSrcValue.SELF)
.add(CSPDirective.STYLE_SRC, "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css")
// script-src 'self' is ignored for CSP level 3 compliant browsers due to 'strict-dynamic'
// but is used as a fallback for older browsers to allow loading of local javascripts
.add(CSPDirective.SCRIPT_SRC, CSPDirectiveSrcValue.SELF)

2
view/src/main/java/se/su/dsv/scipro/basepages/BasePage.html

@ -4,12 +4,12 @@
<meta charset="UTF-8" />
<title>SciPro Projects</title>
<link rel="icon" href="favicon.ico"/>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" href="css/fa-all.min.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<wicket:header-items/>
<wicket:remove>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" href="css/scipro_m.css" media="screen,projection" />
<!-- leaving them here for autocomplete when writing javascript -->d
<script src="js/scroll-sneak.js"></script>

1
view/src/main/java/se/su/dsv/scipro/basepages/BasePage.java

@ -35,6 +35,7 @@ public abstract class BasePage extends WebPage implements IAjaxIndicatorAware {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new WebjarsJavaScriptResourceReference("bootstrap/current/css/bootstrap.min.css")));
response.render(CssHeaderItem.forReference(new ContextRelativeResourceReference("css/scipro_m.css", false)));
response.render(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings()
.getJQueryReference()));