Completed
Pull Request — develop (#1436)
by Zack
11:12 queued 02:32
created
includes/admin/metaboxes/views/select-template.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -22,46 +22,46 @@
 block discarded – undo
22 22
 
23 23
 <?php // list all the available templates (type= fresh or custom ) ?>
24 24
 <div class="gv-grid">
25
-	<?php foreach( $templates as $id => $template ) {
25
+	<?php foreach ( $templates as $id => $template ) {
26 26
 		$selected = ( $id == $current_template ) ? ' gv-selected' : '';
27 27
 
28
-		$placeholder = ! empty( $template['buy_source'] );
29
-		$is_included = ! empty( $template['included'] );
28
+		$placeholder = ! empty( $template[ 'buy_source' ] );
29
+		$is_included = ! empty( $template[ 'included' ] );
30 30
 		?>
31 31
 
32 32
 		<div class="gv-grid-col-1-3">
33
-			<div class="gv-view-types-module<?php echo $selected; if( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
33
+			<div class="gv-view-types-module<?php echo $selected; if ( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
34 34
 				<div class="gv-view-types-normal">
35
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
36
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
37
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
35
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
36
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
37
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
38 38
 				</div>
39 39
 				<div class="gv-view-types-hover">
40 40
 					<div>
41 41
 						<?php
42
-						if( $is_included ) {
42
+						if ( $is_included ) {
43 43
 						?>
44
-							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero" rel="internal"><?php esc_html_e( 'Manage Installation', 'gravityview'); ?></a></p>
45
-							<?php if( !empty( $template['license'] ) ) { ?>
46
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) ); ?></p>
44
+							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero" rel="internal"><?php esc_html_e( 'Manage Installation', 'gravityview' ); ?></a></p>
45
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
46
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) ); ?></p>
47 47
 							<?php } ?>
48 48
 						<?php
49
-						} elseif( $placeholder ) {
50
-							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template['license'] ) . '&utm_content=' . urlencode( $template['slug'] );
49
+						} elseif ( $placeholder ) {
50
+							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template[ 'license' ] ) . '&utm_content=' . urlencode( $template[ 'slug' ] );
51 51
 							?>
52
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
52
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
53 53
 
54
-							<?php if( !empty( $template['preview'] ) ) { ?>
55
-								<p><a href="<?php echo esc_url( $template['preview'] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview'); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
54
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
55
+								<p><a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview' ); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
56 56
 							<?php } ?>
57 57
 
58
-							<?php if( !empty( $template['license'] ) ) { ?>
59
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) . '</a>' ); ?></p>
58
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
59
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) . '</a>' ); ?></p>
60 60
 							<?php } ?>
61 61
 						<?php } else { ?>
62
-							<p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
63
-							<?php if( !empty( $template['preview'] ) ) { ?>
64
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
62
+							<p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
63
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
64
+								<a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
65 65
 							<?php } ?>
66 66
 						<?php } ?>
67 67
 					</div>
Please login to merge, or discard this patch.
includes/presets/register-default-templates.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 		'GravityView_DataTables_Template' => array(
60 60
 			'slug' => 'dt_placeholder',
61 61
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
62
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
63
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
62
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
63
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
64 64
 			'buy_source' => 'https://gravityview.co/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
65 65
 			'preview' => 'https://demo.gravityview.co/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
66 66
 			'license' => esc_html__( 'Core + Extensions', 'gravityview' ),
@@ -99,10 +99,10 @@  discard block
 block discarded – undo
99 99
 				continue;
100 100
 			}
101 101
 
102
-			$placeholder['type']     = 'custom';
103
-			$placeholder['included'] = ( (int) $license['price_id'] >= $placeholder['price_id'] );
102
+			$placeholder[ 'type' ]     = 'custom';
103
+			$placeholder[ 'included' ] = ( (int)$license[ 'price_id' ] >= $placeholder[ 'price_id' ] );
104 104
 
105
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
105
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
106 106
 		}
107 107
 
108 108
 	} catch ( Exception $exception ) {
Please login to merge, or discard this patch.