Skip to content

Commit b144456

Browse files
author
Joe Hawes
committed
v0.9.30
commit b1a30f2 Author: Joe Hawes <> Date: Sun Dec 17 13:53:32 2023 -0800 Updated readme commit a4b0e78 Author: Joe Hawes <> Date: Sun Dec 17 13:18:53 2023 -0800 Gallery and Clustering working commit ab6c9fa Author: Joe Hawes <> Date: Sun Dec 17 09:56:21 2023 -0800 No Collection Shortcode Header on Collection page commit 0fa21f3 Author: Joe Hawes <> Date: Sun Dec 17 09:06:26 2023 -0800 Collection rendering improvements commit 90fc936 Merge: 98d6c16 7d1d2e8 Author: Joe Hawes <> Date: Sun Dec 17 07:45:14 2023 -0800 Merge branch '0_9_30_staging' of https://github.com/morehawes/waymark into 0_9_30_staging # Conflicts: # assets/dist/waymark-js/js/waymark-js.js # assets/dist/waymark-js/js/waymark-js.min.js # waymark-js/dist/js/waymark-js.js # waymark-js/dist/js/waymark-js.min.js # waymark-js/src/js/Waymark_Map_Viewer.js commit 7d1d2e8 Author: Joe Hawes <[email protected]> Date: Sat Dec 16 17:12:21 2023 -0800 Remove markercluster css commit 1e00419 Author: Joe Hawes <[email protected]> Date: Sat Dec 16 17:08:16 2023 -0800 Merge Clustering commit 866d551 Author: Joe Hawes <[email protected]> Date: Sat Dec 16 16:59:18 2023 -0800 Update version number commit 73c43a3 Author: Joe Hawes <[email protected]> Date: Sat Dec 16 16:37:06 2023 -0800 Don't animate clustering commit 19d39ac Author: Joe Hawes <> Date: Sat Dec 16 15:36:47 2023 -0800 Clustering working well. commit 0f743bc Author: Joe Hawes <> Date: Sat Dec 16 14:42:33 2023 -0800 3 commit 16daef8 Author: Joe Hawes <> Date: Sat Dec 16 13:51:50 2023 -0800 Settings & Shortcode option working commit 9faa62c Author: Joe Hawes <> Date: Sat Dec 16 13:15:58 2023 -0800 2 commit 9e887df Author: Joe Hawes <> Date: Sat Dec 16 12:04:13 2023 -0800 Clustering basics commit bee1ebb Author: Joe Hawes <> Date: Sat Dec 16 11:37:57 2023 -0800 Clustering Groups working(!) commit 4aa6450 Merge: 0554f6f 08de758 Author: Joe Hawes <> Date: Sat Dec 16 09:47:58 2023 -0800 Merge branch '0_9_30_staging' into cluster # Conflicts: # assets/dist/waymark-js/js/waymark-js.js # assets/dist/waymark-js/js/waymark-js.min.js # languages/waymark.pot # waymark-js/dist/js/waymark-js.js # waymark-js/dist/js/waymark-js.min.js # waymark-js/src/js/Waymark_Map.js # waymark-js/src/js/Waymark_Map_Viewer.js commit 08de758 Author: Joe Hawes <> Date: Sat Dec 16 09:44:22 2023 -0800 Prettier commit 0554f6f Merge: 09b0bdb 6e4f240 Author: Joe Hawes <> Date: Thu Nov 2 06:01:17 2023 -0700 Merge branch 'cluster_merge' into cluster commit 6e4f240 Author: Joe Hawes <> Date: Wed Nov 1 12:04:39 2023 -0700 Only show count if more than "1". commit 00e228a Merge: 09b0bdb a6c5ed0 Author: Joe Hawes <> Date: Wed Nov 1 10:51:45 2023 -0700 Merge branch 'master' into cluster_merge # Conflicts: # assets/dist/waymark-js/js/waymark-js.min.js # languages/waymark.pot # waymark-js/dist/js/waymark-js.min.js commit 09b0bdb Author: Joe Hawes <> Date: Mon Sep 11 14:58:44 2023 -0700 Code organising commit 64460d6 Author: Joe Hawes <> Date: Mon Sep 11 13:53:42 2023 -0700 Minor tweaks commit 03e87d8 Author: Joe Hawes <> Date: Mon Sep 11 12:47:05 2023 -0700 Improvements commit 0f0b078 Author: Joe Hawes <> Date: Mon Sep 11 11:02:35 2023 -0700 HTML & CSS structure commit a36b158 Author: Joe Hawes <> Date: Mon Sep 11 10:46:40 2023 -0700 HTML working commit bd87fd6 Author: Joe Hawes <> Date: Mon Sep 11 09:59:26 2023 -0700 Restructure using Map commit 2c750d8 Merge: 1e64fa9 e596657 Author: Joe Hawes <> Date: Mon Sep 11 07:24:07 2023 -0700 Merge branch 'master' into cluster # Conflicts: # assets/dist/waymark-js/js/waymark-js.min.js # languages/waymark.pot # waymark-js/dist/js/waymark-js.min.js commit 1e64fa9 Author: Joe Hawes <> Date: Mon Jun 12 18:13:45 2023 -0700 3 - Basic counts commit af20fca Author: Joe Hawes <> Date: Mon Jun 12 17:44:27 2023 -0700 2 commit 2630367 Author: Joe Hawes <> Date: Mon Jun 12 15:50:37 2023 -0700 1 - Basics commit 98d6c16 Author: Joe Hawes <> Date: Sat Dec 16 14:43:16 2023 -0800 Shortcode header CSS fix commit 08de758 Author: Joe Hawes <> Date: Sat Dec 16 09:44:22 2023 -0800 Prettier commit 4bcb113 Author: Joe Hawes <[email protected]> Date: Fri Dec 15 18:03:13 2023 -0800 Stop elevation plugin from adjusting map bounds commit c8c5a22 Merge: b2f8357 3416af1 Author: Joe Hawes <[email protected]> Date: Fri Dec 15 17:59:35 2023 -0800 Merge branch '0_9_30_staging' of github.com:morehawes/waymark into 0_9_30_staging commit b2f8357 Author: Joe Hawes <[email protected]> Date: Fri Dec 15 13:55:23 2023 -0800 Shortcode header self clear commit 3416af1 Author: Joe Hawes <> Date: Fri Dec 15 11:07:52 2023 -0800 Improved KML error handling commit fb1a3a0 Author: Joe Hawes <> Date: Thu Dec 14 11:55:10 2023 -0800 Minor PHP deprecation fix commit 9a5c131 Author: Joe Hawes <> Date: Thu Dec 14 11:52:33 2023 -0800 File Start/End Line Types commit 0a53d2a6868621a7c1ac86120a5911b40f731a6d Author: Joe Hawes <> Date: Thu Dec 14 11:50:42 2023 -0800 File Start/End Line Types commit 12aef82c621fef004931eb11eb43b031d192388f Author: Joe Hawes <> Date: Thu Dec 14 10:51:20 2023 -0800 3 commit bc6f24712c3834a34b8d272e91794160c4467786 Author: Joe Hawes <> Date: Thu Dec 14 10:16:49 2023 -0800 2 commit 3db9840 Author: Joe Hawes <[email protected]> Date: Thu Dec 14 08:29:22 2023 -0800 1
1 parent f5239cd commit b144456

32 files changed

+9930
-7777
lines changed

‎Waymark.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<?php
2-
2+
33
/*
44
Plugin Name: Waymark
55
Plugin URI: https://www.waymark.dev/
66
Description: Mapping with WordPress made easy. With Waymark enabled, click on the "Maps" link in the sidebar to create and edit Maps. Once you are happy with your Map, copy the Waymark shortcode and add it to your content.
7-
Version: 0.9.29.5
7+
Version: 0.9.30
88
Text Domain: waymark
99
Author: Joe Hawes
1010
Author URI: https://www.morehawes.co.uk/
1111
License: GPLv2
12-
*/
12+
*/
1313

1414
//Base
15-
require_once('inc/Waymark_Config.php');
16-
require_once('inc/Waymark_Types.php');
17-
require_once('inc/Waymark_Taxonomies.php');
18-
require_once('inc/Waymark_Install.php');
15+
require_once 'inc/Waymark_Config.php';
16+
require_once 'inc/Waymark_Types.php';
17+
require_once 'inc/Waymark_Taxonomies.php';
18+
require_once 'inc/Waymark_Install.php';
1919

2020
//Objects
21-
require_once('inc/Objects/Waymark_Map.php');
22-
require_once('inc/Objects/Waymark_Collection.php');
21+
require_once 'inc/Objects/Waymark_Map.php';
22+
require_once 'inc/Objects/Waymark_Collection.php';
2323

2424
//Helpers
25-
require_once('inc/Helpers/Waymark_Helper.php');
26-
require_once('inc/Helpers/Waymark_Input.php');
27-
require_once('inc/Helpers/Waymark_GeoJSON.php');
28-
require_once('inc/Helpers/Waymark_Lang.php');
25+
require_once 'inc/Helpers/Waymark_Helper.php';
26+
require_once 'inc/Helpers/Waymark_Input.php';
27+
require_once 'inc/Helpers/Waymark_GeoJSON.php';
28+
require_once 'inc/Helpers/Waymark_Lang.php';
2929

3030
//Front
31-
require_once('inc/Waymark_Front.php');
31+
require_once 'inc/Waymark_Front.php';
3232

3333
//Admin
34-
require_once('inc/Waymark_Admin.php');
34+
require_once 'inc/Waymark_Admin.php';

‎assets/css/admin.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ div.waymark-accordion-container .waymark-accordion-group .waymark-parameter-grou
110110
display: none !important;
111111
}
112112
.waymark-icon {
113-
background-image: url('../img/waymark-icon-primary.png');
113+
background-image: url("../img/waymark-icon-primary.png");
114114
background-size: 20px 20px;
115115
background-position: left center;
116116
background-repeat: no-repeat;
@@ -148,7 +148,7 @@ div.postbox#waymark_map_shortcode h2.hndle span,
148148
div.postbox#waymark_map_export h2.hndle span,
149149
div.postbox#waymark_map_help h2.hndle span {
150150
padding-left: 24px;
151-
background-image: url('../img/waymark-icon-dark.png');
151+
background-image: url("../img/waymark-icon-dark.png");
152152
background-size: 20px 20px;
153153
background-position: left center;
154154
background-repeat: no-repeat;
@@ -306,17 +306,17 @@ li#toplevel_page_edit-post_type-waymark_map li.hidden {
306306
}
307307
li#toplevel_page_edit-post_type-waymark_map .wp-menu-image {
308308
height: 34px !important;
309-
background-image: url('../img/waymark-icon-light.png');
309+
background-image: url("../img/waymark-icon-light.png");
310310
background-size: 18px 18px;
311311
background-position: center center;
312312
background-repeat: no-repeat;
313313
}
314314
li#toplevel_page_edit-post_type-waymark_map:hover .wp-menu-image {
315-
background-image: url('../img/waymark-icon-white.png');
315+
background-image: url("../img/waymark-icon-white.png");
316316
}
317317
li#toplevel_page_edit-post_type-waymark_map.wp-has-current-submenu .wp-menu-image,
318318
li#toplevel_page_edit-post_type-waymark_map.wp-menu-open .wp-menu-image {
319-
background-image: url('../img/waymark-icon-white.png');
319+
background-image: url("../img/waymark-icon-white.png");
320320
}
321321
/* Shortcode UI */
322322
div#waymark_shortcode_ui-insert-dialog div.waymark-parameters-container {
@@ -358,7 +358,7 @@ body.waymark_page_waymark-settings div#waymark-settings-nav {
358358
height: 35px;
359359
margin-bottom: 5px;
360360
padding-left: 45px;
361-
background-image: url('../img/waymark-icon-primary.png');
361+
background-image: url("../img/waymark-icon-primary.png");
362362
background-size: 35px 35px;
363363
background-position: center left;
364364
background-repeat: no-repeat;
@@ -535,7 +535,7 @@ div#waymark-admin-container.waymark-top p.lead small {
535535
div#waymark-admin-container h1 {
536536
padding-bottom: 9px;
537537
padding-left: 34px;
538-
background-image: url('../img/waymark-icon-primary.png');
538+
background-image: url("../img/waymark-icon-primary.png");
539539
background-size: 30px 30px;
540540
background-position: left center;
541541
background-repeat: no-repeat;
@@ -609,7 +609,7 @@ div#waymark-admin-container .waymark-settings-tab input[type="text"] {
609609
width: 200px;
610610
border-style: solid;
611611
border-width: 1px;
612-
border-color: #DDDDDD;
612+
border-color: #dddddd;
613613
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07) inset;
614614
}
615615
div#waymark-admin-container .waymark-settings-tab .waymark-short-input select,
@@ -688,7 +688,7 @@ body.post-type-waymark_map.edit-php div#waymark-admin-container ol {
688688
}
689689
/* Shortcode */
690690
i.mce-i-waymark-shortcode-icon {
691-
background-image: url('../img/waymark-editor-icon.png');
691+
background-image: url("../img/waymark-editor-icon.png");
692692
background-position: center center;
693693
background-repeat: no-repeat;
694694
background-size: 20px 20px;
@@ -708,7 +708,7 @@ body.wp-admin {
708708
}
709709
*/
710710
#waymark_shortcode_ui-insert-dialog-dragh {
711-
background-image: url('../img/waymark-icon-primary.png');
711+
background-image: url("../img/waymark-icon-primary.png");
712712
background-size: 24px 24px;
713713
background-position: center center;
714714
background-repeat: no-repeat;

‎assets/css/front.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ div.waymark-accordion-container .waymark-accordion-group .waymark-parameter-grou
9292

9393
/**
9494
* ====================================
95-
* ============= SHORTCODE ============
95+
* ============= SHORTCODE ============
9696
* ====================================
9797
*/
9898
.waymark-shortcode {
@@ -103,6 +103,7 @@ div.waymark-accordion-container .waymark-accordion-group .waymark-parameter-grou
103103
.waymark-shortcode .waymark-header {
104104
position: relative;
105105
padding: 10px;
106+
min-height: 26px;
106107
background: #f7f7f7;
107108
border-bottom: 1px solid #ccc;
108109
}

‎assets/css/front.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/dist/waymark-js/css/waymark-js.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,20 @@
920920
background-repeat: no-repeat;
921921
background-position: left center;
922922
}
923+
.waymark-map-container.waymark-is-viewer.waymark-has-cluster .waymark-cluster .waymark-marker {
924+
position: absolute;
925+
}
926+
.waymark-map-container.waymark-is-viewer.waymark-has-cluster .waymark-cluster .waymark-marker .waymark-cluster-count {
927+
position: absolute;
928+
top: -3px;
929+
right: -3px;
930+
padding: 1px 3px;
931+
font-size: 8px;
932+
color: black;
933+
border: 1px solid #333;
934+
border-radius: 3px;
935+
background: rgba(255, 255, 255, 0.7);
936+
}
923937

924938
/*
925939
==================================

‎assets/dist/waymark-js/css/waymark-js.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/dist/waymark-js/js/waymark-js.js

Lines changed: 2576 additions & 1975 deletions
Large diffs are not rendered by default.

‎assets/dist/waymark-js/js/waymark-js.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)