Skip to content

Commit

Permalink
Updating master to 1.5.6 branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
JLeuze committed Jan 17, 2016
1 parent 43b4791 commit e259e5f
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 45 deletions.
2 changes: 1 addition & 1 deletion css/meteor-slides.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Stylesheet for the Meteor Slides 1.5.5 slideshow
/* Stylesheet for the Meteor Slides 1.5.6 slideshow
Copy "meteor-slides.css" from "/meteor-slides/css/" to your theme's directory to replace
the plugin's default stylesheet.
Expand Down
86 changes: 58 additions & 28 deletions includes/meteor-slides-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@ function meteorslides_add_contextual_help() {

'<p>' . __( '<strong>Title</strong> - Name the slide so it can be easily found later.', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Slide Image</strong> - To add an image to a slide, click the "Set featured image" link. Upload an image, or browse the media library for one, click the "Use as featured image" link to add the image and then close the media uploader. The Slide Image metabox should now have a thumbnail image.', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Slide Link</strong> - Add the full URL to the Slide Link metabox, such as <em>http://www.jleuze.com/</em> (Optional)', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Slideshows</strong> - A slide can be added <a href="http://www.jleuze.com/plugins/meteor-slides/multiple-slideshows/">to a slideshow</a> by selecting the slideshow from the Slideshows metabox.', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Slide Link</strong> - Add the full URL to the Slide Link metabox, such as <em>http://jleuze.com/</em> (Optional)', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Slideshows</strong> - A slide can be added <a href="http://jleuze.com/plugins/meteor-slides/multiple-slideshows/">to a slideshow</a> by selecting the slideshow from the Slideshows metabox.', 'meteor-slides' ) . '</p>' .
'<p>' . __( "<strong>Slide Order</strong> - Slides are sorted chronologically, edit the slide's published date to change the order of the slide.", "meteor-slides" ) . '</p>';

$meteor_contextual_sidebar =

'<p><strong>' . __( 'For more information', 'meteor-slides' ) . '</strong></p>' .
'<p>' . __( '<a href="http://www.jleuze.com/plugins/meteor-slides/using-meteor-slides/" target="_blank">Documentation on Creating Slides</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://jleuze.com/plugins/meteor-slides/using-meteor-slides/" target="_blank">Documentation on Creating Slides</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/tags/meteor-slides" target="_blank">Plugin Support Forum</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a class="button" href="http://jleuze.com/donate/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';
'<p>' . __( '<a class="button" href="http://jleuze.com/go/paypal/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';

$meteor_contextual_screen->add_help_tab( array(

Expand All @@ -304,9 +304,9 @@ function meteorslides_add_contextual_help() {
$meteor_contextual_sidebar =

'<p><strong>' . __( 'For more information', 'meteor-slides' ) . '</strong></p>' .
'<p>' . __( '<a href="http://www.jleuze.com/plugins/meteor-slides/installation/" target="_blank">Meteor Slides Documentation</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://jleuze.com/plugins/meteor-slides/installation/" target="_blank">Meteor Slides Documentation</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/tags/meteor-slides" target="_blank">Plugin Support Forum</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a class="button" href="http://jleuze.com/donate/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';
'<p>' . __( '<a class="button" href="http://jleuze.com/go/paypal/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';

$meteor_contextual_screen->add_help_tab( array(

Expand Down Expand Up @@ -337,9 +337,9 @@ function meteorslides_add_contextual_help() {
$meteor_contextual_sidebar =

'<p><strong>' . __( 'For more information', 'meteor-slides' ) . '</strong></p>' .
'<p>' . __( '<a href="http://www.jleuze.com/plugins/meteor-slides/multiple-slideshows/" target="_blank">Documentation on Adding Multiple Slideshows</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://jleuze.com/plugins/meteor-slides/multiple-slideshows/" target="_blank">Documentation on Adding Multiple Slideshows</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/tags/meteor-slides" target="_blank">Plugin Support Forum</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a class="button" href="http://jleuze.com/donate/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';
'<p>' . __( '<a class="button" href="http://jleuze.com/go/paypal/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';

$meteor_contextual_screen->add_help_tab( array(

Expand Down Expand Up @@ -376,7 +376,7 @@ function meteorslides_add_contextual_help() {
$meteor_contextual_second_title = __( 'Additional Options', 'meteor-slides' );
$meteor_contextual_second_content =

'<p>' . __( 'Only the options below are required, but jQuery Cycle has <a href="http://jquery.malsup.com/cycle/options.html">additional options</a> that can be changed <a href="http://www.jleuze.com/plugins/meteor-slides/using-metadata/">using metadata</a>.', 'meteor-slides' ) . '</p>' .
'<p>' . __( 'Only the options below are required, but jQuery Cycle has <a href="http://jquery.malsup.com/cycle/options.html">additional options</a> that can be changed <a href="http://jleuze.com/plugins/meteor-slides/using-metadata/">using metadata</a>.', 'meteor-slides' ) . '</p>' .
'<p>' . __( 'Here is an example using metadata with the shortcode to set the slide order to random:', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<code>[meteor_slideshow metadata="random: 1"]</code>', 'meteor-slides' ) . '</p>';

Expand All @@ -387,14 +387,14 @@ function meteorslides_add_contextual_help() {
'<p>' . __( "<strong>Template Tag</strong> - Use this template tag in a theme file: <code><&#63;php if ( function_exists( 'meteor_slideshow' ) ) { meteor_slideshow(); } &#63;></code>", 'meteor-slides' ) . '</p>' .
'<p>' . __( "<strong>Shortcode</strong> - Use this shortcode to add a slideshow via the Post or Page editor: <code>[meteor_slideshow]</code>", 'meteor-slides' ) . '</p>' .
'<p>' . __( '<strong>Widget</strong> - Use the Meteor Slides Widget to add a slideshow to a widgetized area.', 'meteor-slides' ) . '</p>' .
'<p>' . __( 'Check out the documentation on <a href="http://www.jleuze.com/plugins/meteor-slides/adding-a-slideshow/" target="_blank">adding a slideshow</a> for more info.', 'meteor-slides' ) . '</p>';
'<p>' . __( 'Check out the documentation on <a href="http://jleuze.com/plugins/meteor-slides/adding-a-slideshow/" target="_blank">adding a slideshow</a> for more info.', 'meteor-slides' ) . '</p>';

$meteor_contextual_sidebar =

'<p><strong>' . __( 'For more information', 'meteor-slides' ) . '</strong></p>' .
'<p>' . __( '<a href="http://www.jleuze.com/plugins/meteor-slides/installation/" target="_blank">Documentation on Configuring Meteor Slides</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://jleuze.com/plugins/meteor-slides/installation/" target="_blank">Documentation on Configuring Meteor Slides</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/tags/meteor-slides" target="_blank">Plugin Support Forum</a>', 'meteor-slides' ) . '</p>' .
'<p>' . __( '<a class="button" href="http://jleuze.com/donate/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';
'<p>' . __( '<a class="button" href="http://jleuze.com/go/paypal/" target="_blank">Donate</a>', 'meteor-slides' ) . '</p>';

$meteor_contextual_screen->add_help_tab( array(

Expand Down Expand Up @@ -473,34 +473,64 @@ function meteorslides_settings_page() {
}

// Add custom slide capabilities for the Members plugin

add_action( 'admin_init', 'meteorslides_members_capabilities' );

function meteorslides_members_capabilities() {

if ( function_exists( 'members_get_capabilities' ) ) {

add_filter( 'members_get_capabilities', 'meteorslides_add_members_caps' );

}

}

function meteorslides_add_members_caps( $caps ) {

$caps[] = 'meteorslides_manage_options';
$caps[] = 'meteorslides_edit_slide';
$caps[] = 'meteorslides_edit_slides';
$caps[] = 'meteorslides_edit_others_slides';
$caps[] = 'meteorslides_publish_slides';
$caps[] = 'meteorslides_read_slides';
$caps[] = 'meteorslides_read_private_slides';
$caps[] = 'meteorslides_delete_slide';
$caps[] = 'meteorslides_delete_slides';
$caps[] = 'meteorslides_manage_slideshows';
$caps[] = 'meteorslides_manage_options';

return $caps;

}

// Unregister default Slides caps group from the Members plugin
function meteorslides_members_remove_slides_cap_group() {
members_unregister_cap_group( 'type-slide' );
}

// Registers Meteor Slides capabilities group for the Members plugin
function meteorslides_add_members_caps_group() {
$meteor_cap_group_caps = array(
'meteorslides_edit_slide',
'meteorslides_edit_slides',
'meteorslides_edit_others_slides',
'meteorslides_publish_slides',
'meteorslides_read_slide',
'meteorslides_read_private_slides',
'meteorslides_delete_slide',
'meteorslides_delete_slides',
'meteorslides_manage_slideshows',
'meteorslides_manage_options'
);

$meteor_cap_group_args = array(
'label' => __( 'Meteor Slides', 'meteor-slides' ),
'icon' => 'dashicons-images-alt2',
'caps' => $meteor_cap_group_caps,
'merge_added' => true,
'diff_added' => false,
);
members_register_cap_group( 'type-meteor-slide', $meteor_cap_group_args );
}

// Setup custom slide capabilities and capabilities group if the Members plugin is active
function meteorslides_members_capabilities() {
if ( function_exists( 'members_get_capabilities' ) ) {
add_filter( 'members_get_capabilities', 'meteorslides_add_members_caps' );
}
if ( function_exists( 'members_register_cap_group' ) ) {
add_action( 'members_register_cap_groups', 'meteorslides_add_members_caps_group' );
}
if ( function_exists( 'members_register_cap_group' ) ) {
add_action( 'members_register_cap_groups', 'meteorslides_members_remove_slides_cap_group' );
}
}
add_action( 'plugins_loaded', 'meteorslides_members_capabilities' );

// Adds link to settings page on plugins page

Expand Down
2 changes: 1 addition & 1 deletion includes/meteor-slideshow.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
/* Loop template for the Meteor Slides 1.5.5 slideshow
/* Loop template for the Meteor Slides 1.5.6 slideshow
Copy "meteor-slideshow.php" from "/meteor-slides/" to your theme's directory to replace
the plugin's default slideshow loop.
Expand Down
2 changes: 1 addition & 1 deletion js/slideshow.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Script for the Meteor Slides 1.5.5 slideshow
/* Script for the Meteor Slides 1.5.6 slideshow
Copy "slideshow.js" from "/meteor-slides/js/" to your theme's directory to replace
the plugin's default slideshow script.
Expand Down
12 changes: 7 additions & 5 deletions meteor-slides-plugin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
Author: Josh Leuze
Author URI: http://jleuze.com/
License: GPL2
Version: 1.5.5
Version: 1.5.6
*/

/* Copyright 2015 Josh Leuze (email : mail@jleuze.com)
/* Copyright 2016 Josh Leuze (email : mail@jleuze.com)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2, as
Expand Down Expand Up @@ -58,7 +58,8 @@ function meteorslides_register_slides() {
'publish_posts' => 'meteorslides_publish_slides',
'read_post' => 'meteorslides_read_slide',
'read_private_posts' => 'meteorslides_read_private_slides',
'delete_post' => 'meteorslides_delete_slide'
'delete_post' => 'meteorslides_delete_slide',
'delete_posts' => 'meteorslides_delete_slides'

);

Expand All @@ -76,7 +77,8 @@ function meteorslides_register_slides() {
'publish_posts' => 'publish_posts',
'read_post' => 'read_post',
'read_private_posts' => 'read_private_posts',
'delete_post' => 'delete_post'
'delete_post' => 'delete_post',
'delete_posts' => 'delete_posts'

);

Expand Down Expand Up @@ -254,7 +256,7 @@ function meteorslides_css() {

// Adds JavaScript for the slideshow

add_action( 'wp_print_scripts', 'meteorslides_javascript' );
add_action( 'wp_enqueue_scripts', 'meteorslides_javascript' );

function meteorslides_javascript() {

Expand Down
4 changes: 2 additions & 2 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Meteor Slides makes it simple to create slideshows and publish them with a short

####Meteor Slides Homepage

[Visit this plugin's homepage](http://www.jleuze.com/plugins/meteor-slides/) for documentation, tutorials, and video screencasts.
[Visit this plugin's homepage](http://jleuze.com/plugins/meteor-slides/) for documentation, tutorials, and video screencasts.

####Features

Expand Down Expand Up @@ -35,4 +35,4 @@ Use ```<?php if ( function_exists( 'meteor_slideshow' ) ) { meteor_slideshow();

####Meteor Slides Documentation

Check out the [Meteor Slides Documentation](http://www.jleuze.com/plugins/meteor-slides/installation/) for more information on using Meteor Slides, adding slideshows, using metadata, and advanced customization.
Check out the [Meteor Slides Documentation](http://jleuze.com/plugins/meteor-slides/installation/) for more information on using Meteor Slides, adding slideshows, using metadata, and advanced customization.
22 changes: 15 additions & 7 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: http://jleuze.com/go/paypal/
Tags: custom post types, image, jquery, responsive, slide, slider, slides, slideshow
Requires at least: 4.4
Tested up to: 4.4
Stable tag: 1.5.5
Stable tag: 1.5.6

Easily create responsive slideshows with WordPress that are mobile friendly and simple to customize.

Expand All @@ -14,7 +14,7 @@ Meteor Slides makes it simple to create slideshows and publish them with a short

= Meteor Slides Homepage =

[Visit this plugin's homepage](http://www.jleuze.com/plugins/meteor-slides/ "Meteor Slides Homepage") for documentation, tutorials, and additional videos.
[Visit this plugin's homepage](http://jleuze.com/plugins/meteor-slides/ "Meteor Slides Homepage") for documentation, tutorials, and additional videos.

= Video Overview =

Expand Down Expand Up @@ -51,15 +51,15 @@ Use `<?php if ( function_exists( 'meteor_slideshow' ) ) { meteor_slideshow(); }

= Meteor Slides Documentation =

Check out the [Meteor Slides Documentation](http://www.jleuze.com/plugins/meteor-slides/installation/ "Meteor Slides Documentation") for more information on using Meteor Slides, adding slideshows, using metadata, and advanced customization.
Check out the [Meteor Slides Documentation](http://jleuze.com/plugins/meteor-slides/installation/ "Meteor Slides Documentation") for more information on using Meteor Slides, adding slideshows, using metadata, and advanced customization.

*Please [post any questions or problems](http://wordpress.org/tags/meteor-slides?forum_id=10#postform "Post a question or problem in the forums") in the WordPress.org support forums.*

== Frequently Asked Questions ==

= Meteor Slides is awesome, what can I do to help? =

You can help right on this page by rating the plugin or voting for its compatibility with the latest version of WordPress. Blog about Meteor Slides to get the word out, or [visit my blog](http://www.jleuze.com/ "JLeuze.com") to post feedback or just say hi. You could also [translate Meteor Slides](http://www.jleuze.com/plugins/meteor-slides/languages/ "Meteor Slides Languages") into another language or [make a donation](http://jleuze.com/donate/ "Donate").
You can help right on this page by rating the plugin or voting for its compatibility with the latest version of WordPress. Blog about Meteor Slides to get the word out, or [visit my blog](http://jleuze.com/ "JLeuze.com") to post feedback or just say hi. You could also [translate Meteor Slides](http://jleuze.com/plugins/meteor-slides/languages/ "Meteor Slides Languages") into another language or [make a donation](http://jleuze.com/donate/ "Donate").

= I add a slide, save or publish it, and then it's missing or not found, what gives? =

Expand All @@ -79,11 +79,11 @@ The `z-index` on the slideshow is higher than the dropdowns, causing them to be

= How do I customize the slideshow's CSS stylesheet? =

Copy **meteor-slides.css** from **/meteor-slides/css/** to your theme's directory to replace the plugin's default stylesheet. If you have navigation enabled, be sure to copy the **buttons.png**, **next.png**, and **prev.png** files to your theme's images folder and update the image paths, or create new graphics to replace them. Learn more about [customizing the stylesheet](http://www.jleuze.com/plugins/meteor-slides/customizing-the-stylesheet/ "Meteor Slides Documentation") for Meteor Slides.
Copy **meteor-slides.css** from **/meteor-slides/css/** to your theme's directory to replace the plugin's default stylesheet. If you have navigation enabled, be sure to copy the **buttons.png**, **next.png**, and **prev.png** files to your theme's images folder and update the image paths, or create new graphics to replace them. Learn more about [customizing the stylesheet](http://jleuze.com/plugins/meteor-slides/customizing-the-stylesheet/ "Meteor Slides Documentation") for Meteor Slides.

= How do I customize the slideshow's loop template? =

Copy **meteor-slideshow.php** from **/meteor-slides/** to your theme's directory to replace the plugin's default slideshow loop. Learn more about [customizing the slideshow template](http://www.jleuze.com/plugins/meteor-slides/customizing-the-slideshow-template/ "Meteor Slides Documentation") for Meteor Slides.
Copy **meteor-slideshow.php** from **/meteor-slides/** to your theme's directory to replace the plugin's default slideshow loop. Learn more about [customizing the slideshow template](http://jleuze.com/plugins/meteor-slides/customizing-the-slideshow-template/ "Meteor Slides Documentation") for Meteor Slides.

= I installed Meteor Slides, and now my theme or plugin's jQuery goodies are broken! =

Expand All @@ -93,7 +93,7 @@ It's also possible that a script in your theme or another plugin is using the "$

= I just installed Meteor Slides, but the Slides menu is missing, where do I go? =

If the Slides menu is missing, you probably have the [Members](http://wordpress.org/extend/plugins/members/ "Members plugin") plugin activated. Meteor Slides supports the Members plugin, so if you have them both running you can use Members to choose which roles can manage the slides or slideshow settings. Take a look at [this blog post](http://www.jleuze.com/using-the-members-plugin-with-meteor-slides/ "Using the Members plugin with Meteor Slides") for more info on using these plugins together.
If the Slides menu is missing, you probably have the [Members](http://wordpress.org/extend/plugins/members/ "Members plugin") plugin activated. Meteor Slides supports the Members plugin, so if you have them both running you can use Members to choose which roles can manage the slides or slideshow settings. Take a look at [this blog post](http://jleuze.com/using-the-members-plugin-with-meteor-slides/ "Using the Members plugin with Meteor Slides") for more info on using these plugins together.

*Please [post any questions or problems](http://wordpress.org/tags/meteor-slides?forum_id=10#postform "Post a question or problem in the forums") in the WordPress.org support forums.*

Expand All @@ -108,6 +108,11 @@ If the Slides menu is missing, you probably have the [Members](http://wordpress.
7. Meteor Slides Widget

== Changelog ==
= 1.5.6 =
* Updated support for version 1.1.0 of the Members plugin
* Added Meteor Slides capabilities group for Members plugin role editor
* Changed slideshow JavaScript function hook for greater plugin compatibility

= 1.5.5 =
* Added support for responsive images using srcset in WordPress 4.4
* Updated stylesheet with conflict fixes for the TwentySixteen theme
Expand Down Expand Up @@ -211,6 +216,9 @@ If the Slides menu is missing, you probably have the [Members](http://wordpress.

== Upgrade Notice ==

= 1.5.6 =
Meteor Slides 1.5.6 includes updated support and functionality for the latest version of the Members plugin.

= 1.5.5 =
Meteor Slides 1.5.5 has been updated with theme conflict fixes and support for responsive images using srcset in WordPress 4.4.

Expand Down

0 comments on commit e259e5f

Please sign in to comment.