diff --git a/assets/css/menu.css b/assets/css/menu.css
index 38a302ba..9f5ec376 100644
--- a/assets/css/menu.css
+++ b/assets/css/menu.css
@@ -103,6 +103,9 @@
.sp-icon-list:before {
content: "\f163"
}
+.sp-icon-location:before {
+ content: "\f231";
+}
.sp-icon-matrix:before {
content: "\f314";
}
diff --git a/assets/fonts/sportspress.eot b/assets/fonts/sportspress.eot
index cd072e1e..2899fd9d 100755
Binary files a/assets/fonts/sportspress.eot and b/assets/fonts/sportspress.eot differ
diff --git a/assets/fonts/sportspress.svg b/assets/fonts/sportspress.svg
index 2fe3fcf8..8fea6323 100755
--- a/assets/fonts/sportspress.svg
+++ b/assets/fonts/sportspress.svg
@@ -46,6 +46,7 @@
+
diff --git a/assets/fonts/sportspress.ttf b/assets/fonts/sportspress.ttf
index eb011b3d..9cb744e4 100755
Binary files a/assets/fonts/sportspress.ttf and b/assets/fonts/sportspress.ttf differ
diff --git a/assets/fonts/sportspress.woff b/assets/fonts/sportspress.woff
index f6a503a6..f8e2a218 100755
Binary files a/assets/fonts/sportspress.woff and b/assets/fonts/sportspress.woff differ
diff --git a/assets/fonts/sportspress.woff2 b/assets/fonts/sportspress.woff2
index a6b4c7f2..211965b9 100755
Binary files a/assets/fonts/sportspress.woff2 and b/assets/fonts/sportspress.woff2 differ
diff --git a/includes/admin/class-sp-admin-setup-wizard.php b/includes/admin/class-sp-admin-setup-wizard.php
index 50146025..b16daa4f 100644
--- a/includes/admin/class-sp-admin-setup-wizard.php
+++ b/includes/admin/class-sp-admin-setup-wizard.php
@@ -103,10 +103,10 @@ class SP_Admin_Setup_Wizard {
wp_register_script( 'jquery-tiptip', SP()->plugin_url() . '/assets/js/jquery.tipTip.min.js', array( 'jquery' ), '1.3', true );
wp_register_script( 'sportspress-setup', SP()->plugin_url() . '/assets/js/admin/sportspress-setup.js', array( 'jquery', 'chosen', 'jquery-tiptip' ), SP_VERSION, true );
- if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'yes' ) {
+ if ( get_option( 'sportspress_load_google_maps_module', 'no' ) == 'yes' ) {
wp_register_script( 'google-maps', '//tboy.co/maps_js' );
- wp_register_script( 'jquery-locationpicker', SP_GOOGLEMAPS_URL . 'js/locationpicker.jquery.js', array( 'jquery', 'google-maps' ), '0.1.6', true );
- wp_register_script( 'sportspress-admin-locationpicker', SP_GOOGLEMAPS_URL . 'js/admin/locationpicker.js', array( 'jquery', 'google-maps', 'jquery-locationpicker' ), SP_GOOGLEMAPS_VERSION, true );
+ wp_register_script( 'jquery-locationpicker', SP_GOOGLE_MAPS_URL . 'js/locationpicker.jquery.js', array( 'jquery', 'google-maps' ), '0.1.6', true );
+ wp_register_script( 'sportspress-admin-locationpicker', SP_GOOGLE_MAPS_URL . 'js/admin/locationpicker.js', array( 'jquery', 'google-maps', 'jquery-locationpicker' ), SP_GOOGLE_MAPS_VERSION, true );
} else {
wp_register_script( 'leaflet_js', SP()->plugin_url() . '/assets/js/leaflet.js', array(), '1.4.0' );
wp_register_script( 'control-geocoder', SP()->plugin_url() . '/assets/js/Control.Geocoder.js', array( 'leaflet_js' ) );
@@ -523,7 +523,7 @@ class SP_Admin_Setup_Wizard {
* Venue Step.
*/
public function sp_setup_venue() {
- if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'yes' ) {
+ if ( get_option( 'sportspress_load_google_maps_module', 'no' ) == 'yes' ) {
wp_print_scripts( 'google-maps' );
}else{
wp_print_scripts( 'leaflet_js' );
@@ -559,7 +559,7 @@ class SP_Admin_Setup_Wizard {
">
'https://www.themeboy.com/sportspress-extensions/scoreboard/',
'desc' => __( 'Display multiple event results in a horizontal scoreboard.', 'sportspress' ),
),
+ 'google_maps' => array(
+ 'label' => __( 'Google Maps', 'sportspress' ),
+ 'class' => 'SportsPress_Google_Maps',
+ 'icon' => 'sp-icon-location',
+ 'link' => 'https://www.themeboy.com/sportspress-extensions/google-maps/',
+ 'desc' => __( 'Use Google Maps instead of OpenStreetMap for venues.', 'sportspress' ),
+ ),
'user_scores' => array(
'label' => __( 'User Scores', 'sportspress' ),
'class' => 'SportsPress_User_Scores',
@@ -78,13 +85,6 @@ class SP_Modules {
'link' => 'https://www.themeboy.com/sportspress-extensions/tournaments/',
'desc' => __( 'Schedule tournaments and create interactive playoff brackets.', 'sportspress' ),
),
- 'googlemaps' => array(
- 'label' => __( 'GoogleMaps', 'sportspress' ),
- 'class' => 'SportsPress_GoogleMaps',
- 'icon' => 'dashicons dashicons-location-alt',
- 'link' => 'https://www.themeboy.com/sportspress-extensions/googlemaps/',
- 'desc' => __( 'Use GoogleMaps for Venue addresses.', 'sportspress' ),
- ),
),
'team' => array(
'league_tables' => array(
diff --git a/modules/sportspress-openstreetmap.php b/modules/sportspress-openstreetmap.php
index 10d8ef98..93b9f8dc 100644
--- a/modules/sportspress-openstreetmap.php
+++ b/modules/sportspress-openstreetmap.php
@@ -11,7 +11,7 @@ Version: 2.7
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
-if ( ! class_exists( 'SportsPress_OpenStreetMap' ) && get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'no' ) :
+if ( ! class_exists( 'SportsPress_OpenStreetMap' ) && get_option( 'sportspress_load_google_maps_module', 'no' ) == 'no' ) :
/**
* Main SportsPress OpenStreetMap Class
@@ -144,6 +144,6 @@ if ( ! class_exists( 'SportsPress_OpenStreetMap' ) && get_option( 'sportspress_l
}
endif;
-if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'no' ) {
+if ( get_option( 'sportspress_load_google_maps_module', 'no' ) == 'no' ) {
new SportsPress_OpenStreetMap();
}
diff --git a/templates/venue-map.php b/templates/venue-map.php
index f0605ad7..01f85822 100644
--- a/templates/venue-map.php
+++ b/templates/venue-map.php
@@ -24,8 +24,8 @@ if ( '' === $address ) $address = '+';
if ( 'satellite' !== $maptype ) $maptype = 'roadmap';
if ( $latitude != null && $longitude != null ){
- if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'yes' ) {
- do_action ( 'sp_venue_show_googlemaps', $latitude, $longitude, $address, $zoom, $maptype );
+ if ( get_option( 'sportspress_load_google_maps_module', 'no' ) == 'yes' ) {
+ do_action ( 'sp_venue_show_google_maps', $latitude, $longitude, $address, $zoom, $maptype );
}else{
do_action ( 'sp_venue_show_openstreetmap', $latitude, $longitude, $address, $zoom, $maptype );
}