Merge pull request #518 from katzwebservices/version/1.14

Version 1.14

.coveralls.yml

@@ -0,0 +1,3 @@
+src_dir: .
+coverage_clover: ./tmp/clover.xml
+json_path: ./tmp/coveralls-upload.json

.gitignore

@@ -57,11 +57,16 @@ languages/gravityview-pt.po
 
 ## Plugin-specific files:
 
+# Unit tests
+/tmp
+/tests/bin/tmp
+
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
 # JIRA plugin
 atlassian-ide-plugin.xml
 languages/gravityview-de.mo
 
+
 languages/gravityview-de.po

.travis.yml

@@ -0,0 +1,31 @@
+language: php
+
+sudo: false
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+
+env:
+  - WP_VERSION=latest WP_MULTISITE=0
+  - WP_VERSION=4.2 WP_MULTISITE=0
+  - WP_VERSION=4.1 WP_MULTISITE=0
+  - WP_VERSION=4.0 WP_MULTISITE=0
+
+matrix:
+  include:
+  - php: 5.3
+    env: WP_VERSION=latest WP_MULTISITE=1
+
+before_script:
+  - bash tests/bin/install.sh gravityview_test root '' localhost $WP_VERSION
+  - bash tests/bin/travis.sh before
+
+script: phpunit -c phpunit.xml.dist
+
+after_script:
+  - bash tests/bin/travis.sh after
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml

Gruntfile.js

@@ -46,7 +46,8 @@ module.exports = function(grunt) {
 			"assets/js/admin-post-edit.js",
 			"assets/js/admin-widgets.js",
 			"assets/js/admin-entries-list.js",
-			"assets/js/fe-views.js"
+			"assets/js/fe-views.js",
+			"includes/widgets/search-widget/assets/js/source/admin-widgets.js"
 		],
 
         imagemin: {
@@ -79,12 +80,12 @@ module.exports = function(grunt) {
 			searchExt: {
 				files: [{
 		          expand: true,
-		          cwd: 'includes/extensions/search-widget/assets/js/source/',
+		          cwd: 'includes/widgets/search-widget/assets/js/source/',
 		          src: ['*.js','!*.min.js'],
-		          dest: 'includes/extensions/search-widget/assets/js/',
+		          dest: 'includes/widgets/search-widget/assets/js/',
 		          ext: '.min.js'
 		      }]
-			},
+			}
 		},
 
 		watch: {
@@ -93,8 +94,8 @@ module.exports = function(grunt) {
 				tasks: ['uglify:main','newer:jshint']
 			},
 			extension_js: {
-				files: ['includes/extensions/**/*.js','!includes/extensions/**/*.min.js'],
-				tasks: ['uglify:searchExt']
+				files: ['includes/widgets/**/*.js','!includes/widgets/**/*.min.js'],
+				tasks: ['uglify:searchExt','newer:jshint']
 			},
 			templates: {
 				files: ['templates/css/**/*.scss','!templates/css/**/*.css'],

assets/css/scss/admin-global.scss

@@ -16,8 +16,8 @@
 #toplevel_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 {
-	@extend [data-icon]:before;
+#available-widgets [class*=gravityview_search] .widget-title:before{
+	@extend [class^="gv-icon-"]:before;
 	@extend .gv-icon-astronaut-head:before;
 }
 

assets/css/scss/admin-metabox.scss

@@ -11,6 +11,9 @@
 
   padding: 0;
 
+  // Hide until shown using JS
+  display: none;
+
   // For the Advanced Filter plugin, and any other field filters
   .gform-field-filter {
     clear: both;

assets/css/scss/admin-tooltips.scss

@@ -86,3 +86,11 @@ body .ui-tooltip {
     border-color: #999 transparent;
     border-width: 10px 10px 0;
 }
+
+/**
+ * Fix double close icons in jQuery UI dialog boxes
+ * @see https://github.com/katzwebservices/GravityView/issues/438
+ */
+.gv-dialog .ui-dialog-titlebar-close:before {
+    content: '';
+}

assets/css/scss/admin-views.scss

@@ -724,6 +724,11 @@ hr {
 		font-size: 1.1em;
 		clear: left;
 
+		// Hide search mode by default
+		&.gv-setting-container-search_mode {
+		  display: none;
+		}
+
 		&:last-child {
 			// border-bottom: none;
 			padding-bottom: .5em;
@@ -763,10 +768,11 @@ hr {
 
 }
 
-.gv-widget-search-fields, .gv-dialog-options {
+.gv-widget-search-fields, .postbox .gv-dialog-options {
 
 	table {
 		padding-bottom: 15px;
+	  	margin: .5em auto; // Give rows some breathing room around other settings
 
 		td, th {
 			text-align: left;

assets/css/scss/font.scss

@@ -16,9 +16,9 @@ a.icon {
   text-decoration: none;
 }
 
-[data-icon]:before {
+[data-gv-icon]:before {
   font-family: "gravityview" !important;
-  content: attr(data-icon);
+  content: attr(data-gv-icon);
   font-style: normal !important;
   font-weight: normal !important;
   font-variant: normal !important;

assets/js/admin-views.js

@@ -22,6 +22,12 @@
 		// Checks if the execution is on a Start Fresh context
 		startFreshStatus: false,
 
+		/**
+		 * @since 1.14
+		 * @var int The width of the modal dialogs to use for field and widget settings
+		 */
+		dialogWidth: 650,
+
 		init: function () {
 
 			// short tag
@@ -246,6 +252,7 @@
 			vcfg.currentFormId = '';
 			vcfg.togglePreviewButton();
 			$( "#gravityview_view_config, #gravityview_select_template, #gravityview_sort_filter, .gv-form-links" ).hide();
+			viewGeneralSettings.metaboxObj.hide();
 
 		},
 
@@ -421,9 +428,9 @@
 				resizable: false,
 				width: function () {
 
-					// If the window is wider than 550px, use 550
-					if ( $( window ).width() > 550 ) {
-						return 550;
+					// If the window is wider than {vcfg.dialogWidth}px, use vcfg.dialogWidth
+					if ( $( window ).width() > vcfg.dialogWidth ) {
+						return vcfg.dialogWidth;
 					}
 
 					// Otherwise, return the window width, less 10px
@@ -520,6 +527,7 @@
 
 			$( '#gravityview_view_config' ).slideDown( 150 );
 
+			viewGeneralSettings.metaboxObj.show();
 			viewConfiguration.toggleDropMessage();
 			viewConfiguration.init_droppables();
 			viewConfiguration.init_tooltips();
@@ -643,13 +651,13 @@
 			parent.find( ".gv-template-preview" ).dialog( {
 				dialogClass: 'wp-dialog gv-dialog',
 				appendTo: $( "#gravityview_select_template" ),
-				width: 550,
+				width: viewConfiguration.dialogWidth,
 				open: function () {
 					$( '<div class="gv-overlay" />' ).prependTo( '#wpwrap' );
 				},
 				close: function () {
 					$( this ).dialog( "option", "appendTo", parent );
-					$( '#wpwrap > .gv-overlay' ).fadeOut( 'fast', function () {
+					$( '#wpwrap' ).find('> .gv-overlay' ).fadeOut( 'fast', function () {
 						$( this ).remove();
 					} );
 				},
@@ -896,6 +904,7 @@
 				field_label: newField.find( '.gv-field-label' ).attr( 'data-original-title' ),
 				field_type: addButton.attr( 'data-objecttype' ),
 				input_type: newField.attr( 'data-inputtype' ),
+				form_id: vcfg.currentFormId,
 				nonce: gvGlobals.nonce,
 			};
 
@@ -972,6 +981,13 @@
 		 * @return {void}
 		 */
 		enable_publish: function () {
+
+			/**
+			 * Added in ~ WP 3.8
+			 * @see https://github.com/WordPress/WordPress/blob/master/wp-admin/js/post.js#L365-L367
+			 */
+			$( document ).trigger( 'autosave-enable-buttons.edit-post' );
+
 			// Restore saving after settings are generated
 			$( '#publishing-action #publish' ).prop( 'disabled', null ).removeClass( 'button-primary-disabled' );
 		},
@@ -981,6 +997,13 @@
 		 * @return {void}
 		 */
 		disable_publish: function () {
+
+			/**
+			 * Added in ~ WP 3.8
+			 * @see https://github.com/WordPress/WordPress/blob/master/wp-admin/js/post.js#L363-L364
+			 */
+			$( document ).trigger( 'autosave-disable-buttons.edit-post' );
+
 			$( '#publishing-action #publish' ).prop( 'disabled', 'disabled' ).addClass( 'button-primary-disabled' );
 		},
 

gravityview.php

@@ -16,7 +16,7 @@
  * Plugin Name:       	GravityView
  * Plugin URI:        	http://gravityview.co
  * Description:       	Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
- * Version:          	1.13.1
+ * Version:          	1.14
  * Author:            	Katz Web Services, Inc.
  * Author URI:        	http://www.katzwebservices.com
  * Text Domain:       	gravityview
@@ -89,7 +89,7 @@
  */
 final class GravityView_Plugin {
 
-	const version = '1.13.1';
+	const version = '1.14';
 
 	private static $instance;
 

includes/admin/class.render.settings.php

@@ -65,7 +65,7 @@ public static function get_default_field_options( $field_type, $template_id, $fi
 			);
 
 			// Match Table as well as DataTables
-			if( preg_match( '/table/ism', $template_id ) ) {
+			if( preg_match( '/table/ism', $template_id ) && 'single' !== $context ) {
 				$field_options['width'] = array(
 					'type' => 'number',
 					'label' => __('Percent Width', 'gravityview'),
@@ -211,10 +211,10 @@ public static function render_field_options( $field_type, $template_id, $field_i
 			switch( $option['type'] ) {
 				// Hide hidden fields
 				case 'hidden':
-					$output .= '<div class="gv-setting-container screen-reader-text">'. $field_output . '</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
 					break;
 				default:
-					$output .= '<div class="gv-setting-container">'. $field_output .'</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
 			}
 		}
 

includes/admin/metaboxes/views/select-template.php

@@ -14,11 +14,7 @@
 //current value
 $current_template = gravityview_get_template_id( $post->ID );
 
-/**
- * @filter `gravityview_register_directory_template` Fetch available View templates
- * @param array $templates Templates to show
- */
-$templates = apply_filters( 'gravityview_register_directory_template', array() );
+$templates = gravityview_get_registered_templates();
 
 // current input
 ?>

includes/class-admin-approve-entries.php

@@ -311,7 +311,7 @@ public static function update_approved( $entry_id = 0, $approved = 0, $form_id =
 			if( class_exists( 'RGFormsModel' ) ){
 				global $current_user;
       			get_currentuserinfo();
-				RGFormsModel::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note );
+				RGFormsModel::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note, 'gravityview' );
 			}
 
 			/**