From 20ca96c78efacb9ef91de15ce23c7e1467d17b66 Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Sun, 14 Jan 2024 09:46:36 +0100 Subject: [PATCH 1/2] adding min_zoom and max_zoom atts --- croutonjs/meetingMap/meeting_map.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/croutonjs/meetingMap/meeting_map.php b/croutonjs/meetingMap/meeting_map.php index a7e1121..a6cee1b 100644 --- a/croutonjs/meetingMap/meeting_map.php +++ b/croutonjs/meetingMap/meeting_map.php @@ -33,7 +33,9 @@ class Controller 'map_search_coordinate_search' => '', 'map_search_zoom' => '', 'center_me' => '', - 'goto' => '' + 'goto' => '', + 'min_zoom' => '6', + 'max_zoom' => '17' ); public $options = array(); @@ -210,6 +212,8 @@ private function createJavascriptConfig($options) $ret .= 'lat:"'.$options['lat'].'",'; $ret .= 'lng:"'.$options['lng'].'",'; $ret .= 'zoom:"'.$options['zoom'].'",'; + $ret .= 'minZoom:"'.$options['min_zoom'].'",'; + $ret .= 'maxZoom:"'.$options['max_zoom'].'",'; if (!empty($options['center_me'])) { $ret .= 'centerMe:"'.$options['center_me'].'",'; } From 6e9c0d2ea8a2d39d7be36ae573edfdac86293b99 Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:52:13 +0100 Subject: [PATCH 2/2] version bump and replace map button --- crouton.php | 2 +- croutonjs/src/js/crouton-default-templates.js | 8 ++++---- readme.txt | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/crouton.php b/crouton.php index ef342a3..078e31a 100644 --- a/crouton.php +++ b/crouton.php @@ -5,7 +5,7 @@ Description: A tabbed based display for showing meeting information. Author: bmlt-enabled Author URI: https://bmlt.app -Version: 3.18.2 +Version: 3.18.3 */ /* Disallow direct access to the plugin file */ if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) { diff --git a/croutonjs/src/js/crouton-default-templates.js b/croutonjs/src/js/crouton-default-templates.js index abcb38e..5404364 100644 --- a/croutonjs/src/js/crouton-default-templates.js +++ b/croutonjs/src/js/crouton-default-templates.js @@ -36,10 +36,10 @@ var croutonDefaultTemplates = { "{{#isNotTemporarilyClosed this}}", " {{#unless (hasFormats 'VM' this)}}", "
", - " ", - " {{this.map_word}}", + " ", + " ", + " {{getWord 'meeting details'}}", + " ", "
", "
{{this.latitude}},{{this.longitude}}
", " {{/unless}}", diff --git a/readme.txt b/readme.txt index cb224d7..3e77e94 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, b Requires at least: 4.0 Required PHP: 8.0 Tested up to: 6.4.2 -Stable tag: 3.18.2 +Stable tag: 3.18.3 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html crouton implements a Tabbed UI for BMLT. @@ -36,6 +36,10 @@ https://demo.bmlt.app/crouton == Changelog == += 3.18.3 = +* Added min_zoom and max_zoom to the shortcode. +* Changed default template to bring up meeting details rather than going directly to google. + = 3.18.2 = * Bug fix release