Merge pull request #13 from godaddy/release/1.1.0

[WIP] Release 1.1.0

.gitignore

@@ -2,3 +2,4 @@
 vendor/
 node_modules/
 composer.lock
+build/

Gruntfile.js

@@ -1,10 +1,31 @@
-module.exports = function(grunt) {
-
-	require('matchdep').filterDev('grunt-*').forEach( grunt.loadNpmTasks );
+/* jshint node:true */
+module.exports = function( grunt ) {
+	'use strict';
 
 	// Project configuration.
-	grunt.initConfig({
-		pkg: grunt.file.readJSON('package.json'),
+	grunt.initConfig( {
+		pkg: grunt.file.readJSON( 'package.json' ),
+
+		keywords: [
+			'__',
+			'_e',
+			'__ngettext:1,2',
+			'_n:1,2',
+			'__ngettext_noop:1,2',
+			'_n_noop:1,2',
+			'_c',
+			'_nc:4c,1,2',
+			'_x:1,2c',
+			'_nx:4c,1,2',
+			'_nx_noop:4c,1,2',
+			'_ex:1,2c',
+			'esc_attr__',
+			'esc_attr_e',
+			'esc_attr_x:1,2c',
+			'esc_html__',
+			'esc_html_e',
+			'esc_html_x:1,2c'
+		],
 
 		cssmin: {
 			options: {
@@ -57,30 +78,142 @@ module.exports = function(grunt) {
 
 		pot: {
 			options: {
-				omit_header: true,
+				omit_header: false,
 				text_domain: 'godaddy-email-marketing',
 				encoding: 'UTF-8',
 				dest: 'languages/',
-				keywords: [ '__', '_e', '__ngettext:1,2', '_n:1,2', '__ngettext_noop:1,2', '_n_noop:1,2', '_c', '_nc:4c,1,2', '_x:1,2c', '_nx:4c,1,2', '_nx_noop:4c,1,2', '_ex:1,2c', 'esc_attr__', 'esc_attr_e', 'esc_attr_x:1,2c', 'esc_html__', 'esc_html_e', 'esc_html_x:1,2c' ],
+				keywords: '<%= keywords %>',
 				msgmerge: true
 			},
 			files: {
-				src: [ 'godaddy-email-marketing.php', 'includes/*.php', ],
+				src: [ 'godaddy-email-marketing.php', 'includes/*.php' ],
 				expand: true
 			}
 		},
 
 		po2mo: {
 			files: {
-				src: 'languages/*.po',
+				src: [
+					'languages/*.po',
+					'!languages/*.po~'
+				],
 				expand: true
 			}
+		},
+
+		// Check textdomain errors.
+		checktextdomain: {
+			options:{
+				text_domain: 'godaddy-email-marketing',
+				keywords: '<%= keywords %>'
+			},
+			files: {
+				src: [
+					'**/*.php',
+					'!build/**',
+					'!dev-lib/**',
+					'!node_modules/**',
+					'!tests/**'
+				],
+				expand: true
+			}
+		},
+
+		// Build a deployable plugin.
+		copy: {
+			build: {
+				src: [
+					'**',
+					'!.*',
+					'!.*/**',
+					'!.DS_Store',
+					'!assets/**',
+					'!build/**',
+					'!composer.json',
+					'!dev-lib/**',
+					'!Gruntfile.js',
+					'!languages/*.po*',
+					'!node_modules/**',
+					'!npm-debug.log',
+					'!package.json',
+					'!phpcs.ruleset.xml',
+					'!phpunit.xml.dist',
+					'!readme.md',
+					'!tests/**'
+				],
+				dest: 'build',
+				expand: true,
+				dot: true
+			}
+		},
+
+		// Deploys a git Repo to the WordPress SVN repo.
+		wp_deploy: {
+			deploy: {
+				options: {
+					plugin_slug: '<%= pkg.name %>',
+					build_dir: 'build',
+					assets_dir: 'assets'
+				}
+			}
+		},
+
+		// Clean up.
+		clean: {
+			po: {
+				src: [
+					'languages/*.po~'
+				]
+			},
+			build: {
+				src: [
+					'build'
+				]
+			}
 		}
 
-	});
+	} );
+
+	// Load tasks
+	grunt.loadNpmTasks( 'grunt-checktextdomain' );
+	grunt.loadNpmTasks( 'grunt-contrib-clean' );
+	grunt.loadNpmTasks( 'grunt-contrib-copy' );
+	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
+	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
+	grunt.loadNpmTasks( 'grunt-contrib-watch' );
+	grunt.loadNpmTasks( 'grunt-po2mo' );
+	grunt.loadNpmTasks( 'grunt-pot' );
+	grunt.loadNpmTasks( 'grunt-wp-deploy' );
+
+	// Default task.
+	grunt.registerTask( 'default', [
+		'cssmin',
+		'uglify'
+	] );
+
+	// Translates strings.
+	grunt.registerTask( 'update_translation', [
+		'checktextdomain',
+		'pot',
+		'po2mo',
+		'clean:po'
+	] );
+
+	// Executes development tasks.
+	grunt.registerTask( 'develop', [
+		'default',
+		'update_translation'
+	] );
 
-	// Default task(s).
-	grunt.registerTask('default', ['cssmin', 'uglify']);
-	grunt.registerTask('update_translation', ['pot','po2mo']);
+	/*
+	 * Deploys to wordpress.org.
+	 *
+	 * Execute the develop command and commit changes before deploying.
+	 */
+	grunt.registerTask( 'deploy', [
+		'copy',
+		'wp_deploy',
+		'clean:build'
+	] );
 
 };

css/admin.css

@@ -1,11 +1,129 @@
-div.updated.gem-identity {
+.about-wrap {
+	margin: 10px 20px 0 2px;
+}
+
+.intro {
+	float: left;
+	width: 100%;
+}
+
+div.updated.updated.gem-identity {
 	background-image: url( '../images/gem.svg' );
 	background-repeat: no-repeat;
-	background-position: 15px 20px;
+	background-position: 15px 15px;
 	background-size: 80px;
+	display: block !important;
 	padding-left: 110px !important;
 }
 
-div.updated.gem-identity .description .button {
-	margin: 5px 10px;
+div.updated.gem-identity p:first-child {
+	color: #23282D;
+	font-size: 1.1em;
+	font-weight: bold;
+}
+
+.description .button {
+	margin: 5px;
+}
+
+.description .button + .button {
+	margin-left: 0px;
+}
+
+.col {
+	float: left;
+}
+
+.col.banner {
+	outline: 1px solid #ccc;
+}
+
+.col.banner img {
+	margin-bottom: 0;
+}
+
+.panel {
+	display: none;
+	float: left;
+	width: 100%;
+}
+
+.intro h1 {
+	margin-right: 0;
+	font-size: 1.53333em;
+	margin: 0 0 15px 0;
+	padding: 9px 15px 4px 0;
+}
+
+.intro h1 sup {
+	background: #fff;
+	color: #666;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px 10px;
+	white-space: nowrap;
+	vertical-align: top;
+}
+
+@media screen and (min-width: 783px) {
+	#settings .form-table th {
+		width: 30%;
+	}
+}
+
+#setting-errors {
+	float: left;
+	width: 100%;
+}
+
+div.updated,
+div.error,
+.notice {
+	display: none !important;
+}
+
+#setting-errors > div.updated,
+#setting-errors > div.error,
+#setting-errors > .notice {
+	clear: both;
+	display: block !important;
+  margin-top: 1.25em;
+}
+
+code.gem-form-id {
+	display: inline-block;
+	margin-top: 1px;
+	padding: 6px 10px 5px;
+}
+
+input.copied,
+input.copied:focus {
+	border-color: #46b450;
+	box-shadow: 0 0 2px rgba( 70, 180, 80, 0.8 );
+}
+
+input.copied::selection {
+	background-color: #d5f4d8;
+}
+
+input.copied::-moz-selection {
+	background-color: #d5f4d8;
+}
+
+.button.copy-to-clipboard {
+	display: inline-block;
+	height: 30px;
+	margin-top: 1px;
+}
+
+.mobile .button.copy-to-clipboard {
+	display: none;
+}
+
+@media screen and (max-width: 782px) {
+	.button.copy-to-clipboard {
+		height: 38px;
+		margin: 1px 1px 10px 1px;
+		position: relative;
+	}
 }

css/gem.css

@@ -35,10 +35,10 @@ form.gem-form label {
 /**
  * Messages
  */
-.gem-error {
+form.gem-form p.gem-error {
 	background-color: #ffebe8;
 	border: 1px solid #c00;
-	padding: 0.5em 1em;
+	padding: .25em .5em;
 	margin: 0.6em 0;
 	border-radius: 3px;
 }