Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable client domain config #33

Merged
merged 1 commit into from
Nov 2, 2022
Merged

Enable client domain config #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions webapp-map/src/main/webapp/WEB-INF/jsp/geoportal.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<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"/>
<style type="text/css">
@media screen {
body {
Expand Down Expand Up @@ -48,7 +48,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 @@ -166,15 +166,15 @@ function changeAppsetup() {
</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: 7 additions & 7 deletions webapp-map/src/main/webapp/WEB-INF/jsp/geoportal_white.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<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"/>
<style type="text/css">
@media screen {
body {
Expand Down Expand Up @@ -98,7 +98,7 @@
}

#logobar {
background-image: url('/Oskari${path}/oskari_rgb_72.png') !important;
background-image: url('${clientDomain}/Oskari${path}/oskari_rgb_72.png') !important;
}

.oskari-tile.statsgrid .statsgrid-functionality .text {
Expand All @@ -116,7 +116,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 @@ -231,15 +231,15 @@ function changeAppsetup() {
</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