Merge pull request #586 from katzwebservices/develop

Version 1.15.2

.gitignore

@@ -70,3 +70,5 @@ languages/gravityview-de.mo
 
 
 languages/gravityview-de.po
+
+docs/config.doxygen

assets/css/scss/admin-entries-list.scss

@@ -10,60 +10,64 @@
  * @since 1.0.0
  */
 
-.gv-approve-column {
-	text-align: center !important;
-}
-
-.widefat tr th.gv-approve-column {
-	padding-top: 6px; /* Reduce the padding from 10 to 8 to account for the astronaut's head */
-}
-
-th.gv-approve-column a:before {
-	padding: 0;
-	margin:0;
-	content: "a";
-	display: inline-block;
-	-webkit-font-smoothing: antialiased;
-	font: normal 22px/1 'gravityview';
-	vertical-align: top;
-	color: #555;
-}
-
-
-.toggleApproved {
-	padding: 0;
-	margin:0;
-	display: inline-block;
-}
-
-.loading {
-	cursor: wait;
-}
-
-.toggleApproved:before {
-	padding: 0;
-	margin:0;
-	content: "\f158";
-	color: #940303;
-	display: inline-block;
-	-webkit-font-smoothing: antialiased;
-	font: normal 20px/1 'dashicons';
-	vertical-align: top;
-}
-
-.toggleApproved.entry_approved:before {
-	content: "\f147";
-	color: #00ac15;
-	font-size: 26px;
-	text-indent: -4px;
-}
-
-
-
-
-
-
-
-
-
-
+#lead_form {
+
+	.gv-approve-column {
+		width: 40px;
+		text-align: center;
+	}
+
+	// Center the star - looks better when we widen the approval column
+	th.check-column:nth-child(2) {
+		text-align: center;
+	}
+
+	// Floaty's got a kinda big head. Change 8px top/bottom to better balanced
+	thead th.gv-approve-column {
+		padding-top: 12px;
+		padding-bottom: 4px;
+	}
+
+	// Add Floaty's head
+	th.gv-approve-column a:before {
+		padding: 0;
+		margin: 0;
+		content: "a";
+		display: inline-block;
+		-webkit-font-smoothing: antialiased;
+		font: normal 22px/1 'gravityview';
+		vertical-align: top;
+		color: #555;
+	}
+
+	.toggleApproved {
+		padding: 0;
+		margin: 0;
+		display: inline-block;
+	}
+
+	.loading {
+		cursor: wait;
+	}
+
+	// X icon
+	.toggleApproved:before {
+		padding: 0;
+		margin: 0;
+		content: "\f158";
+		color: #940303;
+		display: inline-block;
+		-webkit-font-smoothing: antialiased;
+		font: normal 20px/1 'dashicons';
+		vertical-align: top;
+	}
+
+	// Tick mark icon
+	.toggleApproved.entry_approved:before {
+		content: "\f147";
+		color: #00ac15;
+		font-size: 26px;
+		text-indent: -4px;
+	}
+
+}

assets/js/admin-entries-list.js

@@ -38,7 +38,7 @@
 
 			self.setInitialApprovedEntries();
 
-			$( '.toggleApproved' ).click( self.toggleApproved );
+			$( '.toggleApproved' ).on( 'click', self.toggleApproved );
 
 		}
 
@@ -81,7 +81,7 @@
 		/**
 		 * Add column for each entry
 		 */
-		$( 'td:has(img[src*="star"])' ).after( '<td class="gv-approve-column"><a href="#" class="toggleApproved" title="' + gvGlobals.approve_title + '"></a></td>' );
+		$( 'th.check-column[scope=row]:has(img[src*="star"]),td:has(img[src*="star"])' ).after( '<td class="gv-approve-column"><a href="#" class="toggleApproved" title="' + gvGlobals.approve_title + '"></a></td>' );
 
 	};
 

assets/js/admin-views.js

@@ -457,25 +457,28 @@
 
 		/**
 		 * Update the field display to show the custom label while editing
-		 * @param {jQuery DOM} dialog The dialog object
+		 * @param {jQuery} dialog The dialog object
 		 */
 		setCustomLabel: function ( dialog ) {
 
 			// Does the field have a custom label?
 			var $custom_label = $( '[name*=custom_label]', dialog );
 
-			var show_label = $( '[name*=show_label]', dialog ).is( ':checked' );
-
 			var $label = dialog.parents( '.gv-fields' ).find( '.gv-field-label' );
 
 			// If there's a custom title, use it for the label.
-			if ( $custom_label.length && $custom_label.val().trim().length && show_label ) {
+			if ( $custom_label.length ) {
 
-				$label.text( $custom_label.val().trim() );
+				var custom_label_text = $custom_label.val().trim();
 
-				// If there's no custom title, then use the original
-				// @see GravityView_Admin_View_Item::getOutput()
-				$label.html( $label.attr( 'data-original-title' ) );
+				// Make sure the custom label isn't empty
+				if( custom_label_text.length > 0 ) {
+					$label.html( custom_label_text );
+				} else {
+					// If there's no custom title, then use the original
+					// @see GravityView_Admin_View_Item::getOutput()
+					$label.html( $label.attr( 'data-original-title' ) );
+				}
 
 			}
 

assets/js/support.js

@@ -11,7 +11,10 @@ HS.beacon.config({
 	topArticles: true,
 	icon: 'question',
 	zIndex: 9991,
-	translation: gvSupport.translation
+	translation: gvSupport.translation,
+	docs: {
+		baseUrl: gvSupport.protocol + '://gravityview.helpscoutdocs.com',
+	}
 });
 
 HS.beacon.ready(function() {