Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Release 1.1.0 #13

Merged
merged 79 commits into from
Jun 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
5dfbf8d
Overhauled the UI & UX
valendesigns Apr 20, 2016
04e6ea7
Merge develop
valendesigns Apr 20, 2016
18779f3
Test coverage for the new UI
valendesigns Apr 21, 2016
3cf69da
Correct the settings page method and test
valendesigns Apr 21, 2016
97c04bd
Fix tests in WP 3.8
valendesigns Apr 21, 2016
1d93376
Merge branch 'feature/ui-ux' into release/1.1.0
valendesigns Apr 21, 2016
5d34a1e
Bump version to 1.1.0 & document changes
valendesigns Apr 21, 2016
de8655d
Use Grunt to deploy to .org
valendesigns Apr 21, 2016
649d275
Set the shortcode default value
valendesigns Apr 21, 2016
03ba48d
Disable JS sniff
valendesigns Apr 21, 2016
e0186f2
Update translations
valendesigns Apr 21, 2016
75e6fb7
Add dependencies badge
valendesigns Apr 21, 2016
573b4e0
Generate badge
valendesigns Apr 21, 2016
5033e34
Do not deploy po & pot files
valendesigns Apr 21, 2016
7bf0cba
Limit activation notice
valendesigns Apr 21, 2016
0f12268
Fix branding
valendesigns Apr 21, 2016
7ed715e
GoLF Automated checkin from HB (4/21/2016 11:19:38 AM)
Apr 21, 2016
86bb432
Grunt test domain checks
valendesigns Apr 22, 2016
f048cdf
Update translations
valendesigns Apr 22, 2016
fd95b7e
Remove invalid session API endpoints
valendesigns Apr 22, 2016
2798587
Refactor widget JS and fic coding standards
valendesigns Apr 22, 2016
1450eb7
chmod lang files to 644
valendesigns Apr 22, 2016
d03a0ce
Fix jscs issues
valendesigns Apr 22, 2016
e664d8b
Remove thickbox resize JS
valendesigns Apr 22, 2016
60987ad
Remove tab from refresh redirect url
valendesigns Apr 22, 2016
560ea58
Update copy
valendesigns May 4, 2016
0a1f6f3
Fix deploy
valendesigns May 4, 2016
23acd85
Remove tb_click
valendesigns May 4, 2016
5288ad0
Copy updates & button links
valendesigns May 5, 2016
cf73235
Update the readme
valendesigns May 5, 2016
44f851c
Add shortcode copy to clipboard
valendesigns May 5, 2016
0daa06c
Update i18n
valendesigns May 5, 2016
c122e82
Add grunt-contrib-clean to remove build and conflicting *.po~ files
valendesigns May 5, 2016
7f8868d
Delete gem-valid-creds option in uninstall routine
valendesigns May 5, 2016
b4c3e84
Add mobile list table support
valendesigns May 5, 2016
3b132d3
Make the form title standout
valendesigns May 5, 2016
332bb76
Fix mobile button style
valendesigns May 5, 2016
06db42e
Clean up mobile button
valendesigns May 5, 2016
50b05e7
Create a default form if no forms exist
valendesigns May 8, 2016
257f035
GoLF Automated checkin by jxbennett (5/10/2016 10:36:44 AM)
May 10, 2016
2ccd923
Build alternative Mock HTTP and refactor unit tests
valendesigns May 14, 2016
d701f56
Fix setup & teardown docblocks
valendesigns May 14, 2016
0c1f737
Update i18n
valendesigns May 14, 2016
ac49c4c
Add docblocks to test cases
valendesigns May 14, 2016
4f7eff3
Explicitly set widget methods to public
valendesigns May 14, 2016
65b0683
Update widget description
valendesigns May 14, 2016
cdefa26
Adjust the way Mock_Http_Response is called and cleaned up
valendesigns May 14, 2016
49b6c63
Clean up dispatcher
valendesigns May 14, 2016
4e79ba4
Use pre_http_request to filter the API response
valendesigns May 15, 2016
ca8374f
Update dev-lib
valendesigns May 15, 2016
812c9ca
Update copy & i18n
valendesigns May 23, 2016
25741e6
GoLF Automated checkin by jxbennett (5/24/2016 2:17:53 PM)
May 24, 2016
92ed593
Add CRUD coverage for the platform team
valendesigns May 25, 2016
aa79caf
Allow empty widget title
valendesigns May 28, 2016
3678b43
Make copy changes to clarify adding credentials
valendesigns Jun 6, 2016
b082524
Set the initial form ID value if one exists
valendesigns Jun 6, 2016
9c42590
Add unit test coverage for initial form ID
valendesigns Jun 6, 2016
4159c81
Merge i18n into release/1.1.0
fjarrett-godaddy Jun 6, 2016
18ee61e
Gruntfile change to keep headers in POT
fjarrett-godaddy Jun 6, 2016
e8f5120
Update dev-lib
fjarrett-godaddy Jun 6, 2016
720c346
Update POT files
fjarrett-godaddy Jun 6, 2016
a8fb1c4
Fix PO errors
fjarrett-godaddy Jun 7, 2016
1dc99ed
Update MO files
fjarrett-godaddy Jun 7, 2016
b9816cc
Make option API params required
valendesigns Jun 8, 2016
0034628
Update dev-lib
valendesigns Jun 8, 2016
a34df29
Improve context in some strings
fjarrett-godaddy Jun 8, 2016
6cf2b41
Update PO files
fjarrett-godaddy Jun 8, 2016
2088512
Use the control methods in tests
valendesigns Jun 8, 2016
0bc3dfe
Return true if response code is OK
valendesigns Jun 8, 2016
9552d92
Merge branch 'release/1.1.0' of https://github.com/godaddy/wp-godaddy…
valendesigns Jun 8, 2016
c627555
GoLF Automated checkin from HB (6/9/2016 11:17:40 AM)
Jun 9, 2016
232158c
GoLF Automated checkin by jxbennett (6/9/2016 3:33:34 PM)
Jun 9, 2016
8b0d204
Merge i18n into release/1.1.0
fjarrett-godaddy Jun 10, 2016
db04cc0
Fix error in tl.po, refresh MO files
fjarrett-godaddy Jun 10, 2016
5c80173
Updated screenshots
fjarrett-godaddy Jun 10, 2016
6f41915
Fix screenshot-2
fjarrett-godaddy Jun 10, 2016
74e4ce1
Use SPDX license format, shorthand repo field
fjarrett-godaddy Jun 10, 2016
d599415
Readme update
fjarrett-godaddy Jun 10, 2016
e582227
Use fake 6 digit form code
fjarrett-godaddy Jun 10, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .david-dev
Empty file.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
vendor/
node_modules/
composer.lock
build/
159 changes: 146 additions & 13 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down Expand Up @@ -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'
] );

};
Binary file modified assets/screenshot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 122 additions & 4 deletions css/admin.css
Original file line number Diff line number Diff line change
@@ -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;
}
}
2 changes: 1 addition & 1 deletion css/admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/gem.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion css/gem.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading