Skip to content

Commit

Permalink
Deploying version 0.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bradt committed Jul 29, 2015
1 parent 16702e0 commit 870b19e
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 116 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
**Tags:** uploads, amazon, s3, mirror, admin, media, cdn, cloudfront
**Requires at least:** 3.5
**Tested up to:** 4.3
**Stable tag:** 0.9.1
**Stable tag:** 0.9.2
**License:** GPLv3

Copies files to Amazon S3 as they are uploaded to the Media Library. Optionally configure Amazon CloudFront for faster delivery.
Expand Down Expand Up @@ -63,6 +63,9 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin

## Changelog ##

### 0.9.2 - 2015-07-29- ###
* Bug fix: Accidentally released the sidebar for after we launch the pro version

### 0.9.1 - 2015-07-29- ###
* Improvement: Access denied sample IAM policy replaced with link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
* Improvement: Access denied messages on bucket selection or bucket creation now link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/styles.css

Large diffs are not rendered by default.

66 changes: 16 additions & 50 deletions assets/sass/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@
line-height: 1.4;
}

ul {
margin-left: 20px;
list-style-type: disc;
}

li {
line-height: 1.4;
}
Expand Down Expand Up @@ -637,8 +642,15 @@
(min-resolution: 1.3dppx) {

.as3cf-banner {
background-image: url(../img/[email protected]);
background-size: 292px 156px;
background-image: url(../img/[email protected]);
background-size: 292px 156px;
width: 292px;
height: 156px;
display: block;

img {
display: none;
}
}
}

Expand All @@ -654,54 +666,8 @@
* Misc
*/
.as3cf-banner {
margin-top: 28px;
width: 292px;
height: 156px;
display: block;
background-image: url(../img/snail-banner.jpg);
position: relative;

h1 {
font-size: 28px;
color: #fff;
font-weight: 200;
margin: 0;
position: absolute;
bottom: 25px;
left: 20px;
text-decoration: none;
}
}

.as3cf-upgrade-details {
background-color: #73833b;
padding: 20px;
color: #fff;
font-size: 13px;
margin: 0;
display: block;
text-decoration: none;

p {
margin: 0;
}

a {
color: #fff;
font-weight: bold;
text-decoration: none;
font-size: 16px;

&:hover {
color: #fff;
opacity: 0.9;
}
}

ul {
margin-top: 0;
margin-left: 16px;
list-style-type: disc;
img {
display: block;
}
}

Expand Down
55 changes: 19 additions & 36 deletions languages/amazon-s3-and-cloudfront-en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ msgid ""
msgstr ""
"Project-Id-Version: amazon-s3-and-cloudfront\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2015-07-29 09:52-0300\n"
"POT-Creation-Date: 2015-07-29 16:53-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: builds/amazon-s3-and-cloudfront/classes/amazon-s3-and-cloudfront.php:84
Expand Down Expand Up @@ -518,66 +518,49 @@ msgstr ""
msgid "Save Changes"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:10
msgid "Upload existing Media Library to S3"
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:6
msgid "Pro Version?"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:11
msgid "Find & replace file URLs in content"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:12
msgid "Manage S3 files in WordPress"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:13
msgid "Assets addon - Serve your CSS & JS from S3/CloudFront"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:14
msgid "WooCommerce addon"
msgid ""
"We're working on a pro version that will include the following features:"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:15
msgid "Easy Digital Downloads addon"
msgid "Copy existing Media Library to S3"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:16
msgid "PriorityExpert™ email support"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:19
msgid "Visit deliciousbrains.com &rarr;"
msgid "Serve theme JS & CSS from S3/CloudFront"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:26
msgid "Get 20% Off!"
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:17
msgid ""
"WooCommerce & <abbr title=\"Easy Digital Downloads\">EDD</abbr> integration"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:29
#, php-format
msgid ""
"Submit your name and email and we’ll send you a coupon for 20% off your "
"upgrade."
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:18
msgid "Awesome email support"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:33
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:22
msgid "Your Email"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:37
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:26
msgid "First Name"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:41
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:30
msgid "Last Name"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:48
msgid "Send me the coupon"
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:37
msgid "Send me news about a pro version"
msgstr ""

#: builds/amazon-s3-and-cloudfront/view/sidebar.php:52
#: builds/amazon-s3-and-cloudfront/view/sidebar.php:41
msgid ""
"We promise we will not use your email for anything else and you can "
"unsubscribe with 1-click anytime."
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
Tags: uploads, amazon, s3, mirror, admin, media, cdn, cloudfront
Requires at least: 3.5
Tested up to: 4.3
Stable tag: 0.9.1
Stable tag: 0.9.2
License: GPLv3

Copies files to Amazon S3 as they are uploaded to the Media Library. Optionally configure Amazon CloudFront for faster delivery.
Expand Down Expand Up @@ -59,6 +59,9 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin

== Changelog ==

= 0.9.2 - 2015-07-29- =
* Bug fix: Accidentally released the sidebar for after we launch the pro version

= 0.9.1 - 2015-07-29- =
* Improvement: Access denied sample IAM policy replaced with link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
* Improvement: Access denied messages on bucket selection or bucket creation now link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
Expand Down
39 changes: 14 additions & 25 deletions view/sidebar.php
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
<div class="as3cf-sidebar">

<a class="as3cf-banner" href="https://deliciousbrains.com/wp-offload-s3/?utm_source=insideplugin&amp;utm_medium=web&amp;utm_content=sidebar&amp;utm_campaign=os3-free-plugin">
<h1>Upgrade</h1>
</a>

<div class="as3cf-upgrade-details">

<ul>
<li><?php echo wptexturize( __( 'Upload existing Media Library to S3', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Find & replace file URLs in content', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Manage S3 files in WordPress', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Assets addon - Serve your CSS & JS from S3/CloudFront', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'WooCommerce addon', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Easy Digital Downloads addon', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'PriorityExpert™ email support', 'as3cf' ) ); // xss ok ?></li>
</ul>

<p><a href="https://deliciousbrains.com/wp-offload-s3/?utm_source=insideplugin&amp;utm_medium=web&amp;utm_content=sidebar&amp;utm_campaign=os3-free-plugin"><?php echo __( 'Visit deliciousbrains.com &rarr;', 'as3cf' ); ?></a></p>

</div>
<div class="as3cf-banner"><img src="<?php echo esc_url( plugins_url( 'assets/img/snail-banner.jpg', $this->plugin_file_path ) ); ?>" width="292" height="156" alt="" /></div>

<form method="post" action="https://deliciousbrains.com/email-subscribe/" target="_blank" class="subscribe block">
<?php $user = wp_get_current_user(); ?>
<h2><?php _e( 'Pro Version?', 'as3cf' ); ?></h2>

<h2><?php _e( 'Get 20% Off!', 'as3cf' ); ?></h2>
<?php $user = wp_get_current_user(); ?>

<p class="intro">
<?php echo wptexturize( __( 'Submit your name and email and we’ll send you a coupon for 20% off your upgrade.', 'as3cf' ) ); // xss ok ?>
<?php echo wptexturize( __( "We're working on a pro version that will include the following features:", 'as3cf' ) ); // xss ok ?>
</p>

<ul>
<li><?php echo wptexturize( __( 'Copy existing Media Library to S3', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Serve theme JS & CSS from S3/CloudFront', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'WooCommerce & <abbr title="Easy Digital Downloads">EDD</abbr> integration', 'as3cf' ) ); // xss ok ?></li>
<li><?php echo wptexturize( __( 'Awesome email support', 'as3cf' ) ); // xss ok ?></li>
</ul>

<div class="field">
<input type="email" name="email" value="<?php echo esc_attr( $user->user_email ); ?>" placeholder="<?php _e( 'Your Email', 'as3cf' ); ?>"/>
</div>
Expand All @@ -41,11 +30,11 @@
<input type="text" name="last_name" value="<?php echo esc_attr( trim( $user->last_name ) ); ?>" placeholder="<?php _e( 'Last Name', 'as3cf' ); ?>"/>
</div>

<input type="hidden" name="campaigns[]" value="5" />
<input type="hidden" name="campaigns[]" value="3" />
<input type="hidden" name="source" value="1" />

<div class="field submit-button">
<input type="submit" class="button" value="<?php _e( 'Send me the coupon', 'as3cf' ); ?>"/>
<input type="submit" class="button" value="<?php _e( 'Send me news about a pro version', 'as3cf' ); ?>"/>
</div>

<p class="promise">
Expand All @@ -63,7 +52,7 @@
</a>
</li>
<li>
<a href="https://deliciousbrains.com/?utm_source=insideplugin&amp;utm_medium=web&amp;utm_content=sidebar&amp;utm_campaign=os3-free-plugin">
<a href="https://deliciousbrains.com/?utm_source=insideplugin&utm_medium=web&utm_content=sidebar&utm_campaign=as3cf">
<img src="//www.gravatar.com/avatar/e62fc2e9c8d9fc6edd4fea5339036a91?size=64" alt="" width="32" height="32">
<span>Delicious Brains Inc.</span>
</a>
Expand Down
4 changes: 2 additions & 2 deletions wordpress-s3.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: http://wordpress.org/extend/plugins/amazon-s3-and-cloudfront/
Description: Automatically copies media uploads to Amazon S3 for storage and delivery. Optionally configure Amazon CloudFront for even faster delivery.
Author: Brad Touesnard
Version: 0.9.1
Version: 0.9.2
Author URI: http://bradt.ca
Network: True
Text Domain: as3cf
Expand All @@ -26,7 +26,7 @@
// Then completely rewritten.
*/

$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '0.9.1';
$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '0.9.2';

$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['supported_addon_versions'] = array(
'amazon-s3-and-cloudfront-pro' => '1.0b1',
Expand Down

0 comments on commit 870b19e

Please sign in to comment.