Skip to content

Commit

Permalink
MapStore2 update (geosolutions-it#8)
Browse files Browse the repository at this point in the history
* Update mapstore to master

* Updated embedded title/favicon
  • Loading branch information
allyoucanmap authored and offtherailz committed Feb 14, 2018
1 parent b36307b commit f891a81
Show file tree
Hide file tree
Showing 18 changed files with 676 additions and 57 deletions.
2 changes: 1 addition & 1 deletion MapStore2
Submodule MapStore2 updated 575 files
4 changes: 4 additions & 0 deletions assets/css/mapstore2.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,7 @@ html, body, #map {
font-size: 20px;
font-weight: bold;
}

.MapStore2-C027 .background-preview-icon-frame img {
background-color: #ffffff;
}
15 changes: 14 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
#!/bin/bash
set -e
if grep -q XXXXXXXXXX 'web/ldap.properties'; then
echo "Please configure web/ldap.property first"
exit 1
fi

export GITREV=`git log -1 --format="%H"`
export VERSION="SNAPSHOT-$GITREV"

npm install
npm run compile
npm run lint
mvn clean install

if [ $# -eq 0 ]
then
mvn clean install -Dmapstore2.version=$VERSION
else
mvn clean install -Dmapstore2.version=$1
fi
91 changes: 85 additions & 6 deletions embedded.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,100 @@
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>GeoPortale - Comune di Firenze</title>
<style>
body {
margin: 0;
}
._ms2_init_center {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
overflow: show;
margin: auto;
display: flex;
align-items: center;
}
._ms2_init_spinner {
height: 176px;
width: 176px;
}
._ms2_init_spinner > div,
._ms2_init_spinner > div:after {
border-radius: 50%;
width: 176px;
height: 176px;
}
._ms2_init_spinner > div {
box-sizing: border-box;
text-indent: -9999em;
border: 16px solid rgba(119,119,119, 0.2);
border-left: 16px solid #777777;
-webkit-transform: translateZ(0);
-ms-transform: translateZ(0);
transform: translateZ(0);
-webkit-animation: _ms2_init_anim 1.1s infinite linear;
animation: _ms2_init_anim 1.1s infinite linear;
}
@-webkit-keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
._ms2_init_text {
-webkit-animation: _ms2_init_text_anim 2s linear 0s infinite normal;
animation: _ms2_init_text_anim 2s linear 0s infinite normal;
color: #6F6F6f;
font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 20px;
font-weight: bold;
height: 0.75em;
width: 6em;
text-align: center;
margin: auto;
z-index: 1000;
}
@keyframes _ms2_init_text_anim {
0% {opacity: 0}
20% {opacity: 0}
50% {opacity: 1}
70% {opacity: .75}
100%{opacity: 0}
}
</style>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />
<link rel="stylesheet" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/0.2.4/leaflet.draw.css" />
<link rel="stylesheet" href="dist/themes/firenze.css">
<link rel="shortcut icon" type="image/png" href="./assets/img/logo.png" />
<link rel="shortcut icon" type="image/png" href="assets/img/logo.png" />
<script src="https://maps.google.com/maps/api/js?v=3"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/0.2.4/leaflet.draw.js"></script>
</head>
<body style="margin: 0px">
<div id="container"></div>
<body>
<div id="container">
<div class="_ms2_init_spinner _ms2_init_center"><div></div></div>
<div class="_ms2_init_text _ms2_init_center">Loading MapStore</div>
</div>
<script src="dist/embedded.js"></script>
</body>
</html>
100 changes: 100 additions & 0 deletions embeddedTemplate.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>GeoPortale - Comune di Firenze</title>
<style>
body {
margin: 0;
}
._ms2_init_center {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
overflow: show;
margin: auto;
display: flex;
align-items: center;
}
._ms2_init_spinner {
height: 176px;
width: 176px;
}
._ms2_init_spinner > div,
._ms2_init_spinner > div:after {
border-radius: 50%;
width: 176px;
height: 176px;
}
._ms2_init_spinner > div {
box-sizing: border-box;
text-indent: -9999em;
border: 16px solid rgba(119,119,119, 0.2);
border-left: 16px solid #777777;
-webkit-transform: translateZ(0);
-ms-transform: translateZ(0);
transform: translateZ(0);
-webkit-animation: _ms2_init_anim 1.1s infinite linear;
animation: _ms2_init_anim 1.1s infinite linear;
}
@-webkit-keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
._ms2_init_text {
-webkit-animation: _ms2_init_text_anim 2s linear 0s infinite normal;
animation: _ms2_init_text_anim 2s linear 0s infinite normal;
color: #6F6F6f;
font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 20px;
font-weight: bold;
height: 0.75em;
width: 6em;
text-align: center;
margin: auto;
z-index: 1000;
}
@keyframes _ms2_init_text_anim {
0% {opacity: 0}
20% {opacity: 0}
50% {opacity: 1}
70% {opacity: .75}
100%{opacity: 0}
}
</style>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />
<link rel="stylesheet" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/0.2.4/leaflet.draw.css" />
<link rel="shortcut icon" type="image/png" href="assets/img/logo.png" />
<script src="https://maps.google.com/maps/api/js?v=3"></script>
<!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/0.2.4/leaflet.draw.js"></script>
</head>
<body>
<div id="container">
<div class="_ms2_init_spinner _ms2_init_center"><div></div></div>
<div class="_ms2_init_text _ms2_init_center">Loading MapStore</div>
</div>
</body>
</html>
88 changes: 85 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,92 @@
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
<title>GeoPortale - Comune di Firenze</title>
<style>
body {
margin: 0;
}
._ms2_init_center {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
overflow: show;
margin: auto;
display: flex;
align-items: center;
}
._ms2_init_spinner {
height: 176px;
width: 176px;
}
._ms2_init_spinner > div,
._ms2_init_spinner > div:after {
border-radius: 50%;
width: 176px;
height: 176px;
}
._ms2_init_spinner > div {
box-sizing: border-box;
text-indent: -9999em;
border: 16px solid rgba(119,119,119, 0.2);
border-left: 16px solid #777777;
-webkit-transform: translateZ(0);
-ms-transform: translateZ(0);
transform: translateZ(0);
-webkit-animation: _ms2_init_anim 1.1s infinite linear;
animation: _ms2_init_anim 1.1s infinite linear;
}
@-webkit-keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes _ms2_init_anim {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
._ms2_init_text {
-webkit-animation: _ms2_init_text_anim 2s linear 0s infinite normal;
animation: _ms2_init_text_anim 2s linear 0s infinite normal;
color: #6F6F6f;
font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 20px;
font-weight: bold;
height: 0.75em;
width: 6em;
text-align: center;
margin: auto;
z-index: 1000;
}
@keyframes _ms2_init_text_anim {
0% {opacity: 0}
20% {opacity: 0}
50% {opacity: 1}
70% {opacity: .75}
100%{opacity: 0}
}
</style>
<!-- link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/0.2.4/leaflet.draw.css" / -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/4.0.1/ol.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="dist/themes/firenze.css">
<!--link rel="stylesheet" href="dist/themes/firenze.css"-->
<link rel="stylesheet" href="assets/css/mapstore2.css">
<link rel="shortcut icon" type="image/png" href="assets/img/logo.png" />
<script src="https://maps.google.com/maps/api/js?v=3"></script>
Expand All @@ -23,7 +102,10 @@
<link rel="stylesheet" href="libs/cesium-navigation/cesium-navigation.css" />
</head>
<body>
<div id="container"></div>
<div id="container">
<div class="_ms2_init_spinner _ms2_init_center"><div></div></div>
<div class="_ms2_init_text _ms2_init_center">Loading MapStore</div>
</div>
<script src="dist/MapStore2-C027.js"></script>
</body>

Expand Down
Loading

0 comments on commit f891a81

Please sign in to comment.