← All changes | views/backend/post/meta-box.php +111 -61 2.3.1 → 3.4.3 View file →

		@@ -15,22 +15,24 @@
15	15	<label for="wp-convertkit-form"><?php esc_html_e( 'Form', 'convertkit' ); ?></label>
16	16	</th>
17	17	<td>
18	18	<div class="convertkit-select2-container convertkit-select2-container-grid">
19		- <select name="wp-convertkit[form]" id="wp-convertkit-form" class="convertkit-select2 widefat">
20		- <option value="-1"<?php selected( - 1, $convertkit_post->get_form() ); ?> data-preserve-on-refresh="1"><?php esc_html_e( 'Default', 'convertkit' ); ?></option>
21		- <option value="0"<?php selected( 0, $convertkit_post->get_form() ); ?> data-preserve-on-refresh="1"><?php esc_html_e( 'None', 'convertkit' ); ?></option>
22		- <?php
23		- if ( $convertkit_forms->exist() ) {
24		- foreach ( $convertkit_forms->get() as $form ) {
25		- ?>
26		- <option value="<?php echo esc_attr( $form['id'] ); ?>"<?php selected( $form['id'], $convertkit_post->get_form() ); ?>><?php echo esc_attr( $form['name'] ); ?></option>
27		- <?php
28		- }
29		- }
30		- ?>
31		- </select>
32		- <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Forms from ConvertKit account', 'convertkit' ); ?>" data-resource="forms" data-field="#wp-convertkit-form">
	19	+ <?php
	20	+ $convertkit_forms->output_select_field_all(
	21	+ 'wp-convertkit[form]',
	22	+ 'wp-convertkit-form',
	23	+ array(
	24	+ 'convertkit-select2',
	25	+ 'widefat',
	26	+ ),
	27	+ esc_attr( $convertkit_post->get_form() ),
	28	+ array(
	29	+ '-1' => esc_html__( 'Default', 'convertkit' ),
	30	+ '0' => esc_html__( 'None', 'convertkit' ),
	31	+ )
	32	+ );
	33	+ ?>
	34	+ <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Forms from Kit account', 'convertkit' ); ?>" data-resource="forms" data-field="#wp-convertkit-form">
33	35	<span class="dashicons dashicons-update"></span>
34	36	</button>
35	37	<p class="description">
36	38	<code><?php esc_html_e( 'Default', 'convertkit' ); ?></code>
		@@ -45,9 +47,9 @@
45	47	<?php
46	48	printf(
47	49	/* translators: Link to sign in to ConvertKit */
48	50	esc_html__( 'To make changes to your forms, %s', 'convertkit' ),
49		- '<a href="' . esc_url( convertkit_get_sign_in_url() ) . '" target="_blank">' . esc_html__( 'sign in to ConvertKit', 'convertkit' ) . '</a>'
	51	+ '<a href="' . esc_url( convertkit_get_sign_in_url() ) . '" target="_blank">' . esc_html__( 'sign in to Kit', 'convertkit' ) . '</a>'
50	52	);
51	53	?>
52	54	</p>
53	55	</div>
		@@ -66,24 +68,42 @@
66	68	<div class="convertkit-select2-container convertkit-select2-container-grid">
67	69	<select name="wp-convertkit[landing_page]" id="wp-convertkit-landing_page" class="convertkit-select2">
68	70	<option <?php selected( '', $convertkit_post->get_landing_page() ); ?> value="0" data-preserve-on-refresh="1"><?php esc_html_e( 'None', 'convertkit' ); ?></option>
69	71	<?php
70		- if ( $convertkit_landing_pages->exist() ) {
71		- foreach ( $convertkit_landing_pages->get() as $landing_page ) {
72		- if ( isset( $convertkit_landing_page['url'] ) ) {
	72	+ $non_legacy_landing_pages = $convertkit_landing_pages->get_non_legacy();
	73	+ if ( is_array( $non_legacy_landing_pages ) ) {
	74	+ foreach ( $non_legacy_landing_pages as $landing_page ) {
	75	+ ?>
	76	+ <option value="<?php echo esc_attr( $landing_page['id'] ); ?>"<?php selected( $landing_page['id'], $convertkit_post->get_landing_page() ); ?>><?php echo esc_attr( $landing_page['name'] ); ?></option>
	77	+ <?php
	78	+ }
	79	+ }
	80	+
	81	+ // If the currently-saved landing page is a legacy resource, append
	82	+ // it here so the dropdown truthfully reflects the saved value
	83	+ // without offering other legacy pages as new selection choices.
	84	+ $current_landing_page = $convertkit_post->get_landing_page();
	85	+ if ( $current_landing_page && $convertkit_landing_pages->is_legacy( $current_landing_page ) ) {
	86	+ // data-preserve-on-refresh keeps this option in place when
	87	+ // the Refresh Resources button repopulates the dropdown,
	88	+ // so the saved legacy selection isn't silently lost.
	89	+ // Pre-1.9.6 storage: the saved value is the legacy URL itself.
	90	+ if ( is_string( $current_landing_page ) && strstr( $current_landing_page, 'http' ) ) {
	91	+ ?>
	92	+ <option value="<?php echo esc_attr( $current_landing_page ); ?>" data-preserve-on-refresh="1" selected><?php echo esc_attr( $current_landing_page ); ?></option>
	93	+ <?php
	94	+ } else {
	95	+ $legacy_landing_page = $convertkit_landing_pages->get_by_id( (int) $current_landing_page );
	96	+ if ( $legacy_landing_page ) {
73	97	?>
74		- <option value="<?php echo esc_attr( $landing_page['url'] ); ?>"<?php selected( $landing_page['url'], $convertkit_post->get_landing_page() ); ?>><?php echo esc_attr( $landing_page['name'] ); ?></option>
	98	+ <option value="<?php echo esc_attr( $legacy_landing_page['id'] ); ?>" data-preserve-on-refresh="1" selected><?php echo esc_attr( $legacy_landing_page['name'] ); ?></option>
75	99	<?php
76		- } else {
77		- ?>
78		- <option value="<?php echo esc_attr( $landing_page['id'] ); ?>"<?php selected( $landing_page['id'], $convertkit_post->get_landing_page() ); ?>><?php echo esc_attr( $landing_page['name'] ); ?></option>
79		- <?php
80	100	}
81	101	}
82	102	}
83	103	?>
84	104	</select>
85		- <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Landing Pages from ConvertKit account', 'convertkit' ); ?>" data-resource="landing_pages" data-field="#wp-convertkit-landing_page">
	105	+ <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Landing Pages from Kit account', 'convertkit' ); ?>" data-resource="landing_pages" data-field="#wp-convertkit-landing_page">
86	106	<span class="dashicons dashicons-update"></span>
87	107	</button>
88	108	<p class="description">
89	109	<?php esc_html_e( 'Select a landing page to make it appear in place of this page.', 'convertkit' ); ?>
		@@ -91,9 +111,9 @@
91	111	<?php
92	112	printf(
93	113	/* translators: Link to sign in to ConvertKit */
94	114	esc_html__( 'To make changes to your landing pages, %s', 'convertkit' ),
95		- '<a href="' . esc_url( convertkit_get_sign_in_url() ) . '" target="_blank">' . esc_html__( 'sign in to ConvertKit', 'convertkit' ) . '</a>'
	115	+ '<a href="' . esc_url( convertkit_get_sign_in_url() ) . '" target="_blank">' . esc_html__( 'sign in to Kit', 'convertkit' ) . '</a>'
96	116	);
97	117	?>
98	118	</p>
99	119	</div>
		@@ -121,60 +141,90 @@
121	141	}
122	142	}
123	143	?>
124	144	</select>
125		- <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Tags from ConvertKit account', 'convertkit' ); ?>" data-resource="tags" data-field="#wp-convertkit-tag">
	145	+ <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Tags from Kit account', 'convertkit' ); ?>" data-resource="tags" data-field="#wp-convertkit-tag">
126	146	<span class="dashicons dashicons-update"></span>
127	147	</button>
128	148	<p class="description">
129	149	<?php esc_html_e( 'Select a tag to apply to visitors of this page who are subscribed.', 'convertkit' ); ?>
130	150	<br />
131		- <?php esc_html_e( 'A visitor is deemed to be subscribed if they have clicked a link in an email to this site which includes their subscriber ID, or have entered their email address in a ConvertKit Form on this site.', 'convertkit' ); ?>
	151	+ <?php esc_html_e( 'A visitor is deemed to be subscribed if they have clicked a link in an email to this site which includes their subscriber ID, or have entered their email address in a Kit Form on this site.', 'convertkit' ); ?>
132	152	</p>
133	153	</div>
134	154	</td>
135	155	</tr>
136	156
137		- <?php
138		- if ( $restrict_content_settings->enabled() ) {
139		- ?>
140		- <tr valign="top">
141		- <th scope="row">
142		- <label for="wp-convertkit-restrict_content"><?php esc_html_e( 'Member Content', 'convertkit' ); ?></label>
143		- </th>
144		- <td>
145		- <div class="convertkit-select2-container convertkit-select2-container-grid">
146		- <select name="wp-convertkit[restrict_content]" id="wp-convertkit-restrict_content" class="convertkit-select2">
147		- <option value="0"<?php selected( '', $convertkit_post->get_restrict_content() ); ?> data-preserve-on-refresh="1"><?php esc_html_e( 'Don\'t restrict content to members only.', 'convertkit' ); ?></option>
	157	+ <tr valign="top">
	158	+ <th scope="row">
	159	+ <label for="wp-convertkit-restrict_content"><?php esc_html_e( 'Member Content', 'convertkit' ); ?></label>
	160	+ </th>
	161	+ <td>
	162	+ <div class="convertkit-select2-container convertkit-select2-container-grid">
	163	+ <select name="wp-convertkit[restrict_content]" id="wp-convertkit-restrict_content" class="convertkit-select2">
	164	+ <option value="0"<?php selected( '', $convertkit_post->get_restrict_content() ); ?> data-preserve-on-refresh="1"><?php esc_html_e( 'Don\'t restrict content to member-only.', 'convertkit' ); ?></option>
148	165
	166	+ <optgroup label="<?php esc_attr_e( 'Forms', 'convertkit' ); ?>" data-resource="forms">
149	167	<?php
	168	+ // Forms.
	169	+ if ( $convertkit_forms->inline_exist() ) {
	170	+ foreach ( $convertkit_forms->get_inline() as $convertkit_form ) {
	171	+ printf(
	172	+ '<option value="form_%s"%s>%s [%s]</option>',
	173	+ esc_attr( $convertkit_form['id'] ),
	174	+ selected( $convertkit_post->get_restrict_content(), 'form_' . $convertkit_form['id'], false ),
	175	+ esc_attr( $convertkit_form['name'] ),
	176	+ ( ! empty( $convertkit_form['format'] ) ? esc_attr( $convertkit_form['format'] ) : 'inline' )
	177	+ );
	178	+ }
	179	+ }
	180	+ ?>
	181	+ </optgroup>
	182	+
	183	+ <optgroup label="<?php esc_attr_e( 'Tags', 'convertkit' ); ?>" data-resource="tags">
	184	+ <?php
	185	+ // Tags.
	186	+ if ( $convertkit_tags->exist() ) {
	187	+ foreach ( $convertkit_tags->get() as $convertkit_tag ) {
	188	+ ?>
	189	+ <option value="tag_<?php echo esc_attr( $convertkit_tag['id'] ); ?>"<?php selected( 'tag_' . $convertkit_tag['id'], $convertkit_post->get_restrict_content() ); ?>><?php echo esc_attr( $convertkit_tag['name'] ); ?></option>
	190	+ <?php
	191	+ }
	192	+ }
	193	+ ?>
	194	+ </optgroup>
	195	+
	196	+ <optgroup label="<?php esc_attr_e( 'Products', 'convertkit' ); ?>" data-resource="products">
	197	+ <?php
	198	+ // Products.
150	199	if ( $convertkit_products->exist() ) {
151		- ?>
152		- <optgroup label="<?php esc_attr_e( 'Products', 'convertkit' ); ?>">
	200	+ foreach ( $convertkit_products->get() as $product ) {
	201	+ ?>
	202	+ <option value="product_<?php echo esc_attr( $product['id'] ); ?>"<?php selected( 'product_' . $product['id'], $convertkit_post->get_restrict_content() ); ?>><?php echo esc_attr( $product['name'] ); ?></option>
153	203	<?php
154		- foreach ( $convertkit_products->get() as $product ) {
155		- ?>
156		- <option value="product_<?php echo esc_attr( $product['id'] ); ?>"<?php selected( 'product_' . $product['id'], $convertkit_post->get_restrict_content() ); ?>><?php echo esc_attr( $product['name'] ); ?></option>
157		- <?php
158		- }
159		- ?>
160		- </optgroup>
161		- <?php
	204	+ }
162	205	}
163	206	?>
164		- </select>
165		- <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Products Pages from ConvertKit account', 'convertkit' ); ?>" data-resource="products" data-field="#wp-convertkit-restrict_content">
166		- <span class="dashicons dashicons-update"></span>
167		- </button>
168		- <p class="description">
169		- <?php esc_html_e( 'Select the ConvertKit product that the visitor must be subscribed to, permitting them access to view this members only content.', 'convertkit' ); ?>
170		- </p>
171		- </div>
172		- </td>
173		- </tr>
174		- <?php
175		- }
176		- ?>
	207	+ </optgroup>
	208	+ </select>
	209	+ <button class="wp-convertkit-refresh-resources" class="button button-secondary hide-if-no-js" title="<?php esc_attr_e( 'Refresh Products and Tags from Kit account', 'convertkit' ); ?>" data-resource="restrict_content" data-field="#wp-convertkit-restrict_content">
	210	+ <span class="dashicons dashicons-update"></span>
	211	+ </button>
	212	+ <p class="description">
	213	+ <?php esc_html_e( 'Select the Kit form, tag or product that the visitor must be subscribed to, permitting them access to view this member-only content.', 'convertkit' ); ?>
	214	+ <br />
	215	+ <code><?php esc_html_e( 'Form', 'convertkit' ); ?></code>
	216	+ <?php esc_html_e( ': Displays the Kit form. On submission, the email address will be subscribed to the selected form, granting access to the member-only content. Useful to gate free content in return for an email address.', 'convertkit' ); ?>
	217	+ <br />
	218	+ <code><?php esc_html_e( 'Tag', 'convertkit' ); ?></code>
	219	+ <?php esc_html_e( ': Displays a WordPress styled subscription form. On submission, the email address will be subscribed to the selected tag, granting access to the member-only content. Useful to gate free content in return for an email address.', 'convertkit' ); ?>
	220	+ <br />
	221	+ <code><?php esc_html_e( 'Product', 'convertkit' ); ?></code>
	222	+ <?php esc_html_e( ': Displays a link to the Kit product, and a login form. Useful to gate content that can only be accessed by purchasing the Kit product.', 'convertkit' ); ?>
	223	+ </p>
	224	+ </div>
	225	+ </td>
	226	+ </tr>
177	227	</tbody>
178	228	</table>
179	229
180	230	<?php