diff --git a/package.json b/package.json
index 547a4b5c2..144e53653 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "geopf-extensions-openlayers",
"description": "French Geoportal Extensions for OpenLayers libraries",
- "version": "1.0.0-beta.1-296",
+ "version": "1.0.0-beta.1-300",
"date": "11/12/2024",
"module": "src/index.js",
"directories": {},
diff --git a/samples-src/pages/tests/Default/pages-ol-modules-default.html b/samples-src/pages/tests/Default/pages-ol-modules-default.html
index ee10f4f6b..eb2ffa568 100644
--- a/samples-src/pages/tests/Default/pages-ol-modules-default.html
+++ b/samples-src/pages/tests/Default/pages-ol-modules-default.html
@@ -44,6 +44,8 @@
+
+
{{/content}}
{{#content "head"}}
@@ -54,7 +56,7 @@
{{/content}}
@@ -108,16 +110,18 @@
Ajout de tous les widgets
position : "top-left"
});
map.addControl(overview);
-
+
var drawing = new ol.control.Drawing({
draggable: true,
- position : "bottom-left"
+ position : "bottom-left",
+ listable: true,
});
map.addControl(drawing);
var iso = new ol.control.Isocurve({
draggable: true,
- position : "bottom-left"
+ position : "bottom-left",
+ listable: true,
});
map.addControl(iso);
@@ -154,7 +158,8 @@ Ajout de tous les widgets
var reverse = new ol.control.ReverseGeocode({
draggable: true,
- position : "top-right"
+ position : "top-right",
+ listable: true,
});
map.addControl(reverse);
@@ -202,8 +207,15 @@ Ajout de tous les widgets
auto: true
});
map.addControl(territories);
+
+ var controlList = new ol.control.ControlList({
+ draggable: false,
+ position: "bottom-right",
+ });
+ map.addControl(controlList);
};
+
Gp.Services.getConfig({
customConfigFile : "{{ configurl }}",
callbackSuffix : "",
diff --git a/src/packages/CSS/Controls/ControlList/DSFRcontrolListStyle.css b/src/packages/CSS/Controls/ControlList/DSFRcontrolListStyle.css
index 46b0c4fcc..464a630e5 100644
--- a/src/packages/CSS/Controls/ControlList/DSFRcontrolListStyle.css
+++ b/src/packages/CSS/Controls/ControlList/DSFRcontrolListStyle.css
@@ -1,3 +1,7 @@
+button[id^="GPshowControlListPicto-"][aria-pressed="true"] + dialog {
+ width: 370px;
+}
+
div[id^="GPcontrolList-"] .GPshowOpen > span {
font-size: 32px;
position: absolute;
diff --git a/src/packages/CSS/Controls/ControlList/GPFcontrolList.css b/src/packages/CSS/Controls/ControlList/GPFcontrolList.css
index 95854fb7d..0ac325669 100644
--- a/src/packages/CSS/Controls/ControlList/GPFcontrolList.css
+++ b/src/packages/CSS/Controls/ControlList/GPFcontrolList.css
@@ -11,7 +11,6 @@ button[id^="GPshowControlListPicto-"][aria-pressed="true"] + dialog {
flex-direction: column;
visibility: visible;
opacity: 100%;
- width: 370px;
}
dialog[id^="GPcontrolListPanel-"] {
diff --git a/src/packages/CSS/Controls/ControlList/GPFcontrolListStyle.css b/src/packages/CSS/Controls/ControlList/GPFcontrolListStyle.css
index 3cff65640..dc491e2c4 100644
--- a/src/packages/CSS/Controls/ControlList/GPFcontrolListStyle.css
+++ b/src/packages/CSS/Controls/ControlList/GPFcontrolListStyle.css
@@ -1,4 +1,33 @@
-/* En attente d'implementation */
-div[id^="GPcontrolList-"] {
- display: none;
+div[id^="GPcontrolList-"] .GPshowOpen > span {
+ font-size: 24px;
+ color: white;
+ display: block;
+ height: 24px;
+ line-height: 24px;
+ pointer-events: none;
+}
+
+button[id^="GPshowControlListPicto-"][aria-pressed="true"] + dialog {
+ width: 200px;
+}
+
+.GPcontrolListPanelClose {
+ background-image: url("img/close.png");
+}
+
+dialog[id^="GPcontrolListPanel-"] .gpf-panel__content > div {
+ display: flex;
+ flex-direction: row;
+ column-gap: 1rem;
+ align-items: center;
+ padding: 0.5rem 0.5rem;
+}
+
+dialog[id^="GPcontrolListPanel-"] .gpf-panel__content > div:hover {
+ background-color: #EEE;
+ cursor: pointer;
+}
+
+dialog[id^="GPcontrolListPanel-"] .gpf-panel__content > div > button:hover {
+ background-color: rgba(0,60,136,0.5);
}
\ No newline at end of file
diff --git a/src/packages/CSS/Controls/ControlList/img/close.png b/src/packages/CSS/Controls/ControlList/img/close.png
new file mode 100644
index 000000000..7bbcb909d
Binary files /dev/null and b/src/packages/CSS/Controls/ControlList/img/close.png differ