Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding min zoom and max zoom to shortcode #459

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Adding min zoom and max zoom to shortcode #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ca96c
adding min_zoom and max_zoom atts
otrok7 Jan 14, 2024
6e9c0d2
version bump and replace map button
otrok7 Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crouton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)) {
Expand Down
6 changes: 5 additions & 1 deletion croutonjs/meetingMap/meeting_map.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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'].'",';
}
Expand Down
8 changes: 4 additions & 4 deletions croutonjs/src/js/crouton-default-templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ var croutonDefaultTemplates = {
"{{#isNotTemporarilyClosed this}}",
" {{#unless (hasFormats 'VM' this)}}",
" <div>",
" <a id='map-button' class='btn btn-primary btn-xs'",
" href='https://www.google.com/maps/search/?api=1&query={{this.latitude}},{{this.longitude}}&q={{this.latitude}},{{this.longitude}}'",
" target='_blank' rel='noopener noreferrer'>",
" <span class='glyphicon glyphicon-map-marker'></span> {{this.map_word}}</a>",
" <a onclick='crouton.meetingModal({{this.id_bigint}})' id='map-button' class='btn btn-primary btn-xs'>",
" <span class='glyphicon glyphicon-search' aria-hidden='true'></span>",
" {{getWord 'meeting details'}}",
" </a>",
" </div>",
" <div class='geo hide'>{{this.latitude}},{{this.longitude}}</div>",
" {{/unless}}",
Expand Down
6 changes: 5 additions & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down