Deploying version 0.3.5

README.md

@@ -33,6 +33,12 @@ This plugin is required by other plugins, which uses its libraries and its setti
 
 ## Changelog ##
 
+### 0.3.5 - 2016-03-07 ###
+* Improvement: Support for `DBI_` prefixed constants to avoid conflicts with other plugins
+* Improvement: Redesign of the Addons page
+* Improvement: Compatibility with WP Offload S3 Lite 1.0
+* Improvement: Compatibility with WP Offload S3 1.1
+
 ### 0.3.4 - 2015-11-02 ###
 * Improvement: Compatibility with WP Offload S3 Pro 1.0.3
 

amazon-web-services.php

@@ -4,7 +4,7 @@
 Plugin URI: http://wordpress.org/extend/plugins/amazon-web-services/
 Description: Includes the Amazon Web Services PHP libraries, stores access keys, and allows other plugins to hook into it.
 Author: Delicious Brains
-Version: 0.3.4
+Version: 0.3.5
 Author URI: http://deliciousbrains.com/
 Network: True
 Text Domain: amazon-web-services
@@ -22,10 +22,11 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // **********************************************************************
 
-$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3.4';
+$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3.5';
 
 $GLOBALS['aws_meta']['amazon-web-services']['supported_addon_versions'] = array(
-	'amazon-s3-and-cloudfront' => '0.9',
+	'amazon-s3-and-cloudfront'     => '0.9',
+	'amazon-s3-and-cloudfront-pro' => '1.0b1',
 );
 
 require dirname( __FILE__ ) . '/classes/aws-compatibility-check.php';

assets/js/script.js

@@ -1,4 +1,4 @@
-(function($) {
+(function( $ ) {
 
 	$( document ).ready( function() {
 
@@ -9,8 +9,7 @@
 				var $form = $( 'form', $container );
 				if ( 'block' === $form.css( 'display' ) ) {
 					$form.hide();
-				}
-				else {
+				} else {
 					$form.show();
 				}
 				return false;
@@ -23,4 +22,4 @@
 
 	} );
 
-})(jQuery);
+})( jQuery );

assets/sass/styles.scss

@@ -153,51 +153,66 @@ body.toplevel_page_amazon-web-services .wrap {
 			}
 		}
 
-		// Second depth
-		ul {
-			margin: 0 120px 0 80px;
+		// Addons
+		> li > ul {
+			background-color: #fff;
+			border-top: 0;
+			padding: 10px;
+			overflow: hidden;
 
 			article {
-				height: 100px;
-
-				.info {
-					position: static;
-					padding: 25px 20px 25px 110px;
+				width: 244px;
+				float: left;
+				margin-right: 10px;
 
-					ul {
-						margin: 12px 0 0;
-					}
+				img {
+					width: 80px;
+					height: 80px;
 				}
 
 				h1 {
 					font-size: 22px;
+					line-height: 1.2;
 				}
-			}
-
-			// Third depth
-			ul {
-				margin-right: 0;
-
-				article {
-					height: 80px;
 
-					.info {
-						padding: 19px 10px 19px 90px;
+				.info {
+					left: 0;
+					right: 0;
+					margin: 0 auto;
+					width: 210px;
+					text-align: center;
 
-						ul {
-							margin: 8px 0 0;
+					ul {
+						li {
+							margin-right: 10px;
+							font-size: 13px;
+							line-height: 1.6;
 						}
 					}
-
-					h1 {
-						font-size: 20px;
-						font-weight: 300;
-					}
 				}
 			}
+
+			li {
+				margin-bottom: 0;
+			}
+		}
+
+		.amazon-s3-and-cloudfront > article {
+			background-image: url(../img/as3cf-banner-bw.jpg);
+			background-size: 772px 150px;
+			background-repeat: no-repeat;
+			height: 150px;
+
+			@media (min--moz-device-pixel-ratio: 1.3),
+			(-o-min-device-pixel-ratio: 2.6/2),
+			(-webkit-min-device-pixel-ratio: 1.3),
+			(min-device-pixel-ratio: 1.3),
+			(min-resolution: 1.3dppx) {
+				background-image: url(../img/[email protected]);
+			}
 		}
 
-		.amazon-s3-and-cloudfront article {
+		.amazon-s3-and-cloudfront-pro > article {
 			background-image: url(../img/as3cf-banner.jpg);
 			background-size: 772px 250px;
 			background-repeat: no-repeat;
@@ -211,93 +226,52 @@ body.toplevel_page_amazon-web-services .wrap {
 			}
 		}
 
-		.amazon-s3-and-cloudfront-pro article {
-			background: #d4a637 url(../img/icon-pro.svg) no-repeat 15px center;
-			background-size: 70px 70px;
+		.amazon-s3-and-cloudfront-woocommerce > article {
+			background-color: #a46497;
+			margin: 0;
 		}
 
-		.amazon-s3-and-cloudfront-woocommerce article {
-			background: #a46497 url(../img/icon-woocommerce.svg) no-repeat 15px center;
-			background-size: 50px 50px;
+		.amazon-s3-and-cloudfront-edd > article {
+			background-color: #1d2428;
+			background-position: center 50px;
 		}
 
-		.amazon-s3-and-cloudfront-edd article {
-			background: #1d2428 url(../img/icon-edd.svg) no-repeat 15px center;
-			background-size: 50px 50px;
-		}
+		.amazon-s3-and-cloudfront-assets > article {
+			background-color: #0769ad;
+			width: 498px;
+			margin-top: 0;
 
-		.amazon-s3-and-cloudfront-assets article {
-			background: #0769ad url(../img/icon-assets.svg) no-repeat 15px center;
-			background-size: 50px 50px;
-		}
+			img {
+				width: 100px;
+				height: 100px;
+			}
 
-		.amazon-s3-and-cloudfront-wpml article {
-			background: #277f91 url(../img/icon-wpml.svg) no-repeat 15px center;
-			background-size: 50px 50px;
+			h1 {
+				font-size: 30px;
+			}
 		}
 
-		.amazon-s3-and-cloudfront-meta-slider article {
-			background: #03b0d8 url(../img/icon-meta-slider.svg) no-repeat 15px center;
-			background-size: 50px 50px;
+		.amazon-s3-and-cloudfront-wpml > article {
+			background-color: #277f91;
 		}
 
-		.amazon-s3-and-cloudfront-enable-media-replace article {
-			background: #33cc66 url(../img/icon-enable-media-replace.svg) no-repeat 15px center;
-			background-size: 50px 50px;
+		.amazon-s3-and-cloudfront-meta-slider > article {
+			background-color: #03b0d8;
+			margin-right: 0;
 		}
 
-		// Tree hierarchy
-		li li.addon {
-			position: relative;
-
-			&:before,
-			&:after {
-				content: '';
-				position: absolute;
-				display: block;
-				background: #ddd;
-			}
-
-			&:before {
-				top: 0;
-				left: -45px;
-				width: 10px;
-				height: 65px;
-			}
-
-			&:after {
-				top: 55px;
-				left: -45px;
-				width: 35px;
-				height: 10px;
-			}
-
-			// Second depth
-			li:before {
-				height: 45px;
-			}
+		.amazon-s3-and-cloudfront-enable-media-replace > article {
+			background-color: #33cc66;
 
-			li:after {
-				top: 35px;
-			}
-
-			// Adjust height for all but first child
-			&:not(:first-child) {
-				&:before {
-					top: -45px;
-					height: 80px;
-				}
+			img {
+				width: 70px;
+				height: 70px;
+				margin-bottom: 10px;
 			}
+		}
 
-			.info {
-				span.type {
-					position: absolute;
-					top: 10px;
-					right: 15px;
-					font-style: italic;
-					color: #fff;
-				}
-			}
+		.amazon-s3-and-cloudfront-acf-image-crop > article {
+			background-color: #f55e4f;
 		}
 	}
 }