Skip to content

Commit

Permalink
Updating version and readmes
Browse files Browse the repository at this point in the history
  • Loading branch information
bozdoz committed Apr 2, 2018
1 parent 653219b commit ee13546
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Leaflet Map WordPress Plugin
========

![Leaflet](https://img.shields.io/badge/leaflet-1.2.0-green.svg?style=flat)
![WordPress](https://img.shields.io/badge/wordpress-4.8.1-green.svg?style=flat)
![Leaflet](https://img.shields.io/badge/leaflet-1.3.1-green.svg?style=flat)
![WordPress](https://img.shields.io/badge/wordpress-4.9.4-green.svg?style=flat)

![Header Image](https://ps.w.org/leaflet-map/assets/banner-1544x500.png?rev=1693083)

Expand Down Expand Up @@ -94,5 +94,4 @@ Contributing
Wish List
---------

* A map editor/shortcode generator (so users can see what they're adding to the page)
* Make the plugin extendable (add hooks/filters/actions)
* A map editor/shortcode generator (so users can see what they're adding to the page)
11 changes: 10 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Contributors: bozdoz, Remigr, nielsalstrup, jeromelebleu, gerital
Donate link: https://www.paypal.me/bozdoz
Tags: leaflet, map, mobile, javascript, openstreetmap, mapquest, interactive
Requires at least: 3.0.1
Tested up to: 4.9
Tested up to: 4.9.4
Version: 2.11.0
Stable tag: 2.11.0
License: GPLv2
Expand Down Expand Up @@ -65,6 +65,10 @@ Shoot me a question [@bozdoz](https://www.twitter.com/bozdoz/).

== Frequently Asked Questions ==

= Can I have an SVG Marker? =

Yes! Convert the default marker into an svg with a shortcode like this: `[leaflet-marker svg="true" color="white" iconClass="fab fa-wordpress-simple" background="red"]` The `iconClass` is perfect for adding a [font-awesome](https://fontawesome.com/icons?d=gallery) icon.

= How do I change the style for lines/geojson? =

Pass the style attributes to the respective shortcodes (see all options on [LeafletJS](http://leafletjs.com/reference-1.0.3.html#path)):
Expand Down Expand Up @@ -120,6 +124,11 @@ Yes: use the keyword `attribution` in your shortcode (semi-colon separated list

== Changelog ==

= 2.11.0 =
* Added Popup Anchor for custom markers
* Added SVG Markers
* Added actions and filters

= 2.10.1 =
* Fix for plugin settings not being included (somehow)

Expand Down
22 changes: 20 additions & 2 deletions shortcodes/class.marker-shortcode.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
* Marker Shortcode
*
* Use with [leaflet-marker ...]
*
* PHP Version 5.5
*
* @category Shortcode
* @author Benjamin J DeLong <[email protected]>
*/

// Exit if accessed directly
Expand All @@ -12,8 +17,21 @@

require_once LEAFLET_MAP__PLUGIN_DIR . 'shortcodes/class.shortcode.php';

class Leaflet_Marker_Shortcode extends Leaflet_Shortcode {
protected function getHTML ($atts='', $content=null) {
/**
* Leaflet Marker Shortcode Class
*/
class Leaflet_Marker_Shortcode extends Leaflet_Shortcode
{
/**
* Get Script for Shortcode
*
* @param string $atts could be an array
* @param string $content optional
*
* @return null
*/
protected function getHTML($atts='', $content=null)
{
if (!empty($atts)) {
extract($atts);
}
Expand Down

0 comments on commit ee13546

Please sign in to comment.