Skip to content

Commit

Permalink
Merge pull request #897 from ZakarFin/client-config
Browse files Browse the repository at this point in the history 
Enable more config options to link client code
  • Loading branch information
@ZakarFin
ZakarFin authored Nov 2, 2022
2 parents 3839341 + e582c07 commit e271091
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 17 deletions.
15 changes: 13 additions & 2 deletions servlet-map/src/main/java/fi/nls/oskari/MapController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class MapController {
private final static Logger log = LogFactory.getLogger(MapController.class);

private final static String PROPERTY_VERSION = "oskari.client.version";
private final static String PROPERTY_VERSION_REQUEST = "oskari.client.version.request";
private final static String PROPERTY_CLIENT_DOMAIN = "oskari.client.domain";
private final static String KEY_PRELOADED = "preloaded";
private final static String KEY_PATH = "path";

Expand All @@ -46,7 +48,9 @@ public class MapController {
private final static String KEY_RESPONSE_HEADER_PREFIX = "oskari.page.header.";

private final ViewService viewService = new AppSetupServiceMybatisImpl();
private String clientDomain = "";
private String version = null;
private boolean allowVersionRequest = false;
private final Set<String> paramHandlers = new HashSet<>();

@Autowired
Expand All @@ -55,6 +59,8 @@ public class MapController {
public MapController() {
// Get version from properties
version = PropertyUtil.get(PROPERTY_VERSION);
allowVersionRequest = PropertyUtil.getOptional(PROPERTY_VERSION_REQUEST, false);
clientDomain = PropertyUtil.get(PROPERTY_CLIENT_DOMAIN, "");
}

@RequestMapping("/")
Expand Down Expand Up @@ -204,8 +210,13 @@ private String setupRenderParameters(final ActionParameters params, Model model)
model.addAttribute(KEY_PRELOADED, true);

// for figuring out paths for frontend files
model.addAttribute("version", version);
model.addAttribute(KEY_PATH, "/" + version + "/" + view.getApplication());
model.addAttribute("clientDomain", clientDomain);
String clientVersion = version;
if (allowVersionRequest) {
clientVersion = params.getHttpParam("v", version);
}
model.addAttribute("version", clientVersion);
model.addAttribute(KEY_PATH, "/" + clientVersion + "/" + view.getApplication());
model.addAttribute("application", view.getApplication());

// title of the page
Expand Down
14 changes: 7 additions & 7 deletions servlet-map/src/main/resources/META-INF/resources/spring-map-jsp/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<html>
<head>
<title>Oskari - ${viewName}</title>
<link rel="shortcut icon" href="/Oskari${path}/logo.png" type="image/png" />
<link rel="shortcut icon" href="${clientDomain}/Oskari${path}/logo.png" type="image/png" />

<!-- ############# css ################# -->
<link
rel="stylesheet"
type="text/css"
href="/Oskari${path}/icons.css"/>
href="${clientDomain}/Oskari${path}/icons.css"/>

<link
rel="stylesheet"
type="text/css"
href="/Oskari${path}/oskari.min.css"/>
href="${clientDomain}/Oskari${path}/oskari.min.css"/>

<link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
<style type="text/css">
Expand Down Expand Up @@ -52,7 +52,7 @@
#login input[type="text"], #login input[type="password"] {
width: 90%;
margin-bottom: 5px;
background-image: url("/Oskari/${version}/resources/images/forms/input_shadow.png");
background-image: url("${clientDomain}/Oskari/${version}/resources/images/forms/input_shadow.png");
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
Expand Down Expand Up @@ -168,15 +168,15 @@
</script>
<%-- Pre-compiled application JS, empty unless created by build job --%>
<script type="text/javascript"
src="/Oskari${path}/oskari.min.js">
src="${clientDomain}/Oskari${path}/oskari.min.js">
</script>
<%--language files --%>
<script type="text/javascript"
src="/Oskari${path}/oskari_lang_${language}.js">
src="${clientDomain}/Oskari${path}/oskari_lang_${language}.js">
</script>

<script type="text/javascript"
src="/Oskari${path}/index.js">
src="${clientDomain}/Oskari${path}/index.js">
</script>


Expand Down
14 changes: 6 additions & 8 deletions servlet-map/src/main/resources/META-INF/resources/spring-map-jsp/published.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@
<html>
<head>
<title>${viewName}</title>
<link rel="shortcut icon" href="/Oskari${path}/logo.png" type="image/png" />
<link rel="shortcut icon" href="${clientDomain}/Oskari${path}/logo.png" type="image/png" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<!-- IE 9 polyfill for openlayers 3 - https://github.com/openlayers/ol3/issues/4865 -->
<!--[if lte IE 9]> <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=fetch,requestAnimationFrame,Element.prototype.classList"></script> <![endif]-->

<!-- ############# css ################# -->
<link
rel="stylesheet"
type="text/css"
href="/Oskari${path}/icons.css"/>
href="${clientDomain}/Oskari${path}/icons.css"/>

<link
rel="stylesheet"
type="text/css"
href="/Oskari${path}/oskari.min.css"/>
href="${clientDomain}/Oskari${path}/oskari.min.css"/>

<link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
<style type="text/css">
Expand Down Expand Up @@ -60,16 +58,16 @@
</script>
<%-- Pre-compiled application JS, empty unless created by build job --%>
<script type="text/javascript"
src="/Oskari${path}/oskari.min.js">
src="${clientDomain}/Oskari${path}/oskari.min.js">
</script>

<%-- language files --%>
<script type="text/javascript"
src="/Oskari${path}/oskari_lang_${language}.js">
src="${clientDomain}/Oskari${path}/oskari_lang_${language}.js">
</script>

<script type="text/javascript"
src="/Oskari${path}/index.js">
src="${clientDomain}/Oskari${path}/index.js">
</script>


Expand Down

0 comments on commit e271091

Please sign in to comment.