diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java index 7f26b3df..d0a262cb 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java @@ -36,6 +36,9 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter { @Value("${google.recaptcha2.enabled}") private Boolean recaptcha2Enabled; + @Value("${site.static.js.url}") + private String siteStaticUrl; + @Value("${google.recaptcha2.siteKey}") private String recaptcha2SiteKey; @@ -61,6 +64,8 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter { request.setAttribute("google.recaptcha2.siteKey", recaptcha2SiteKey); request.setAttribute("site.homepage", siteHomepage); + request.setAttribute("site.static.js.url", siteStaticUrl); + request.setAttribute("security.type", securityType); // If the property could not be resolved, try to infer one from the request... diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index a2a35bb9..7fcf243f 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -98,6 +98,9 @@ admin.user = admin@wisemapping.org # Site Homepage URL. This will be used as URL for homepage location. site.homepage = c/home +# Font end static content can be deployed externally to the web app. Uncomment here and specify the url base location. +# site.static.js.url = http://www.example.com/ + ################################################################################## # Google Analytics Settings ################################################################################## @@ -137,13 +140,6 @@ security.ldap.auth.attribute=mail security.ldap.lastName.attribute=sn security.ldap.firstName.attribute=givenName -# REST Documentation -# -# This properties are used for REST API Documentation( http://localhost:8080/wisemapping/doc/rest/index.html) -# Change the URL for proper documentation console setup. -documentation.services.basePath=http://localhost:8080/service -documentation.services.version=3.0.1 - diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 164b3af7..c0600a3e 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -72,7 +72,8 @@ - + + diff --git a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp index 2e40474e..a38b3594 100644 --- a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp +++ b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp @@ -34,8 +34,9 @@
- - + + +