Merge pull request #347 from katzwebservices/dev/1.7.6

Dev/1.7.6

Author: zackkatz

Gruntfile.js

@@ -1,5 +1,9 @@
 module.exports = function(grunt) {
 
+	// Only need to install one package and this will load them all for you. Run:
+	// npm install --save-dev load-grunt-tasks
+	require('load-grunt-tasks')(grunt);
+
 	grunt.initConfig({
 
 		pkg: grunt.file.readJSON('package.json'),
@@ -118,19 +122,80 @@ module.exports = function(grunt) {
 
 			// Create a ZIP file
 			zip: 'python /usr/bin/git-archive-all ../gravityview.zip'
+		},
+
+		// Build translations without POEdit
+		makepot: {
+			target: {
+				options: {
+					mainFile: 'gravityview.php',
+					type: 'wp-plugin',
+					domainPath: '/languages',
+					updateTimestamp: false,
+					exclude: ['node_modules/.*', 'assets/.*', 'vendor/.*', 'includes/lib/xml-parsers/.*', 'includes/lib/jquery-cookie/.*', 'includes/lib/standalone-phpenkoder/.*' ],
+					potHeaders: {
+						poedit: true,
+						'x-poedit-keywordslist': true
+					},
+					processPot: function( pot, options ) {
+						pot.headers['language'] = 'en_US';
+						pot.headers['language-team'] = 'Katz Web Services, Inc. <support@katz.co>';
+						pot.headers['last-translator'] = 'Katz Web Services, Inc. <support@katz.co>';
+						pot.headers['report-msgid-bugs-to'] = 'https://gravityview.co/support/';
+
+						var translation,
+							excluded_meta = [
+								'GravityView',
+								'Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.',
+								'http://gravityview.co',
+								'Katz Web Services, Inc.',
+								'http://www.katzwebservices.com'
+							];
+
+						for ( translation in pot.translations[''] ) {
+							if ( 'undefined' !== typeof pot.translations[''][ translation ].comments.extracted ) {
+								if ( excluded_meta.indexOf( pot.translations[''][ translation ].msgid ) >= 0 ) {
+									console.log( 'Excluded meta: ' + pot.translations[''][ translation ].msgid );
+									delete pot.translations[''][ translation ];
+								}
+							}
+						}
+
+						return pot;
+					}
+				}
+			}
+		},
+
+		// Add textdomain to all strings, and modify existing textdomains in included packages.
+		addtextdomain: {
+			options: {
+				textdomain: 'gravityview',    // Project text domain.
+				updateDomains: [ 'gravityview', 'gravityforms', 'edd_sl', 'edd' ]  // List of text domains to replace.
+			},
+			target: {
+				files: {
+					src: [
+						'*.php',
+						'**/*.php',
+						'!node_modules/**',
+						'!tests/**',
+						'!includes/lib/xml-parsers/**',
+						'!includes/lib/jquery-cookie/**',
+						'!includes/lib/standalone-phpenkoder/**'
+					]
+				}
+			}
 		}
 	});
 
-	grunt.loadNpmTasks('grunt-sass');
-	grunt.loadNpmTasks("grunt-contrib-jshint");
-	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-wp-readme-to-markdown');
-	grunt.loadNpmTasks('grunt-potomo');
-	grunt.loadNpmTasks('grunt-exec');
-    grunt.loadNpmTasks('grunt-contrib-imagemin');
-    grunt.loadNpmTasks('grunt-newer');
-
-	grunt.registerTask( 'default', [ 'sass', 'uglify', 'exec:transifex','potomo', 'imagemin', 'watch' ] );
+	// Still have to manually add this one...
+	grunt.loadNpmTasks('grunt-wp-i18n');
+
+	// Regular CSS/JS/Image Compression stuff
+	grunt.registerTask( 'default', [ 'sass', 'uglify', 'imagemin', 'watch' ] );
+
+	// Translation stuff
+	grunt.registerTask( 'translate', [ 'exec:transifex', 'potomo', 'addtextdomain', 'makepot' ] );
 
 };

assets/css/admin-global.css

@@ -13,6 +13,7 @@
 @import "font";
 
 /* add gravityview menu icon */
+#toplevel_page_edit-post_type-gravityview-page-gravityview_settings .wp-menu-image:before,
 #adminmenu .menu-icon-gravityview div.wp-menu-image:before,
 #available-widgets [class*=gv_recent_entries] .widget-title:before,
 #available-widgets [class*=gravityview_search] .widget-title:before {

assets/css/admin-license-key-fields.css

@@ -0,0 +1,21 @@
+#gform-settings .gforms_form_settings {
+
+  // Margin right and bottom - provide the spacing for the buttons
+  .edd-license-key {
+    float: left;
+    margin: 0 10px 10px 0;
+  }
+
+  // Group the buttons together to prevent one wrapping and others not
+  .gv-edd-button-wrapper {
+    float: left;
+    padding-left: 0;
+
+    .button,
+    .button-primary {
+      margin: 0 10px 10px 0!important;
+    }
+
+  }
+  
+}

assets/css/admin-settings.css

@@ -1,6 +1,9 @@
+@import "admin-license-key-fields";
+
 /**
  * Modify the GFAddon App Settings page
  */
+.admin_page_gravityview_settings,
 .gravityview_page_gravityview_settings {
 
   .gform_tab_content > h3 {
@@ -70,10 +73,6 @@
     display: none;
   }
 
-  #gaddon-setting-row-license_key .button {
-    margin: 0 0 0 10px
-  }
-
   // Add the stars to the top
   #gform_tab_group {
     padding: 0;

assets/css/scss/admin-global.scss

@@ -64,6 +64,7 @@
 						break;
 					case 'deactivated':
 					case 'site_inactive':
+					default:
 						hidebuttons = $('[data-edd_action=deactivate_license]' );
 						showbuttons = $('[data-edd_action=activate_license],[data-edd_action=check_license]' );
 						break;