Skip to content

Commit 294707c

Browse files
committed
review copy
1 parent 63f2328 commit 294707c

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

includes/admin/feedzy-rss-feeds-admin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public function handle_legacy() {
322322
?>
323323
<script type="text/javascript">
324324
jQuery(function () {
325-
jQuery('a[href*="post-new.php?post_type=feedzy_imports"]').addClass('feedzy-import-limit')
325+
jQuery('a[href*="post-new.php?post_type=feedzy_imports"]').addClass('feedzy-import-limit').prepend('<span class="dashicons dashicons-lock"></span> ');
326326
});
327327
</script>
328328
<?php
@@ -450,7 +450,7 @@ class="button button-primary button-large"><?php esc_html_e( 'Upgrade to PRO', '
450450
</div>
451451
<style>
452452

453-
.feedzy-import-limit{
453+
.feedzy-import-limit, .page-title-action.only-pro{
454454
opacity:0.7;
455455
}
456456
.feedzy-quick-link{

includes/admin/feedzy-rss-feeds-import.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function enqueue_styles() {
171171
'<a href="#" class="page-title-action fz-export-import-btn%1$s"><span class="dashicons %2$s"></span>%3$s</a>',
172172
! feedzy_is_pro() ? ' only-pro' : '',
173173
feedzy_is_pro() ? 'dashicons-upload' : 'dashicons-lock',
174-
esc_html__( 'Import Job', 'feedzy-rss-feeds' )
174+
esc_html__( 'Upload Import', 'feedzy-rss-feeds' )
175175
),
176176
),
177177
)
@@ -3467,10 +3467,10 @@ public function add_import_export_section() {
34673467
<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
34683468
</span>
34693469
<div class="modal-header">
3470-
<h2><span class="dashicons dashicons-lock"></span> <?php esc_html_e( 'Import/Export is a PRO feature', 'feedzy-rss-feeds' ); ?></h2>
3470+
<h2><span class="dashicons dashicons-lock"></span> <?php esc_html_e( 'Upload/Export is a PRO feature', 'feedzy-rss-feeds' ); ?></h2>
34713471
</div>
34723472
<div class="modal-body">
3473-
<p><?php esc_html_e( 'We\'re sorry, import/export is not available on your plan. Please upgrade to the Pro plan to unlock all these features.', 'feedzy-rss-feeds' ); ?></p>
3473+
<p><?php esc_html_e( 'We\'re sorry, upload/export of import configuration is not available on your plan. Please upgrade to the Pro plan to unlock all these features.', 'feedzy-rss-feeds' ); ?></p>
34743474
</div>
34753475
<div class="modal-footer">
34763476
<div class="button-container"><a href="<?php echo esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'importExport' ) ) ); ?>" target="_blank" rel="noopener " class="button button-primary button-large"><?php esc_html_e( 'Upgrade to PRO', 'feedzy-rss-feeds' ); ?><span aria-hidden="true" class="dashicons dashicons-external"></span></a></div>

includes/views/css/import-metabox-edit.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ span.feedzy-spinner {
139139
margin-left: 0;
140140
}
141141

142-
.wp-core-ui .fz-export-import-btn {
142+
.wp-core-ui .fz-export-import-btn,
143+
.wp-core-ui .feedzy-import-limit{
143144
display: inline-flex !important;
144145
align-items: center;
145146
}

includes/views/import-metabox-edit.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
112112
</div>
113113
<div class="feedzy-accordion-item__content border-top">
114114
<div class="fz-form-wrap">
115-
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'filters', 'import' ) ); ?>
115+
116116
<input type="hidden" name="feedzy_meta_data[filter_conditions]" id="feed-post-filters-conditions" value="<?php echo esc_attr( $filter_conditions ); ?>">
117117
<div class="fz-conditions" id="fz-conditions"></div>
118118
</div>
@@ -679,14 +679,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"
679679
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
680680
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'remove-duplicates', 'import' ) ); ?>
681681
<div class="fz-left">
682-
<h4 class="h4"><?php esc_html_e( 'Mark Duplicates By', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
682+
<h4 class="h4"><?php esc_html_e( 'Duplication Key', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
683683
</div>
684684
<div class="fz-right">
685685
<div class="fz-form-group">
686-
<label class="form-label"><?php esc_html_e( 'Mark the duplicate items using the magic tag value', 'feedzy-rss-feeds' ); ?></label>
686+
<label class="form-label"><?php esc_html_e( 'Set a custom duplication key to identify unique feed items', 'feedzy-rss-feeds' ); ?></label>
687687
<input type="text" id="feedzy_mark_duplicate" name="feedzy_meta_data[mark_duplicate_tag]" class="form-control" value="<?php echo esc_attr( $mark_duplicate_tag ); ?>"<?php disabled( true, 'checked' !== $import_remove_duplicates ); ?> />
688688
<div class="help-text pt-8">
689-
<?php esc_html_e( 'Helpful if you want to identify and remove duplicate items. Enter a magic tag to mark duplicates based on its value, e.g: [#item_title], [#item_content], [#item_url] etc.', 'feedzy-rss-feeds' ); ?>
689+
<?php esc_html_e( 'Define a custom duplication key for identifying unique feed items when importing content. By default, items are considered unique based on their title and URL. Enter one or multiple magic tags.', 'feedzy-rss-feeds' ); ?>
690690
</div>
691691
</div>
692692
</div>

tests/e2e/specs/upsell.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ test.describe( 'Upsell', () => {
2121
const filtersTab = page.locator('#feedzy-import-form > div.feedzy-accordion > div:nth-child(2)');
2222

2323
// It should have 1 elements with .only-pro-content class.
24-
await expect( filtersTab.locator('.only-pro-content').count() ).resolves.toBe(1);
24+
await expect( filtersTab.locator('.pro-label').count() ).resolves.toBe(1);
2525

26-
const filterByKeywordAlert = await filtersTab.locator('.upgrade-alert').first();
2726
let upgradeLink = new URL( await filterByKeywordAlert.locator('a').first().getAttribute('href') );
2827
expect( upgradeLink.searchParams.get( 'utm_campaign' ) ).toBe('filters');
2928
} );

0 commit comments

Comments
 (0)