From d529c43f97b610e62e0323b1ec1b892eb174dad8 Mon Sep 17 00:00:00 2001 From: Joe Hawes Date: Sat, 11 May 2024 05:34:09 -0700 Subject: [PATCH] Syncing with 1.3.40 --- assets/frontend.css | 81 +++++++------- assets/frontend.css.map | 2 +- assets/frontend.scss | 181 +++++++++++++++---------------- languages/open-user-map.pot | 38 +++---- open-user-map.php | 2 +- readme.txt | 6 +- templates/partial-map-init.php | 16 ++- templates/partial-map-render.php | 97 +++++++++-------- 8 files changed, 219 insertions(+), 204 deletions(-) diff --git a/assets/frontend.css b/assets/frontend.css index 5be84d0..b351737 100644 --- a/assets/frontend.css +++ b/assets/frontend.css @@ -610,37 +610,13 @@ margin-right: 5px; object-fit: contain; } -.open-user-map .box-wrap .map-wrap .oum-attribution { - position: absolute; - bottom: -17px; - right: 13px; - z-index: 999; - background: rgba(255, 255, 255, 0.9); - font-size: 11px; - color: #999; - display: inline-block; - padding: 3px 6px; - margin: 0; - line-height: 1; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.3); - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} -.open-user-map .box-wrap .map-wrap .oum-attribution a { - color: #e02aaf; - text-decoration: none; - display: inline; - line-height: 1; - margin: 0; - padding: 0; -} -.open-user-map .box-wrap .oum-filter-controls { +.open-user-map .box-wrap .map-wrap .oum-filter-controls { position: absolute; z-index: 9999; right: 10px; bottom: 20px; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-toggle { +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-toggle { display: none; background-color: rgba(255, 255, 255, 0.9); background-image: url("images/ico_marker_categories.png"); @@ -655,21 +631,20 @@ position: relative; z-index: 1; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-list { - background: rgba(255, 255, 255, 0.9); - padding: 10px; - border: 2px solid rgba(0, 0, 0, 0.2); +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-list { + background: rgba(255, 255, 255, 0.95); + padding: 6px; + border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 5px; position: absolute; z-index: 2; right: 0; bottom: 0; - width: 130px; display: flex; flex-direction: column; - gap: 10px; + gap: 5px; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-list label { +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-list label { display: flex; align-items: flex-start; gap: 9px; @@ -678,7 +653,7 @@ font-weight: normal; cursor: pointer; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-list label input[type=checkbox] { +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-list label input[type=checkbox] { margin: 0; position: relative; top: 2px; @@ -689,7 +664,7 @@ height: 16px; flex-shrink: 0; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-list label img { +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-list label img { height: 26px; width: 26px; object-fit: contain; @@ -697,20 +672,44 @@ transform: translateY(-10%); flex-shrink: 0; } -.open-user-map .box-wrap .oum-filter-controls .oum-filter-list label span { - font-size: 13px; - hyphens: auto; +.open-user-map .box-wrap .map-wrap .oum-filter-controls .oum-filter-list label span { + font-size: 12px; + white-space: nowrap; } -.open-user-map .box-wrap .oum-filter-controls.use-collapse .oum-filter-toggle { +.open-user-map .box-wrap .map-wrap .oum-filter-controls.use-collapse .oum-filter-toggle { display: block; } -.open-user-map .box-wrap .oum-filter-controls.use-collapse .oum-filter-list { +.open-user-map .box-wrap .map-wrap .oum-filter-controls.use-collapse .oum-filter-list { display: none; background: white; } -.open-user-map .box-wrap .oum-filter-controls.use-collapse:hover .oum-filter-list { +.open-user-map .box-wrap .map-wrap .oum-filter-controls.use-collapse:hover .oum-filter-list { display: flex; } +.open-user-map .box-wrap .map-wrap .oum-attribution { + position: absolute; + bottom: -17px; + right: 13px; + z-index: 999; + background: rgba(255, 255, 255, 0.9); + font-size: 11px; + color: #999; + display: inline-block; + padding: 3px 6px; + margin: 0; + line-height: 1; + box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.3); + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} +.open-user-map .box-wrap .map-wrap .oum-attribution a { + color: #e02aaf; + text-decoration: none; + display: inline; + line-height: 1; + margin: 0; + padding: 0; +} .open-user-map .box-wrap.map-size-fullwidth { width: 100vw; margin-left: 50%; diff --git a/assets/frontend.css.map b/assets/frontend.css.map index 8a60a5c..1c1b802 100644 --- a/assets/frontend.css.map +++ b/assets/frontend.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["frontend.scss"],"names":[],"mappings":"AAAA;EACE;EACA;AAEA;AAiCA;;AAhCA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAYF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;AAMA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAQN;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIA;EACE;;AAEA;EACE;;AAOF;EACE;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE,OArYW;EAsYX;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAON;EACE;EACA;;AAEA;EACE,OA3bS;EA4bT;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;IACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAOV;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAEE;EACA;;AAEA;EACE;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;;AAGA;EACE;EACA;;AAEA;EACE,OA9nBW;EA+nBX;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAOV;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAMJ;EACE;;AAGF;EACE;EACA;;AAIA;EACE;;AAMR;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAMR;EACE;;AAIJ;EACE;IACE;;EAIA;IACE;;EAKF;IACE;;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EAlBF;IAmBI;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;IACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EAdF;IAeI;IACA;;;AAKF;EACE;EACA;EACA;EACA;;AAEA;EANF;IAOI;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;AAAA;AAAA;AAAA;AAAA;EAKE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EANF;IAOI;IACA;;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAKN;EACE;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;IACE;IACA;;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAKE;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AASR;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAKF;EACE;;AAOV;EACE;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAEE;EACA;;AAGF;EA9BF;IA+BI;;;AAKN;EACE;;AAGF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;;AAMR;EACE;;AAKF;EACE;EACA;EACA;;AAEA;EALF;IAMI;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;IACE;IACA;;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAIA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAOV;EACE;EACA;EACA;EACA;EACA;EACA;;AAKA;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAOV;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;IACE;;;;AAOV;AACE;AASA;EAEA;EACA;EACA;;AAZA;EACE;EACA;EACA;EACA;EACA;EACA;;AAQF;EACE;;AAEA;EACE;EACA;EACA;EACA;;;AAKN;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAKN;AAIE;AASA;;AARA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;;;AAKF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EADF;IAEI;;;;AAIJ;EACE","file":"frontend.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["frontend.scss"],"names":[],"mappings":"AAAA;EACE;EACA;AAEA;AAiCA;;AAhCA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAYF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;AAMA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAQN;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIA;EACE;;AAEA;EACE;;AAOF;EACE;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE,OArYW;EAsYX;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAON;EACE;EACA;;AAEA;EACE,OA3bS;EA4bT;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;IACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAOV;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAEE;EACA;;AAEA;EACE;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;;AAGA;EACE;EACA;;AAEA;EACE,OA9nBW;EA+nBX;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAVF;IAWI;;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAOV;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAMJ;EACE;;AAGF;EACE;EACA;;AAIA;EACE;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAMR;EACE;;AAIJ;EACE;IACE;;EAIA;IACE;;EAKF;IACE;;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EAlBF;IAmBI;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;IACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EAdF;IAeI;IACA;;;AAKF;EACE;EACA;EACA;EACA;;AAEA;EANF;IAOI;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;AAAA;AAAA;AAAA;AAAA;EAKE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EANF;IAOI;IACA;;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;;AAKN;EACE;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;IACE;IACA;;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAKE;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AASR;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAKF;EACE;;AAOV;EACE;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAEE;EACA;;AAGF;EA9BF;IA+BI;;;AAKN;EACE;;AAGF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;;AAMR;EACE;;AAKF;EACE;EACA;EACA;;AAEA;EALF;IAMI;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;IACE;IACA;;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAIA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAXF;IAYI;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAOV;EACE;EACA;EACA;EACA;EACA;EACA;;AAKA;EACE;;AAOF;EACE;;AAIF;EACE;;AAMF;EACE;;AAIF;EACE;;AAOV;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;IACE;;;;AAOV;AACE;AASA;EAEA;EACA;EACA;;AAZA;EACE;EACA;EACA;EACA;EACA;EACA;;AAQF;EACE;;AAEA;EACE;EACA;EACA;EACA;;;AAKN;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAKN;AAIE;AASA;;AARA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA;;;AAKF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EADF;IAEI;;;;AAIJ;EACE","file":"frontend.css"} \ No newline at end of file diff --git a/assets/frontend.scss b/assets/frontend.scss index 78fb300..c191c5a 100644 --- a/assets/frontend.scss +++ b/assets/frontend.scss @@ -730,6 +730,96 @@ } } + .oum-filter-controls { + position: absolute; + z-index: 9999; + right: 10px; + bottom: 20px; + + .oum-filter-toggle { + display: none; + background-color: rgba(255, 255, 255, 0.9); + background-image: url('images/ico_marker_categories.png'); + background-position: center center; + background-repeat: no-repeat; + background-size: 60%; + width: 44px; + height: 44px; + border: 2px solid rgba(0,0,0,0.2); + border-radius: 5px; + cursor: pointer; + position: relative; + z-index: 1; + } + + .oum-filter-list { + background: rgba(255, 255, 255, 0.95); + padding: 6px; + border: 1px solid rgba(0,0,0,0.2); + border-radius: 5px; + position: absolute; + z-index: 2; + right: 0; + bottom: 0; + display: flex; + flex-direction: column; + gap: 5px; + + label { + display: flex; + align-items: flex-start; + gap: 9px; + margin: 0; + padding: 0; + font-weight: normal; + cursor: pointer; + + input[type="checkbox"] { + margin: 0; + position: relative; + top: 2px; + appearance: auto; + accent-color: map-get($colors, "primary"); + position: relative; + width: 16px; + height: 16px; + flex-shrink: 0; + } + + img { + height: 26px; + width: 26px; + object-fit: contain; + object-position: top; + transform: translateY(-10%); + flex-shrink: 0; + } + + span { + font-size: 12px; + white-space: nowrap; + } + } + } + + &.use-collapse { + .oum-filter-toggle { + display: block; + } + + .oum-filter-list { + display: none; + background: white; + } + + &:hover { + .oum-filter-list { + display: flex; + } + } + } + } + .oum-attribution { position: absolute; bottom: -17px; @@ -757,97 +847,6 @@ } } - .oum-filter-controls { - position: absolute; - z-index: 9999; - right: 10px; - bottom: 20px; - - .oum-filter-toggle { - display: none; - background-color: rgba(255, 255, 255, 0.9); - background-image: url('images/ico_marker_categories.png'); - background-position: center center; - background-repeat: no-repeat; - background-size: 60%; - width: 44px; - height: 44px; - border: 2px solid rgba(0,0,0,0.2); - border-radius: 5px; - cursor: pointer; - position: relative; - z-index: 1; - } - - .oum-filter-list { - background: rgba(255, 255, 255, 0.9); - padding: 10px; - border: 2px solid rgba(0,0,0,0.2); - border-radius: 5px; - position: absolute; - z-index: 2; - right: 0; - bottom: 0; - width: 130px; - display: flex; - flex-direction: column; - gap: 10px; - - label { - display: flex; - align-items: flex-start; - gap: 9px; - margin: 0; - padding: 0; - font-weight: normal; - cursor: pointer; - - input[type="checkbox"] { - margin: 0; - position: relative; - top: 2px; - appearance: auto; - accent-color: map-get($colors, "primary"); - position: relative; - width: 16px; - height: 16px; - flex-shrink: 0; - } - - img { - height: 26px; - width: 26px; - object-fit: contain; - object-position: top; - transform: translateY(-10%); - flex-shrink: 0; - } - - span { - font-size: 13px; - hyphens: auto; - } - } - } - - &.use-collapse { - .oum-filter-toggle { - display: block; - } - - .oum-filter-list { - display: none; - background: white; - } - - &:hover { - .oum-filter-list { - display: flex; - } - } - } - } - &.map-size-fullwidth { width: 100vw; margin-left: 50%; diff --git a/languages/open-user-map.pot b/languages/open-user-map.pot index d4b67c4..caa5746 100644 --- a/languages/open-user-map.pot +++ b/languages/open-user-map.pot @@ -2,14 +2,14 @@ # This file is distributed under the GPLv3 or later. msgid "" msgstr "" -"Project-Id-Version: Open User Map 1.3.39\n" +"Project-Id-Version: Open User Map 1.3.40\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/open-user-map\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-05-07T22:29:53+00:00\n" +"POT-Creation-Date: 2024-05-08T23:53:47+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.5.0\n" "X-Domain: open-user-map\n" @@ -163,7 +163,7 @@ msgid "Custom Map Position (optional):" msgstr "" #: elementor/includes/widgets/open-user-map-widget.php:268 -#: inc/Base/TaxController.php:251 +#: inc/Base/TaxController.php:277 #: templates/page-backend-add-region.php:30 #: templates/page-backend-edit-region.php:35 #: templates/page-backend-settings.php:419 @@ -287,7 +287,7 @@ msgid "Text" msgstr "" #: inc/Base/LocationController.php:406 -#: inc/Base/TaxController.php:250 +#: inc/Base/TaxController.php:276 msgid "Coordinates" msgstr "" @@ -335,7 +335,7 @@ msgid "Add new Marker Category" msgstr "" #: inc/Base/TaxController.php:63 -#: inc/Base/TaxController.php:143 +#: inc/Base/TaxController.php:169 msgid "New Type name" msgstr "" @@ -363,57 +363,57 @@ msgstr "" msgid "Back to Marker Categories" msgstr "" -#: inc/Base/TaxController.php:135 -#: inc/Base/TaxController.php:137 +#: inc/Base/TaxController.php:161 +#: inc/Base/TaxController.php:163 #: templates/page-backend-settings.php:110 msgid "Regions" msgstr "" -#: inc/Base/TaxController.php:136 +#: inc/Base/TaxController.php:162 msgid "Region" msgstr "" -#: inc/Base/TaxController.php:138 +#: inc/Base/TaxController.php:164 msgid "All Regions" msgstr "" -#: inc/Base/TaxController.php:139 +#: inc/Base/TaxController.php:165 msgid "Edit Region" msgstr "" -#: inc/Base/TaxController.php:140 +#: inc/Base/TaxController.php:166 msgid "Show Region" msgstr "" -#: inc/Base/TaxController.php:141 +#: inc/Base/TaxController.php:167 msgid "Update Region" msgstr "" -#: inc/Base/TaxController.php:142 +#: inc/Base/TaxController.php:168 msgid "Add new Region" msgstr "" -#: inc/Base/TaxController.php:144 +#: inc/Base/TaxController.php:170 msgid "Search Regions" msgstr "" -#: inc/Base/TaxController.php:145 +#: inc/Base/TaxController.php:171 msgid "Choose from the most used Regions" msgstr "" -#: inc/Base/TaxController.php:146 +#: inc/Base/TaxController.php:172 msgid "Popular Regions" msgstr "" -#: inc/Base/TaxController.php:147 +#: inc/Base/TaxController.php:173 msgid "Add or remove Regions" msgstr "" -#: inc/Base/TaxController.php:148 +#: inc/Base/TaxController.php:174 msgid "Separate Regions with commas" msgstr "" -#: inc/Base/TaxController.php:149 +#: inc/Base/TaxController.php:175 msgid "Back to Regions" msgstr "" diff --git a/open-user-map.php b/open-user-map.php index 8e11d7f..d58f2e6 100644 --- a/open-user-map.php +++ b/open-user-map.php @@ -8,7 +8,7 @@ Plugin URI: https://wordpress.org/plugins/open-user-map/ Description: Create a customizable, simple or interactive map. Anyone can add new markers without registering — perfect for collaborative and community projects. Author: 100plugins -Version: 1.3.39 +Version: 1.3.40 Author URI: https://www.open-user-map.com/ License: GPLv3 or later Text Domain: open-user-map diff --git a/readme.txt b/readme.txt index f264168..e2af2d2 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: map, interactive map, leaflet, mapbox, regions Requires at least: 5.5 Tested up to: 6.5 Requires PHP: 7.0 -Stable tag: 1.3.39 +Stable tag: 1.3.40 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -271,6 +271,10 @@ Please do so! You can use the support forum to let us know about your ideas help 7. More than 60 Settings to customize == Changelog == += 1.3.40 = +* Bugfix: Marker Category Icons +* Improve Marker Category Box styling + = 1.3.39 = * 🎉 Feature Request: Marker Categories can now be multi-select (adjust in the settings) * Dynamic Marker Icon size diff --git a/templates/partial-map-init.php b/templates/partial-map-init.php index db54814..4931bba 100644 --- a/templates/partial-map-init.php +++ b/templates/partial-map-init.php @@ -219,14 +219,20 @@ 'lng' => $location_meta['lng'], ); if ( isset( $location_types ) && is_array( $location_types ) && count( $location_types ) == 1 && !get_option( 'oum_enable_multiple_marker_types' ) ) { - //get current location icon from oum-type taxonomy $type = $location_types[0]; - $current_marker_icon = ( get_term_meta( $type->term_id, 'oum_marker_icon', true ) ? get_term_meta( $type->term_id, 'oum_marker_icon', true ) : 'default' ); - $current_marker_user_icon = get_term_meta( $type->term_id, 'oum_marker_user_icon', true ); + if ( $type->term_id && get_term_meta( $type->term_id, 'oum_marker_icon', true ) ) { + //get current location icon from oum-type taxonomy + $current_marker_icon = get_term_meta( $type->term_id, 'oum_marker_icon', true ); + $current_marker_user_icon = get_term_meta( $type->term_id, 'oum_marker_user_icon', true ); + } else { + //get current location icon from settings + $current_marker_icon = $marker_icon; + $current_marker_user_icon = $marker_user_icon; + } } else { //get current location icon from settings - $current_marker_icon = ( get_option( 'oum_marker_icon' ) ? get_option( 'oum_marker_icon' ) : 'default' ); - $current_marker_user_icon = get_option( 'oum_marker_user_icon' ); + $current_marker_icon = $marker_icon; + $current_marker_user_icon = $marker_user_icon; } if ( $current_marker_icon == 'user1' && $current_marker_user_icon ) { $icon = esc_url( $current_marker_user_icon ); diff --git a/templates/partial-map-render.php b/templates/partial-map-render.php index f6bbc5c..f044aeb 100644 --- a/templates/partial-map-render.php +++ b/templates/partial-map-render.php @@ -206,6 +206,58 @@ + + +
+
+
+ + + term_id && get_term_meta( $type->term_id, 'oum_marker_icon', true ) ) { + //get type marker icon from oum-type taxonomy + $type_marker_icon = get_term_meta( $type->term_id, 'oum_marker_icon', true ); + $type_marker_user_icon = get_term_meta( $type->term_id, 'oum_marker_user_icon', true ); + } else { + //get type marker icon from settings + $type_marker_icon = $marker_icon; + $type_marker_user_icon = $marker_user_icon; + } + if ( $type_marker_icon == 'user1' && $type_marker_user_icon ) { + $icon = esc_url( $type_marker_user_icon ); + } else { + $icon = esc_url( $this->plugin_url ) . 'src/leaflet/images/marker-icon_' . esc_attr( $type_marker_icon ) . '-2x.png'; + } + ?> + + + + +
+
+ - -
-
-
- - - term_id, 'oum_marker_icon', true ) ? get_term_meta( $type->term_id, 'oum_marker_icon', true ) : 'default' ); - $current_marker_user_icon = get_term_meta( $type->term_id, 'oum_marker_user_icon', true ); - if ( $current_marker_icon == 'user1' && $current_marker_user_icon ) { - $icon = esc_url( $current_marker_user_icon ); - } else { - $icon = esc_url( $this->plugin_url ) . 'src/leaflet/images/marker-icon_' . esc_attr( $current_marker_icon ) . '-2x.png'; - } - ?> - - - - -
-
- - \ No newline at end of file