Skip to content

Commit

Permalink
Merge pull request #20 from jdev-org/update
Browse files Browse the repository at this point in the history
Mise à jour des librairies
  • Loading branch information
Agath21 authored Jan 20, 2025
2 parents 9cc4a00 + c8c7ec6 commit be8a0ad
Show file tree
Hide file tree
Showing 57 changed files with 7,299 additions and 3,594 deletions.
69 changes: 43 additions & 26 deletions config.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
{ "splash": {
"iframe": "http://172.16.10.39/ws/demo/splash_enr.html"
"iframe": "stories/dinan_leon/splash.html"
},
"theme": {"css":"stories/enr_reg/enr_reg.css"},
"tooltip" : {"fields": ["nom_region"]},
"theme": {"css":"stories/dinan_leon/dinan_leon_t3.css"},
"tooltip" : {"fields": ["nom"]},
"map": {
"center": [-220750.13768758904,6144925.57790189],
"zoom": 11,
"center": [-227028,6182514],
"zoom": 16,
"width": "100%",
"overview": true,
"url" : "http://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"animation": true
"overview": false,
"url" : "https://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"animation": false
},
"data": {
"title": "La production d'énergie renouvelable en France",
"subtitle": "Démo",
"title": "DE DINAN À LÉHON" ,
"subtitle":"Par le chemin de halage",
"template": {"name": "carousel", "options": {"width":"50%", "color":"#7f8c8d"} },
"url": "http://geobretagne.fr/geoserver/mig/wfs?request=getFeature&typename=mig:regions_nouvelles&outputFormat=application/json&srsName=EPSG:3857",
"orderby": "order",
"url": "stories/dinan_leon/dinan_leon.geojson",
"orderby": "ordre",
"fields": [{
"name": "nom_region",
"type": "title"
},
"name": "nom",
"type": "title"
},
{
"name":"iframe",
"type":"iframe"
"name":"resume",
"type":"text"
},
{
"name":"localisation",
"type":"text"
},
{
"name":"historique",
"type":"text"
},
{
"name":"lien_image",
"type":"background"
},
{
"name":"lien_dossi",
"type":"url"
}],
"analyse": {
"type": "single",
Expand All @@ -32,27 +48,28 @@
"styles": [
{
"fill": {
"color": "rgba(206,227,147,0)"
"color": "rgba(206,0,0,0.7)"
},
"stroke": {
"color": "rgba(206,227,147,0.2)",
"color": "rgba(206,0,0,0.2)",
"width": 2
},
"icon": {
"src" : "https://kartenn.region-bretagne.fr/storymap/stories/dinan_leon/image/placeholder_black.svg",
"scale" : 0.07
}
}
]
},
"hightlightstyle": {
"fill": {
"color": "rgba(206,227,147, 0.6)"
},
"stroke": {
"color": "rgba(206,227,147,1.0)",
"width": 4
"icon": {
"src" : "https://kartenn.region-bretagne.fr/storymap/stories/dinan_leon/image/placeholder_black_light.svg",
"scale" : 0.09
}
}
},
"extradata": {
"url": "stories/enr_reg/enr_region.csv",
"url": "stories/dinan_leon/dinan_lehon_bis.csv",
"linkfield" : "id"
}

Expand Down
118 changes: 70 additions & 48 deletions css/storymap.css
Original file line number Diff line number Diff line change
@@ -1,55 +1,77 @@
html,body {
width: 100%;
height: 100%;
margin: 0;
position: relative;
}

html,
body {
width: 100%;
height: 100%;
margin: 0;
position: relative;
}

#map {
position:fixed;
}

#splash {
position: fixed;
z-index: 50;
width: 100%;
color: #ffffff;
height: 100%;
top: 0px;
left: 0px;
}
#content-title {
position: fixed;
left: 20px;
max-width: 40%;
}
#content-title h1 {
font-size: 40px;
line-height: 0.9;
}
#feature-info {
position: absolute;
height: 1px;
width: 1px;
z-index: 100;
}

#tools {
position: absolute;
z-index: 50;
top: 75%;
left: 5px;
position: fixed;
}

#tools,
#menu {
-webkit-box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.1);
border-radius: 15px;
}

#tools {
position: absolute;
z-index: 50;
}

#menu {
position: absolute;
z-index: 50;
}

#menu.no-visible {
display: none;
}

.ol-zoom {
display: none;
}

.ol-overviewmap .ol-overviewmap-map {
border: 1px solid #b8b8b89c;
}

#splash {
position: fixed;
z-index: 50;
width: 100%;
color: #ffffff;
height: 100%;
top: 0px;
left: 0px;
}

#content-title {
position: fixed;
left: 20px;
max-width: 40%;
}

#feature-info {
position: absolute;
height: 1px;
width: 1px;
z-index: 100;
}

audio {
margin-top: 10px;
margin-top: 10px;
}

a#btn-home, a#btn-extent, a#btn-infos, a#btn-share {
text-align: center;
line-height: 16px;

/* Mobile */

@media (max-width: 768px) {
#content-title, .ol-overviewmap {
display: none !important;
}
}

header {
display: none;
}
88 changes: 38 additions & 50 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,60 +4,49 @@
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<base href="/storymap/"></base>
<title>Kartenn story</title>
<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>-->
<link rel="stylesheet" href="lib/bootstrap_3.3.7/css/bootstrap.min.css">
<script src="lib/jquery_1.12.4/jquery.min.js"></script>
<script src="lib/bootstrap_3.3.7/js/bootstrap.min.js"></script>
<script src="lib/mustache_2.3.0/mustache.min.js"></script>
<script src="lib/papaparse/4.1.2/papaparse.min.js"></script>
<link rel="stylesheet" href="lib/ol/4.5/ol.css" type="text/css">
<link rel="stylesheet" href="lib/stretchy-navigation/css/style.css">
<link rel="stylesheet" href="lib/bootstrap/5.3.3/bootstrap.min.css">
<link rel="stylesheet" href="lib/bootstrap_icons/1.11.3/bootstrap-icons.min.css">
<script src="lib/jquery/3.7.1/jquery-3.7.1.min.js"></script>
<script src="lib/bootstrap/5.3.3/bootstrap.bundle.min.js"></script>
<script src="lib/mustache/4.1.0/mustache.min.js"></script>
<script src="lib/papaparse/5.0.2/papaparse.min.js"></script>
<link rel="stylesheet" href="lib/ol/9.2.4/ol.css" type="text/css">
<link rel="stylesheet" href="css/storymap.css" type="text/css">
<script src="lib/stretchy-navigation/js/modernizr.js"></script> <!-- Modernizr -->
<script src="lib/ol/4.5/ol.js"></script>
<script src="lib/ol/9.2.4/ol.js"></script>
<!-- TODO templates lazy loading" -->
<script src="templates/carousel.js"></script>
<script src="templates/list.js"></script>
</head>
<body>
<div id="bandeau"></div>
<header>
<!--<nav class="cd-stretchy-nav add-content">
<a class="cd-nav-trigger" href="#">
<span aria-hidden="true"></span>
</a>
<ul>
<li><a href="#" id="btn-home" onclick="ks.menuaction(event);" class="glyphicon"><span>Accueil</span></a></li>
<li><a href="#" id="btn-extent" onclick="ks.menuaction(event);" class="glyphicon"><span>Zoom</span></a></li>
<li><a href="#" id="btn-infos" onclick="ks.menuaction(event);" class="glyphicon"><span>crédits</span></a></li>
<li><a href="#" id="btn-share" onclick="ks.menuaction(event);" class="glyphicon"><span>Partager</span></a></li>
</ul>
<span aria-hidden="true" class="stretchy-nav-bg"></span>
</nav>-->
</header>
<div id="bandeau" ></div>
<div id="map" class="map"></div>
<div id="tools" class="btn-group-vertical btn-group-sm" role="group" aria-label="true" >
<button role="button" id="btn-zoomplus" href="#" onclick="ks.menuaction('zoomplus');" title="Zoomer" class="btn btn-default" tabindex="104" accesskey="4">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<div id="tools" class="btn-group-vertical" role="group" aria-label="Vertical button group" >
<button role="button" id="btn-zoomplus" href="#" onclick="ks.menuaction('zoomplus');" title="Zoomer" class="btn btn-light">
<i class="bi bi-plus-lg"></i>
</button>
<button role="button" id="btn-home" href="#" onclick="ks.menuaction('home');" title="Accueil" class="btn btn-default" tabindex="104" accesskey="4">
<span class="glyphicon glyphicon-home" aria-hidden="true"></span>
<button role="button" id="btn-home" href="#" onclick="ks.menuaction('home');" title="Accueil" class="btn btn-light">
<i class="bi bi-house-door"></i>
</button>
<button role="button" id="btn-zoommoins" href="#" onclick="ks.menuaction('zoommoins');" title="Dézoomer" class="btn btn-default" tabindex="104" accesskey="4">
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
<button role="button" id="btn-zoommoins" href="#" onclick="ks.menuaction('zoommoins');" title="Dézoomer" class="btn btn-light">
<i class="bi bi-dash"></i>
</button>
</div>
<div id="menu" class="btn-group-vertical no-visible" role="group" aria-label="Vertical button group" >
<button role="button" id="btn-extent" href="#" onclick="ks.menuaction('extent');" title="Revenir à l'étendue initiale" class="btn btn-light">
<i class="bi bi-fullscreen"></i>
</button>
<button role="button" id="btn-infos" href="#" onclick="ks.menuaction('infos');" title="Crédits" class="btn btn-light">
<i class="bi bi-info-circle"></i>
</button>
<button role="button" id="btn-share" href="#" onclick="ks.menuaction('share');" title="Partager" class="btn btn-light">
<i class="bi bi-share"></i>
</button>
</div>
<div id="content-title" style="display: none;">
<h1></h1>
<h3></h3>
</div>
<div id="feature-info" class=""></div>
<div id="feature-info" class="" data-bs-toggle="tooltip" title=""></div>
<div id="template" ></div>
<div id="splash" style="display: none;">
<div class="story-btn story-btn-next" style="opacity: 1;">
Expand All @@ -69,8 +58,8 @@ <h3></h3>
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel"></h4>
<h5 class="modal-title" id="myModalLabel"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
</div>
Expand All @@ -82,8 +71,8 @@ <h4 class="modal-title" id="myModalLabel"></h4>
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"></h4>
<h5 class="modal-title"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" >
<div class="row">
Expand All @@ -101,7 +90,7 @@ <h4 class="modal-title"></h4>
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" >
<div class="row">
Expand All @@ -115,11 +104,11 @@ <h4 class="modal-title"></h4>
</div>
<!-- PANEL SHARE -->
<div id="panel-share" class="modal fade" tabindex="-1" role="dialog" >
<div class="modal-dialog modal-sm">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Partager</h4>
<div class="modal-header">
<h5 class="modal-title">Partager</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" >
<div class="row">
Expand All @@ -133,8 +122,8 @@ <h4 class="modal-title">Partager</h4>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Crédits</h4>
<h5 class="modal-title">Crédits</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" >
<div class="row">
Expand All @@ -144,6 +133,5 @@ <h4 class="modal-title">Crédits</h4>
</div>
</div>
<script src="js/storymap.js"></script>
<script src="lib/stretchy-navigation/js/main.js"></script>
</body>
</html>
Loading

0 comments on commit be8a0ad

Please sign in to comment.