WordPress.org

Plugin Directory

Changeset 1656176


Ignore:
Timestamp:
05/12/17 20:34:05 (2 weeks ago)
Author:
netweblogic
Message:

(dev) 5.6.9

Location:
events-manager/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • events-manager/trunk/admin/settings/tabs/formats.php

    r1651260 r1656176  
    446446                <?php em_options_input_text(__('Default map width','events-manager'), 'dbem_map_default_width', sprintf(__('Can be in form of pixels or a percentage such as %s or %s.', 'events-manager'), '<code>100%</code>', '<code>100px</code>')); ?> 
    447447                <?php em_options_input_text(__('Default map height','events-manager'), 'dbem_map_default_height', sprintf(__('Can be in form of pixels or a percentage such as %s or %s.', 'events-manager'), '<code>100%</code>', '<code>100px</code>')); ?> 
     448                <?php em_options_textarea(__('Google Maps Style', 'events-manager'), 'dbem_google_maps_styles', sprintf(__('You can add styles to your maps to give them a unique look. Build one using the %s or choose from the many free templates on %s paste the generated JSON code here.', 'events-manager'), '<a href="https://snazzymaps.com/explore" target="_blank">'.__('Google Maps Styling Wizard', 'events-manager').'</a>', '<a href="https://snazzymaps.com/explore" target="_blank">Snazzy Maps</a>')); ?> 
    448449            </tr> 
    449450            <tr class="em-header"><td colspan="2"> 
  • events-manager/trunk/events-manager.php

    r1655537 r1656176  
    22/* 
    33Plugin Name: Events Manager 
    4 Version: 5.6.8 
     4Version: 5.6.9 
    55Plugin URI: http://wp-events-plugin.com 
    66Description: Event registration and booking management for WordPress. Recurring events, locations, google maps, rss, ical, booking registration and more! 
     
    321321        ); 
    322322        //maps api key 
    323         if( get_option('dbem_gmap_is_active') && get_option('dbem_google_maps_browser_key') ){ 
    324             $em_localized_js['google_maps_api'] = get_option('dbem_google_maps_browser_key'); 
     323        if( get_option('dbem_gmap_is_active') ){ 
     324            if( get_option('dbem_google_maps_browser_key') ){ 
     325                $em_localized_js['google_maps_api'] = get_option('dbem_google_maps_browser_key'); 
     326            } 
     327            if( get_option('dbem_google_maps_styles') ){ 
     328                $em_localized_js['google_maps_styles'] = json_decode(get_option('dbem_google_maps_styles')); 
     329            } 
    325330        } 
    326331        //debug mode 
  • events-manager/trunk/includes/js/events-manager.js

    r1651260 r1656176  
    880880            //define default options and allow option for extension via event triggers 
    881881              var map_options = { mapTypeId: google.maps.MapTypeId.ROADMAP }; 
     882              if( typeof EM.google_maps_styles !== 'undefined' ){ map_options.styles = EM.google_maps_styles; } 
    882883              jQuery(document).triggerHandler('em_maps_locations_map_options', map_options); 
    883884              var marker_options = {}; 
     
    932933        scrollwheel: is_touch 
    933934    }; 
     935    if( typeof EM.google_maps_styles !== 'undefined' ){ map_options.styles = EM.google_maps_styles; }  
    934936    jQuery(document).triggerHandler('em_maps_location_map_options', map_options); 
    935937    maps[map_id] = new google.maps.Map( document.getElementById('em-location-map-'+map_id), map_options); 
  • events-manager/trunk/readme.txt

    r1655537 r1656176  
    100100 
    101101== Changelog == 
    102 = 5.6.8 (dev) = 
     102= 5.6.9 (dev) = 
    103103* added em_events_admin_args filter allowing modification of event search arguments 
    104104* removed jQuery UI localize files for the datepicker in favor of WP 4.6 native localization 
     
    165165* fixed ticket availability status indicator showing false to admins when ticket is restricted to guests 
    166166* added get_total_paid function (mainly for hooking purposes in Pro add-ons) 
     167* added support for Google Maps styles via services like the Google Maps Style Wizard or Snazzy Maps  
    167168 
    168169= 5.6.6.1 = 
Note: See TracChangeset for help on using the changeset viewer.