Completed
Pull Request — master (#1105)
by Zack
14:12 queued 09:29
created
includes/admin/metaboxes/views/view-configuration.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+				do_action('gravityview_render_field_pickers', 'directory' );
32 32
 
33
-            ?>
33
+			?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
-                }
61
-			    ?>
58
+				if(!empty( $curr_template ) ) {
59
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
+				}
61
+				?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+				do_action('gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+				do_action('gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 
169 169
 		if( empty( $connected_views ) ) {
170 170
 
171
-		    $menu_items['gravityview'] = array(
171
+			$menu_items['gravityview'] = array(
172 172
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
173 173
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
174 174
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 		// If there were no items added, then let's create the parent menu
200 200
 		if( $sub_menu_items ) {
201 201
 
202
-		    $sub_menu_items[] = array(
203
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
204
-                'link_class' => 'gv-create-view',
205
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
206
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
207
-			    'capabilities'   => array( 'edit_gravityviews' ),
208
-            );
202
+			$sub_menu_items[] = array(
203
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
204
+				'link_class' => 'gv-create-view',
205
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
206
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
207
+				'capabilities'   => array( 'edit_gravityviews' ),
208
+			);
209 209
 
210 210
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
211 211
 			$sub_menu_items[] = array(
@@ -588,12 +588,12 @@  discard block
 block discarded – undo
588 588
 	 * Render html for displaying available fields based on a Form ID
589 589
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
590 590
 	 *
591
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
591
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
592 592
 	 * @access public
593
-     *
593
+	 *
594 594
 	 * @param int $form Gravity Forms Form ID (default: '')
595 595
 	 * @param string $context (default: 'single')
596
-     *
596
+	 *
597 597
 	 * @return void
598 598
 	 */
599 599
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 
608 608
 		if ( ! is_array( $blacklist_field_types ) ) {
609 609
 
610
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
610
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
611 611
 
612 612
 			$blacklist_field_types = array();
613 613
 		}
@@ -739,12 +739,12 @@  discard block
 block discarded – undo
739 739
 				/**
740 740
 				 * @since 1.7.2
741 741
 				 */
742
-			    'other_entries' => array(
743
-				    'label'	=> __('Other Entries', 'gravityview'),
744
-				    'type'	=> 'other_entries',
745
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
746
-			    ),
747
-	        );
742
+				'other_entries' => array(
743
+					'label'	=> __('Other Entries', 'gravityview'),
744
+					'type'	=> 'other_entries',
745
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
746
+				),
747
+			);
748 748
 
749 749
 			if( 'single' !== $zone) {
750 750
 
@@ -910,9 +910,9 @@  discard block
 block discarded – undo
910 910
 
911 911
 										if ($form_id) {
912 912
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
913
-                                        } else {
913
+										} else {
914 914
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
915
-                                        }
915
+										}
916 916
 
917 917
 										if( !$original_item ) {
918 918
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -994,13 +994,13 @@  discard block
 block discarded – undo
994 994
 	}
995 995
 
996 996
 	/**
997
-     * Renders "Add Field" tooltips
998
-     *
999
-     * @since 2.0.11
1000
-     *
997
+	 * Renders "Add Field" tooltips
998
+	 *
999
+	 * @since 2.0.11
1000
+	 *
1001 1001
 	 * @param string $context "directory", "single", or "edit"
1002
-     *
1003
-     * @return void
1002
+	 *
1003
+	 * @return void
1004 1004
 	 */
1005 1005
 	function render_field_pickers( $context = 'directory' ) {
1006 1006
 
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
             </div>
1028 1028
 			<?php
1029 1029
 		}
1030
-    }
1030
+	}
1031 1031
 
1032 1032
 	/**
1033 1033
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1099,59 +1099,59 @@  discard block
 block discarded – undo
1099 1099
 
1100 1100
 		// Don't process any scripts below here if it's not a GravityView page.
1101 1101
 		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1102
-		    return;
1102
+			return;
1103 1103
 		}
1104 1104
 
1105
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1106
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1107
-
1108
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1109
-
1110
-        //enqueue scripts
1111
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1112
-
1113
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1114
-            'cookiepath' => COOKIEPATH,
1115
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1116
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1117
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1118
-            'label_close' => __( 'Close', 'gravityview' ),
1119
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1120
-            'label_continue' => __( 'Continue', 'gravityview' ),
1121
-            'label_ok' => __( 'Ok', 'gravityview' ),
1122
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1123
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1124
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1125
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1126
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1127
-        ));
1128
-
1129
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1130
-
1131
-        // Enqueue scripts needed for merge tags
1132
-        self::enqueue_gravity_forms_scripts();
1105
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1106
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1107
+
1108
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1109
+
1110
+		//enqueue scripts
1111
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1112
+
1113
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1114
+			'cookiepath' => COOKIEPATH,
1115
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1116
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1117
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1118
+			'label_close' => __( 'Close', 'gravityview' ),
1119
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1120
+			'label_continue' => __( 'Continue', 'gravityview' ),
1121
+			'label_ok' => __( 'Ok', 'gravityview' ),
1122
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1123
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1124
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1125
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1126
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1127
+		));
1128
+
1129
+		wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1130
+
1131
+		// Enqueue scripts needed for merge tags
1132
+		self::enqueue_gravity_forms_scripts();
1133 1133
 	}
1134 1134
 
1135 1135
 	/**
1136 1136
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1137
-     *
1138
-     * @since 1.0.5-beta
1139
-     *
1140
-     * @return void
1137
+	 *
1138
+	 * @since 1.0.5-beta
1139
+	 *
1140
+	 * @return void
1141 1141
 	 */
1142 1142
 	static function enqueue_gravity_forms_scripts() {
1143 1143
 		GFForms::register_scripts();
1144 1144
 
1145 1145
 		$scripts = array(
1146
-		    'sack',
1147
-		    'gform_gravityforms',
1148
-		    'gform_forms',
1149
-		    'gform_form_admin',
1150
-		    'jquery-ui-autocomplete'
1146
+			'sack',
1147
+			'gform_gravityforms',
1148
+			'gform_forms',
1149
+			'gform_form_admin',
1150
+			'jquery-ui-autocomplete'
1151 1151
 		);
1152 1152
 
1153 1153
 		if ( wp_is_mobile() ) {
1154
-		    $scripts[] = 'jquery-touch-punch';
1154
+			$scripts[] = 'jquery-touch-punch';
1155 1155
 		}
1156 1156
 
1157 1157
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.