Theme Tools: do not load compat files in the dashboard.

.github/ISSUE_TEMPLATE.md

@@ -11,6 +11,6 @@ PLEASE NOTE
 - These comments won't show up when you submit the issue.
 - Everything is optional, but try to add as many details as possible.
 - If requesting a new feature, explain why you'd like to see it added.
-- This issue tracker is not for support. If you have questions about Jetpack, you can [start a new thread in the Jetpack support forums](http://wordpress.org/support/plugin/jetpack#postform), or [send us an email](http://jetpack.com/contact-support/).
+- This issue tracker is not for support. If you have questions about Jetpack, you can [start a new thread in the Jetpack support forums](https://wordpress.org/support/plugin/jetpack#postform), or [send us an email](http://jetpack.com/contact-support/).
 - Do not report potential security vulnerabilities here. For responsible disclosure of security issues and to be eligible for our bug bounty program, please submit your report via [the HackerOne portal](https://hackerone.com/automattic).
 -->

3rd-party/bitly.php

@@ -2,15 +2,15 @@
 
 /*
  * Fixes issues with the Official Bitly for WordPress
- * http://wordpress.org/plugins/bitly/
+ * https://wordpress.org/plugins/bitly/
  */
 if( class_exists( 'Bitly' ) ) {
 
 	if( isset( $GLOBALS['bitly'] ) ) {
 		if ( method_exists( $GLOBALS['bitly'], 'og_tags' ) ) {
 			remove_action( 'wp_head', array( $GLOBALS['bitly'], 'og_tags' ) );
 		}
-		
+
 		add_action( 'wp_head', 'jetpack_bitly_og_tag', 100 );
 	}
 

_inc/client/at-a-glance/akismet.jsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import DashItem from 'components/dash-item';
-import { translate as __ } from 'i18n-calypso';
+import { numberFormat, translate as __ } from 'i18n-calypso';
 
 /**
  * Internal dependencies
@@ -116,7 +116,7 @@ const DashAkismet = React.createClass( {
 				status="is-working"
 				pro={ true }
 			>
-				<h2 className="jp-dash-item__count">{ akismetData.all.spam }</h2>
+				<h2 className="jp-dash-item__count">{ numberFormat( akismetData.all.spam ) }</h2>
 				<p className="jp-dash-item__description">
 					{
 						__( 'Spam comments blocked.', {

_inc/client/at-a-glance/protect.jsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import DashItem from 'components/dash-item';
-import { translate as __ } from 'i18n-calypso';
+import { numberFormat, translate as __ } from 'i18n-calypso';
 
 /**
  * Internal dependencies
@@ -47,7 +47,7 @@ const DashProtect = React.createClass( {
 					module="protect"
 					status="is-working"
 				>
-					<h2 className="jp-dash-item__count">{ protectCount }</h2>
+					<h2 className="jp-dash-item__count">{ numberFormat( protectCount ) }</h2>
 					<p className="jp-dash-item__description">{ __( 'Total malicious attacks blocked on your site.' ) }</p>
 				</DashItem>
 			);

_inc/client/at-a-glance/scan.jsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import DashItem from 'components/dash-item';
-import { translate as __ } from 'i18n-calypso';
+import { numberFormat, translate as __ } from 'i18n-calypso';
 
 /**
  * Internal dependencies
@@ -59,7 +59,7 @@ const DashScan = React.createClass( {
 								{
 									count: threats,
 									args: {
-										number: threats
+										number: numberFormat( threats )
 									}
 								} )
 						}</h3>

_inc/client/components/connect-button/index.jsx

@@ -62,6 +62,12 @@ const ConnectButton = React.createClass( {
 		);
 	},
 
+	disconnectSite() {
+		if ( window.confirm( __( 'Do you really want to disconnect your site from WordPress.com?' ) ) ) {
+			this.props.disconnectSite();
+		}
+	},
+
 	renderContent: function() {
 		const fetchingUrl = this.props.fetchingConnectUrl( this.props );
 		const disconnecting = this.props.isDisconnecting( this.props );
@@ -73,7 +79,7 @@ const ConnectButton = React.createClass( {
 		if ( this.props.isSiteConnected( this.props ) ) {
 			return(
 				<Button
-					onClick={ this.props.disconnectSite }
+					onClick={ this.disconnectSite }
 					disabled={ disconnecting }>
 					{ __( 'Disconnect site from WordPress.com ') }
 				</Button>

_inc/client/components/footer/index.jsx

@@ -70,7 +70,7 @@ export const Footer = React.createClass( {
 					</li>
 					<li className="jp-footer__link-item">
 						<a
-							href="http://wordpress.com/tos/"
+							href="https://wordpress.com/tos/"
 							target="_blank"
 							title={ __( 'WordPress.com Terms of Service' ) }
 							className="jp-footer__link">

_inc/client/plans/plan-body.jsx

@@ -77,6 +77,26 @@ const PlanBody = React.createClass( {
 					</div>
 				);
 				break;
+
+			default:
+				planCard = (
+					<div className="jp-landing__plan-features">
+						<div className="jp-landing__plan-features-card">
+							<h3 className="jp-landing__plan-features-title is-placeholder"> </h3>
+							<p className="jp-landing__plan-features-text is-placeholder"> </p>
+						</div>
+						<div className="jp-landing__plan-features-card">
+							<h3 className="jp-landing__plan-features-title is-placeholder"> </h3>
+							<p className="jp-landing__plan-features-text is-placeholder"> </p>
+						</div>
+
+						<div className="jp-landing__plan-features-card">
+							<h3 className="jp-landing__plan-features-title is-placeholder"> </h3>
+							<p className="jp-landing__plan-features-text is-placeholder"> </p>
+						</div>
+					</div>
+				);
+				break;
 		}
 		return (
 			<div>

_inc/client/plans/plan-header.jsx

@@ -99,6 +99,19 @@ const PlanHeader = React.createClass( {
 					</div>
 				);
 				break;
+
+			default:
+				planCard = (
+					<div className="jp-landing__plan-card">
+						<div className="jp-landing__plan-card-img is-placeholder">
+						</div>
+						<div className="jp-landing__plan-card-current">
+							<h3 className="jp-landing__plan-features-title is-placeholder"> </h3>
+							<p className="jp-landing__plan-features-text is-placeholder"> </p>
+						</div>
+					</div>
+				);
+				break;
 		}
 		return (
 			<div>

_inc/client/plans/style.scss

@@ -166,7 +166,7 @@
 		padding: 0;
 
 		@include breakpoint( ">660px" ) {
-			padding-left: rem( 32px );
+			margin-left: rem( 32px );
 		}
 	}
 
@@ -193,4 +193,23 @@
 	@include breakpoint( "<660px" ) {
 		width: rem( 100px );
 	}
+}
+
+.jp-landing__plan-card-img.is-placeholder {
+	width: rem( 120px );
+	height: rem( 85px );
+
+	& + .jp-landing__plan-card-current {
+		width: 80%;
+	}
+}
+
+.jp-landing__plan-features-title.is-placeholder {
+	height: rem( 24px );
+	max-width: 50%;
+}
+
+.jp-landing__plan-features-text.is-placeholder {
+	height: rem( 44px );
+	max-width: 75%;
 }

_inc/client/scss/shared/_main.scss

@@ -164,4 +164,13 @@
 			max-width: 120%;
 		}
 	}
+}
+
+.is-placeholder {
+	animation: pulse-light 0.8s ease-in-out infinite;
+	background: lighten( $gray, 20% );
+}
+
+@keyframes pulse-light {
+	50% { background-color: lighten( $gray, 30% ); }
 }

_inc/client/state/connection/reducer.js

@@ -3,6 +3,7 @@
  */
 import { combineReducers } from 'redux';
 import assign from 'lodash/assign';
+import get from 'lodash/get';
 
 /**
  * Internal dependencies
@@ -212,7 +213,7 @@ export function isDevMode( state ) {
  * @return {boolean} True if site is in staging. False otherwise.
  */
 export function isStaging( state ) {
-	return state.jetpack.connection.status.siteConnected.isStaging;
+	return get( state.jetpack.connection.status, [ 'siteConnected', 'isStaging' ], false );
 }
 
 /**

changelog.txt

@@ -1217,7 +1217,7 @@ Release Post: http://wp.me/p1moTy-oR
 * Bug Fix: Contact Form - RTL styles
 * Bug Fix: Contact Form - Better handle MP6 icons
 * Bug Fix: Custom CSS - array_shift() took a variable by reference, so avoid passing it the result of a function
-* Bug Fix: Custom CSS - Allow case-insensitive CSS properties (<a href="http://wordpress.org/support/topic/two-issues-with-jetpack-css-module?replies=9">ref</a>)
+* Bug Fix: Custom CSS - Allow case-insensitive CSS properties (<a href="https://wordpress.org/support/topic/two-issues-with-jetpack-css-module?replies=9">ref</a>)
 * Bug Fix: Infinite Scroll - Maintain main query's `post__not_in` values when querying posts for IS
 * Bug Fix: Infinite Scroll - Ensure that IS's `pre_get_posts` method isn't applied in the admin. Also fixes an incorrect use of `add_filter()` where `add_action()` was meant. Fixes #1696-plugins
 * Bug Fix: Infinite Scroll - CSS update - IS footer was too large in Firefox
@@ -1410,7 +1410,7 @@ Release Post: http://wp.me/p1moTy-lT
 Release Date: December 14, 2012
 Release Post: http://wp.me/p1moTy-lJ
 
-* Enhancement: Infinite Scroll: support [VideoPress](http://wordpress.org/extend/plugins/video/) plugin.
+* Enhancement: Infinite Scroll: support [VideoPress](https://wordpress.org/plugins/video/) plugin.
 * Enhancement: Photon: Apply to all images retrieved from the Media Library.
 * Enhancement: Photon: Retina image support.
 * Enhancement: Custom CSS: Refined editor interface.
@@ -1430,7 +1430,7 @@ Release Post: http://wp.me/p1moTy-lu
 Release Date: November 21, 2012
 Release Post: http://wp.me/p1moTy-lc
 
-* Enhancement: Photon: Support for the [Lazy Load](http://wordpress.org/extend/plugins/lazy-load/) plugin.
+* Enhancement: Photon: Support for the [Lazy Load](https://wordpress.org/plugins/lazy-load/) plugin.
 * Bug Fix: Photon: Fix warped images with un- or under-specified dimensions.
 * Bug Fix: Photon: Fix warped images with pre-photonized URLs; don't try to photonize them twice.
 * Bug Fix: Infinite Scroll: Check a child theme's parent theme for infinite scroll support.
@@ -1723,7 +1723,7 @@ Release Post: http://wp.me/p1moTy-8x
 * Enhancement: Stats: More responsive stats dashboard.
 * Enhancement: Shortcodes: Google Maps, VideoPress
 * Enhancement: Sharing: Google+, LinkedIn
-* Enhancement: Enhanced Distribution: Added Jetpack blogs to http://en.wordpress.com/firehose/
+* Enhancement: Enhanced Distribution: Added Jetpack blogs to https://en.wordpress.com/firehose/
 * Bug Fix: Spelling and Grammar: WordPress 3.3 compatibility.
 * Bug Fix: Translatable module names/descriptinos.
 * Bug Fix: Correctly detect host's ability to make outgoing HTTPS requests.

class.jetpack-debugger.php

@@ -172,7 +172,7 @@ public static function jetpack_debug_display_handler() {
 				<h3><?php esc_html_e( 'Trouble with Jetpack?', 'jetpack' ); ?></h3>
 				<h4><?php esc_html_e( 'It may be caused by one of these issues, which you can diagnose yourself:', 'jetpack' ); ?></h4>
 				<ol>
-					<li><b><em><?php esc_html_e( 'A known issue.', 'jetpack' ); ?></em></b>  <?php echo sprintf( __( 'Some themes and plugins have <a href="%1$s" target="_blank">known conflicts</a> with Jetpack – check the <a href="%2$s" target="_blank">list</a>. (You can also browse the <a href="%3$s" target="_blank">Jetpack support pages</a> or <a href="%4$s" target="_blank">Jetpack support forum</a> to see if others have experienced and solved the problem.)', 'jetpack' ), 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/', 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/', 'http://jetpack.com/support/', 'http://wordpress.org/support/plugin/jetpack' ); ?></li>
+					<li><b><em><?php esc_html_e( 'A known issue.', 'jetpack' ); ?></em></b>  <?php echo sprintf( __( 'Some themes and plugins have <a href="%1$s" target="_blank">known conflicts</a> with Jetpack – check the <a href="%2$s" target="_blank">list</a>. (You can also browse the <a href="%3$s" target="_blank">Jetpack support pages</a> or <a href="%4$s" target="_blank">Jetpack support forum</a> to see if others have experienced and solved the problem.)', 'jetpack' ), 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/', 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/', 'http://jetpack.com/support/', 'https://wordpress.org/support/plugin/jetpack' ); ?></li>
 					<li><b><em><?php esc_html_e( 'An incompatible plugin.', 'jetpack' ); ?></em></b>  <?php esc_html_e( "Find out by disabling all plugins except Jetpack. If the problem persists, it's not a plugin issue. If the problem is solved, turn your plugins on one by one until the problem pops up again – there's the culprit! Let us know, and we'll try to help.", 'jetpack' ); ?></li>
 					<li>
 						<b><em><?php esc_html_e( 'A theme conflict.', 'jetpack' ); ?></em></b>

class.jetpack.php

@@ -6269,7 +6269,7 @@ function jetpack_show_user_connected_icon( $val, $col, $user_id ) {
 	 */
 	function jetpack_user_col_style() {
 		global $current_screen;
-		if ( 'users' == $current_screen->base ) { ?>
+		if ( ! empty( $current_screen->base ) && 'users' == $current_screen->base ) { ?>
 			<style>
 				.fixed .column-user_jetpack {
 					width: 21px;

modules/carousel/jetpack-carousel.js

@@ -232,7 +232,7 @@ jQuery(document).ready(function($) {
 
 			container.attr('itemscope', '');
 
-			container.attr('itemtype', 'http://schema.org/ImageGallery');
+			container.attr('itemtype', 'https://schema.org/ImageGallery');
 
 			container.css({
 					'position'   : 'fixed',
@@ -883,7 +883,7 @@ jQuery(document).ready(function($) {
 						.css( 'width', '100%' )
 						.css( 'height', '100%' );
 
-					var slide = $('<div class="jp-carousel-slide" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject"></div>')
+					var slide = $('<div class="jp-carousel-slide" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject"></div>')
 							.hide()
 							.css({
 								//'position' : 'fixed',

modules/carousel/jetpack-carousel.php

@@ -2,7 +2,7 @@
 
 /*
 Plugin Name: Jetpack Carousel
-Plugin URL: http://wordpress.com/
+Plugin URL: https://wordpress.com/
 Description: Transform your standard image galleries into an immersive full-screen experience.
 Version: 0.1
 Author: Automattic

modules/custom-css/custom-css.php

@@ -997,7 +997,7 @@ static function admin() {
 						 * @param string $str Intro text appearing above the Custom CSS editor.
 						 */
 						echo apply_filters( 'safecss_intro_text', __( 'New to CSS? Start with a <a href="http://www.htmldog.com/guides/cssbeginner/" target="_blank">beginner tutorial</a>. Questions?
-		Ask in the <a href="http://wordpress.org/support/forum/themes-and-templates" target="_blank">Themes and Templates forum</a>.', 'jetpack' ) );
+		Ask in the <a href="https://wordpress.org/support/forum/themes-and-templates" target="_blank">Themes and Templates forum</a>.', 'jetpack' ) );
 					?></p>
 					<p class="css-support"><?php echo __( 'Note: Custom CSS will be reset when changing themes.', 'jetpack' ); ?></p>
 

modules/infinite-scroll/infinity.php

@@ -1442,7 +1442,7 @@ function footer() {
 	 */
 	private function default_footer() {
 		$credits = sprintf(
-			'<a href="http://wordpress.org/" target="_blank" rel="generator">%1$s</a> ',
+			'<a href="https://wordpress.org/" target="_blank" rel="generator">%1$s</a> ',
 			__( 'Proudly powered by WordPress', 'jetpack' )
 		);
 		$credits .= sprintf(

modules/markdown/easy-markdown.php

@@ -16,7 +16,7 @@
  * http://www.opensource.org/licenses/gpl-license.php
  *
  * This is an add-on for WordPress
- * http://wordpress.org/
+ * https://wordpress.org/
  *
  * **********************************************************************
  * This program is free software; you can redistribute it and/or modify

modules/minileven/theme/pub/minileven/footer.php

@@ -56,7 +56,7 @@
 			do_action( 'minileven_credits' );
 		?>
 
-		<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'jetpack' ) ); ?>" target="_blank" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'jetpack' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'jetpack' ), 'WordPress' ); ?></a>
+		<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'jetpack' ) ); ?>" target="_blank" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'jetpack' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'jetpack' ), 'WordPress' ); ?></a>
 	</div>
 </footer><!-- #colophon -->
 

modules/shortcodes/googlemaps.php

@@ -2,7 +2,7 @@
 
 /*
  * Google maps iframe - transforms code that looks like that:
- * <iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=bg&amp;geocode=&amp;q=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1,+%D0%A1%D0%BE%D1%84%D0%B8%D1%8F,+%D0%91%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D0%B8%D1%8F&amp;sll=37.0625,-95.677068&amp;sspn=40.545434,79.013672&amp;ie=UTF8&amp;hq=&amp;hnear=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1&amp;ll=42.654446,23.372061&amp;spn=0.036864,0.077162&amp;t=h&amp;z=14&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;source=embed&amp;hl=bg&amp;geocode=&amp;q=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1,+%D0%A1%D0%BE%D1%84%D0%B8%D1%8F,+%D0%91%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D0%B8%D1%8F&amp;sll=37.0625,-95.677068&amp;sspn=40.545434,79.013672&amp;ie=UTF8&amp;hq=&amp;hnear=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1&amp;ll=42.654446,23.372061&amp;spn=0.036864,0.077162&amp;t=h&amp;z=14" style="color:#0000FF;text-align:left">Вижте по-голяма карта</a></small>
+ * <iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=bg&amp;geocode=&amp;q=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1,+%D0%A1%D0%BE%D1%84%D0%B8%D1%8F,+%D0%91%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D0%B8%D1%8F&amp;sll=37.0625,-95.677068&amp;sspn=40.545434,79.013672&amp;ie=UTF8&amp;hq=&amp;hnear=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1&amp;ll=42.654446,23.372061&amp;spn=0.036864,0.077162&amp;t=h&amp;z=14&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;source=embed&amp;hl=bg&amp;geocode=&amp;q=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1,+%D0%A1%D0%BE%D1%84%D0%B8%D1%8F,+%D0%91%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D0%B8%D1%8F&amp;sll=37.0625,-95.677068&amp;sspn=40.545434,79.013672&amp;ie=UTF8&amp;hq=&amp;hnear=%D0%9C%D0%BB%D0%B0%D0%B4%D0%BE%D1%81%D1%82+1&amp;ll=42.654446,23.372061&amp;spn=0.036864,0.077162&amp;t=h&amp;z=14" style="color:#0000FF;text-align:left">Вижте по-голяма карта</a></small>
  * into the [googlemaps http://...] shortcode format
  */
 function jetpack_googlemaps_embed_to_short_code( $content ) {
@@ -54,7 +54,7 @@ function jetpack_googlemaps_embed_to_short_code_callback( $match ) {
  * [googlemaps] shortcode
  *
  * Example usage:
- *   [googlemaps http://maps.google.com/maps?f=q&hl=en&geocode=&q=San+Francisco,+CA&sll=43.469466,-83.998504&sspn=0.01115,0.025942&g=San+Francisco,+CA&ie=UTF8&z=12&iwloc=addr&ll=37.808156,-122.402458&output=embed&s=AARTsJp56EajYksz3JXgNCwT3LJnGsqqAQ&w=425&h=350]
+ *   [googlemaps https://maps.google.com/maps?f=q&hl=en&geocode=&q=San+Francisco,+CA&sll=43.469466,-83.998504&sspn=0.01115,0.025942&g=San+Francisco,+CA&ie=UTF8&z=12&iwloc=addr&ll=37.808156,-122.402458&output=embed&s=AARTsJp56EajYksz3JXgNCwT3LJnGsqqAQ&w=425&h=350]
  *   [googlemaps https://mapsengine.google.com/map/embed?mid=zbBhkou4wwtE.kUmp8K6QJ7SA&w=640&h=480]
  */
 function jetpack_googlemaps_shortcode( $atts ) {

modules/shortcodes/js/slideshow-shortcode.js

@@ -46,7 +46,7 @@ JetpackSlideshow.prototype.init = function() {
 		container.className = 'slideshow-slide';
 		container.setAttribute('itemprop','associatedMedia');
 		container.setAttribute('itemscope','');
-		container.setAttribute('itemtype','http://schema.org/ImageObject');
+		container.setAttribute('itemtype','https://schema.org/ImageObject');
 
 		// Hide loading image once first image has loaded.
 		if ( i === 0 ) {

modules/shortcodes/recipe.php

@@ -106,7 +106,7 @@ static function recipe_shortcode_html( $atts, $content = '' ) {
 		global $allowedtags;
 		$allowedtags['li'] = array( 'itemprop' => array () );
 
-		$html = '<div class="hrecipe jetpack-recipe" itemscope itemtype="http://schema.org/Recipe">';
+		$html = '<div class="hrecipe jetpack-recipe" itemscope itemtype="https://schema.org/Recipe">';
 
 		// Print the recipe title if exists
 		if ( '' !== $atts['title'] ) {

modules/shortcodes/slideshow.php

@@ -242,7 +242,7 @@ function slideshow_js( $attr ) {
 
 		$output .= '<p class="jetpack-slideshow-noscript robots-nocontent">' . esc_html__( 'This slideshow requires JavaScript.', 'jetpack' ) . '</p>';
 		$output .= sprintf(
-			'<div id="%s" class="slideshow-window jetpack-slideshow slideshow-%s" data-trans="%s" data-autostart="%s" data-gallery="%s" itemscope itemtype="http://schema.org/ImageGallery"></div>',
+			'<div id="%s" class="slideshow-window jetpack-slideshow slideshow-%s" data-trans="%s" data-autostart="%s" data-gallery="%s" itemscope itemtype="https://schema.org/ImageGallery"></div>',
 			esc_attr( $attr['selector'] . '-slideshow' ),
 			esc_attr( $attr['color'] ),
 			esc_attr( $attr['trans'] ),