Skip to content

Commit 97db6a7

Browse files
RaduCristianPopescuSoare-Robert-Daniel
RaduCristianPopescu
authored and
Soare-Robert-Daniel
committed
refactor: redesign support page
1 parent 7cbb02e commit 97db6a7

File tree

5 files changed

+77
-48
lines changed

5 files changed

+77
-48
lines changed

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

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,17 @@ public function feedzy_menu_pages() {
932932
$svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZC1TaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5Ni4wMDAwMDAsIC05NTcuMDAwMDAwKSIgZmlsbD0iIzQyNjhDRiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMzQuNSwxMDM0IEMyMTMuMjM3MDM3LDEwMzQgMTk2LDEwMTYuNzYyOTYgMTk2LDk5NS41IEMxOTYsOTc0LjIzNzAzNyAyMTMuMjM3MDM3LDk1NyAyMzQuNSw5NTcgQzI1NS43NjI5NjMsOTU3IDI3Myw5NzQuMjM3MDM3IDI3Myw5OTUuNSBDMjczLDEwMTYuNzYyOTYgMjU1Ljc2Mjk2MywxMDM0IDIzNC41LDEwMzQgWiBNMjM4LjM4OTA4NywxMDAzLjYxMDkxIEMyMzYuMjQxMjU2LDEwMDEuNDYzMDggMjMyLjc1ODg1MSwxMDAxLjQ2Mjk3IDIzMC42MTA5NDMsMTAwMy42MTA4OCBDMjI4LjQ2MzAzNSwxMDA1Ljc1ODc5IDIyOC40NjMwMjEsMTAwOS4yNDEyIDIzMC42MTA5MTMsMTAxMS4zODkwOSBDMjMyLjc1ODgwNCwxMDEzLjUzNjk4IDIzNi4yNDExNDksMTAxMy41MzcwMyAyMzguMzg5MDU3LDEwMTEuMzg5MTIgQzI0MC41MzY5NjUsMTAwOS4yNDEyMSAyNDAuNTM2OTc5LDEwMDUuNzU4OCAyMzguMzg5MDg3LDEwMDMuNjEwOTEgWiBNMjUxLjE5OTE5Niw5OTYuNTI0MjY5IEMyNDEuNzE2MDEsOTg4LjAxMzQwOSAyMjcuMjk0MTQzLDk4OC4wMDQzMDcgMjE3LjgwMDg1OSw5OTYuNTI0MjE0IEMyMTcuMjQwNDk2LDk5Ny4wMjcwNzkgMjE3LjIyMjEwOCw5OTcuODk5Nzc3IDIxNy43NTQ0OCw5OTguNDMyMTUgTDIyMC41NTE4NzksMTAwMS4yMjk1NSBDMjIxLjA0MTU5NCwxMDAxLjcxOTI2IDIyMS44Mjk5NjcsMTAwMS43NTIyNiAyMjIuMzUwNDA4LDEwMDEuMjk1MzcgQzIyOS4yODI0MDEsOTk1LjIxMTE3IDIzOS43MDI4MSw5OTUuMTk4MjA5IDI0Ni42NDk1NDYsMTAwMS4yOTU0MSBDMjQ3LjE3MDA0NywxMDAxLjc1MjI1IDI0Ny45NTg0MiwxMDAxLjcxOTI1IDI0OC40NDgwNzUsMTAwMS4yMjk1OSBMMjUxLjI0NTQ2NSw5OTguNDMyMjA1IEMyNTEuNzc3OTUyLDk5Ny44OTk4MzQgMjUxLjc1OTU2MSw5OTcuMDI3MTM2IDI1MS4xOTkxOTYsOTk2LjUyNDI2OSBaIE0yNTkuNTE3NDgxLDk4OC4wNjI4MTggQzI0NS43NTQ2NjIsOTc1LjI1MzkxIDIyNC4zMTI1MzEsOTc1LjE5MTM3NCAyMTAuNDgyNDY0LDk4OC4wNjI4NzMgQzIwOS45NTA5Niw5ODguNTU3NTU3IDIwOS45NDA4NDUsOTg5LjM5NjY4OSAyMTAuNDU0MjIyLDk4OS45MTAwNjYgTDIxMy4xODU0ODksOTkyLjY0MTMzMyBDMjEzLjY3NTU2OSw5OTMuMTMxNDEzIDIxNC40NjI4MjQsOTkzLjE0MTkyNCAyMTQuOTcyNjIyLDk5Mi42NzIzNTUgQzIyNi4yODEwMjksOTgyLjI1NDc4NiAyNDMuNzIwODA0LDk4Mi4yNTY0MTUgMjU5LjUxNzQ4MSw5ODguMDYyODE4IFoiIGlkPSJDb21iaW5lZC1TaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+';
933933
add_menu_page( __( 'Feedzy', 'feedzy-rss-feeds' ), __( 'Feedzy', 'feedzy-rss-feeds' ), apply_filters( 'feedzy_admin_menu_capability', 'publish_posts' ), 'feedzy-admin-menu', '', $svg_base64_icon, 98.7666 );
934934

935+
add_submenu_page(
936+
'feedzy-admin-menu',
937+
__( 'Dashboard', 'feedzy-rss-feeds' ),
938+
__( 'Dashboard', 'feedzy-rss-feeds' ),
939+
'manage_options',
940+
'feedzy-support',
941+
array(
942+
$this,
943+
'render_support',
944+
)
945+
);
935946
add_submenu_page(
936947
'feedzy-admin-menu',
937948
__( 'Settings', 'feedzy-rss-feeds' ),
@@ -954,19 +965,8 @@ public function feedzy_menu_pages() {
954965
'feedzy_integration_page',
955966
)
956967
);
957-
add_submenu_page(
958-
'feedzy-admin-menu',
959-
__( 'Support', 'feedzy-rss-feeds' ),
960-
__( 'Support', 'feedzy-rss-feeds' ) . '<span class="dashicons dashicons-editor-help more-features-icon" style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;"></span>',
961-
'manage_options',
962-
'feedzy-support',
963-
array(
964-
$this,
965-
'render_support',
966-
)
967-
);
968968

969-
if ( ! feedzy_is_pro() && get_option( 'feedzy_fresh_install', false ) ) {
969+
if ( ! feedzy_is_pro() && get_option( 'feedzy_fresh_install', false ) ) {
970970
$hook = add_submenu_page(
971971
'feedzy-admin-menu',
972972
__( 'Setup Wizard', 'feedzy-rss-feeds' ),
@@ -981,37 +981,51 @@ public function feedzy_menu_pages() {
981981
add_action( "load-$hook", array( $this, 'feedzy_load_setup_wizard_page' ) );
982982
add_action( 'adminmenu', array( $this, 'feedzy_hide_wizard_menu' ) );
983983
}
984-
if ( ! defined( 'REVIVE_NETWORK_VERSION' ) ) {
985-
$rss_to_social = __( 'RSS to Social', 'feedzy-rss-feeds' ) . '<span id="feedzy-rn-menu" class="dashicons dashicons-external" style="font-size:initial;"></span>';
986-
add_action(
987-
'admin_footer',
988-
function () {
989-
?>
990-
<script type="text/javascript">
991-
jQuery(document).ready(function ($) {
992-
$('#feedzy-rn-menu').parent().attr('target', '_blank');
993-
});
994-
</script>
995-
<?php
996-
}
997-
);
984+
}
998985

999-
global $submenu;
1000-
if ( isset( $submenu['feedzy-admin-menu'] ) ) {
986+
public function rss_to_social_menu() {
987+
$capability = feedzy_current_user_can();
988+
if ( ! $capability ) {
989+
return;
990+
}
1001991

1002-
array_splice(
1003-
$submenu['feedzy-admin-menu'],
1004-
4,
1005-
0,
1006-
array(
1007-
array(
1008-
$rss_to_social,
1009-
'manage_options',
1010-
tsdk_utmify( 'https://revive.social/plugins/revive-network', 'feedzy-menu' ),
1011-
),
1012-
)
1013-
);
992+
if ( defined ( 'REVIVE_NETWORK_VERSION' ) && ! feedzy_is_pro() ) {
993+
return;
994+
}
995+
996+
$rss_to_social = __( 'RSS to Social', 'feedzy-rss-feeds' ) . '<span id="feedzy-rn-menu" class="dashicons dashicons-external" style="font-size:initial;"></span>';
997+
add_action(
998+
'admin_footer',
999+
function () {
1000+
?>
1001+
<script type="text/javascript">
1002+
jQuery(document).ready(function ($) {
1003+
$('#feedzy-rn-menu').parent().attr('target', '_blank');
1004+
});
1005+
</script>
1006+
<?php
1007+
}
1008+
);
1009+
1010+
global $submenu;
1011+
if ( isset( $submenu['feedzy-admin-menu'] ) ) {
1012+
if ( isset( $submenu['feedzy-admin-menu'][0] ) ) {
1013+
unset( $submenu['feedzy-admin-menu'][0] );
10141014
}
1015+
array_splice(
1016+
$submenu['feedzy-admin-menu'],
1017+
5,
1018+
0,
1019+
array(
1020+
array(
1021+
$rss_to_social,
1022+
'manage_options',
1023+
tsdk_utmify( 'https://revive.social/plugins/revive-network', 'feedzy-menu' ),
1024+
),
1025+
)
1026+
);
1027+
1028+
$submenu['feedzy-admin-menu'] = array_values( $submenu['feedzy-admin-menu'] );
10151029
}
10161030
}
10171031

‎includes/feedzy-rss-feeds.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ private function define_admin_hooks() {
176176
self::$instance->loader->add_action( 'feedzy_post_http_teardown', self::$instance->admin, 'post_http_teardown', 10, 1 );
177177
self::$instance->loader->add_action( 'admin_init', self::$instance->admin, 'admin_init', 10, 1 );
178178
self::$instance->loader->add_action( 'manage_feedzy_categories_posts_custom_column', self::$instance->admin, 'manage_feedzy_category_columns', 10, 2 );
179-
self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'feedzy_menu_pages' );
179+
self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'feedzy_menu_pages', 8);
180+
self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'rss_to_social_menu', 20 );
180181
self::$instance->loader->add_action( 'wp_ajax_get_tinymce_form', self::$instance->admin, 'get_tinymce_form' );
181182
self::$instance->loader->add_action( 'wp_enqueue_scripts', self::$instance->admin, 'enqueue_styles' );
182183
self::$instance->loader->add_action( 'admin_enqueue_scripts', self::$instance->admin, 'enqueue_styles_admin', 99 );

‎includes/layouts/feedzy-support.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,20 @@ class="<?php echo 'feedzy-pro' === $active_tab ? 'active' : ''; ?>"><?php esc_ht
3131
<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-support&tab=improve' ) ); ?>"
3232
class="<?php echo 'improve' === $active_tab ? 'active' : ''; ?>"><?php esc_html_e( 'Help us improve!', 'feedzy-rss-feeds' ); ?></a>
3333
</li>
34+
<li>
35+
<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-settings' ) ); ?>"
36+
onclick="window.location.href='<?php echo esc_url( admin_url( 'admin.php?page=feedzy-settings' ) ); ?>'; return false;">
37+
<?php esc_html_e( 'Settings', 'feedzy-rss-feeds' ); ?>
38+
<span class="dashicons dashicons-external"></span>
39+
</a>
40+
</li>
41+
<li>
42+
<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-integration' ) ); ?>"
43+
onclick="window.location.href='<?php echo esc_url( admin_url( 'admin.php?page=feedzy-integration' ) ); ?>'; return false;">
44+
<?php esc_html_e( 'Integration', 'feedzy-rss-feeds' ); ?>
45+
<span class="dashicons dashicons-external"></span>
46+
</a>
47+
</li>
3448
<?php $support_tab_heading = apply_filters( 'feedzy_support_tab_heading', '', $active_tab ); ?>
3549
<?php if ( ! empty( $support_tab_heading ) ) : ?>
3650
<li>

‎includes/layouts/header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// phpcs:disable WordPress.Security.NonceVerification
1111
$page_title = __( 'Settings', 'feedzy-rss-feeds' );
1212
if ( isset( $_GET['page'] ) && 'feedzy-support' === $_GET['page'] ) {
13-
$page_title = __( 'Support', 'feedzy-rss-feeds' );
13+
$page_title = __( 'Dashboard', 'feedzy-rss-feeds' );
1414
} elseif ( isset( $_GET['page'] ) && 'feedzy-integration' === $_GET['page'] ) {
1515
$page_title = __( 'Integration', 'feedzy-rss-feeds' );
1616
}

‎includes/layouts/setup-wizard.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77

88
$dashboard_url = add_query_arg(
9-
array(
10-
'post_type' => 'feedzy_imports',
11-
'action' => 'feedzy_dismiss_wizard',
12-
'status' => 0,
13-
),
14-
admin_url( 'edit.php' )
9+
array(
10+
'page' => 'feedzy-support',
11+
'action' => 'feedzy_dismiss_wizard',
12+
'status' => 0,
13+
),
14+
admin_url( 'admin.php' )
1515
);
1616
// phpcs:ignore WordPress.Security.NonceVerification
1717
$integrate_with = ! empty( $_GET['integrate-with'] ) ? sanitize_text_field( wp_unslash( $_GET['integrate-with'] ) ) : '';

0 commit comments

Comments
 (0)