← All changes | classes/views/shared/admin-header.php +48 -47 6.25 → 5.1 View file →

		@@ -2,14 +2,44 @@
2	2	if ( ! defined( 'ABSPATH' ) ) {
3	3	die( 'You are not allowed to call this page directly.' );
4	4	}
5	5
6		-FrmAppHelper::print_admin_banner( ! $has_nav && empty( $atts['switcher'] ) );
	6	+if ( current_user_can( 'administrator' ) && ! FrmAppHelper::pro_is_installed() && ! $has_nav && empty( $atts['switcher'] ) ) {
	7	+ ?>
	8	+ <div class="frm-upgrade-bar">
	9	+ <span>You're using Formidable Forms Lite. To unlock more features consider</span>
	10	+ <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( 'top-bar' ) ); ?>" target="_blank" rel="noopener">upgrading to Pro</a>.
	11	+ </div>
	12	+ <?php
	13	+}
	14	+FrmInbox::maybe_show_banner();
7	15	?>
8		-<div id="frm_top_bar" class="<?php echo esc_attr( 'frm_nav_bar' ); ?>">
	16	+<div id="frm_top_bar">
	17	+ <?php if ( FrmAppHelper::is_full_screen() ) { ?>
	18	+ <div class="frm-full-close">
	19	+ <a href="<?php echo esc_attr( $atts['close'] ); ?>" aria-label="<?php esc_attr_e( 'Close', 'formidable' ); ?>">
	20	+ <?php FrmAppHelper::icon_by_class( 'frmfont frm_close_icon', array( 'aria-label' => 'Dismiss' ) ); ?>
	21	+ </a>
	22	+ </div>
	23	+ <?php } ?>
	24	+ <?php
	25	+ if ( isset( $atts['publish'] ) ) {
	26	+ echo '<div id="frm-publishing">';
	27	+ call_user_func( $atts['publish'][0], $atts['publish'][1] );
	28	+ echo '</div>';
	29	+ } elseif ( ! FrmAppHelper::pro_is_installed() ) {
	30	+ ?>
	31	+ <div id="frm-publishing">
	32	+ <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( 'header' ) ); ?>" class="button button-secondary frm-button-secondary">
	33	+ <?php esc_html_e( 'Upgrade', 'formidable' ); ?>
	34	+ </a>
	35	+ </div>
	36	+ <?php
	37	+ }
	38	+ ?>
	39	+
9	40	<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable' ) ); ?>" class="frm-header-logo">
10	41	<?php FrmAppHelper::show_header_logo(); ?>
11		- <span class="screen-reader-text"><?php esc_html_e( 'View Forms', 'formidable' ); ?></span>
12	42	</a>
13	43
14	44	<?php
15	45	// Add form nav
		@@ -19,58 +49,29 @@
19	49	call_user_func( $atts['switcher'][0], $atts['switcher'][1] );
20	50	} else {
21	51	// Used when no form is currently selected.
22	52	?>
23		- <div class="frm_top_left">
	53	+ <div class="frm_top_left <?php echo esc_attr( $atts['import_link'] ? 'frm_top_wide' : '' ); ?>">
24	54	<h1>
25		- <?php
26		- echo esc_html( $atts['label'] );
27		- FrmAppHelper::add_new_item_link( $atts );
28		-
29		- if ( isset( $atts['cancel_link'] ) ) {
30		- ?>
31		- <a href="<?php echo esc_url( $atts['cancel_link'] ); ?>" class="button frm-button-secondary frm_animate_bg">
	55	+ <?php echo esc_html( $atts['label'] ); ?>
	56	+ <?php FrmAppHelper::add_new_item_link( $atts ); ?>
	57	+ <?php if ( $atts['import_link'] ) { ?>
	58	+ <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-import' ) ); ?>" class="button button-secondary frm-button-secondary frm_animate_bg">
	59	+ <?php esc_html_e( 'Import', 'formidable' ); ?>
	60	+ </a>
	61	+ <?php } ?>
	62	+ <?php if ( isset( $atts['cancel_link'] ) ) { ?>
	63	+ <a href="<?php echo esc_url( $atts['cancel_link'] ); ?>" class="button button-secondary frm-button-secondary frm_animate_bg">
32	64	<?php esc_html_e( 'Cancel', 'formidable' ); ?>
33	65	</a>
34		- <?php
35		- }
36		- ?>
	66	+ <?php } ?>
37	67	</h1>
38	68	</div>
39		- <ul class="frm_form_nav"></ul>
40	69	<?php
41		- }//end if
	70	+ }
42	71
43	72	if ( isset( $atts['nav'] ) ) {
44		- FrmAppHelper::kses_echo( $atts['nav'], 'all' );
	73	+ echo FrmAppHelper::kses( $atts['nav'], 'all' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
45	74	}
46		-
47		- echo '<div id="frm-publishing">';
48		- if ( ! empty( $atts['publish'] ) || ! empty( $atts['import_link'] ) ) {
49		- $btn_type = 'primary';
50		- if ( isset( $atts['publish'] ) && is_array( $atts['publish'] ) ) {
51		- call_user_func( $atts['publish'][0], $atts['publish'][1] );
52		- $btn_type = 'secondary';
53		- }
54		-
55		- if ( $atts['import_link'] ) {
56		- // Use primary style if it's the only button.
57		- FrmAppHelper::import_link( $btn_type );
58		- }
59		- } elseif ( ! FrmAppHelper::pro_is_installed() ) {
60		- ?>
61		- <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( 'header' ) ); ?>" class="button button-secondary frm-button-secondary">
62		- <?php esc_html_e( 'Upgrade', 'formidable' ); ?>
63		- </a>
64		- <?php
65		- }
66		- echo '</div>';
67		-
68		- if ( FrmAppHelper::is_full_screen() ) {
69		- ?>
70		- <div class="frm-full-close">
71		- <a href="<?php echo esc_url( $atts['close'] ); ?>" aria-label="<?php esc_attr_e( 'Close', 'formidable' ); ?>">
72		- <?php FrmAppHelper::icon_by_class( 'frmfont frm_close_icon', array( 'aria-label' => 'Dismiss' ) ); ?>
73		- </a>
74		- </div>
75		- <?php } ?>
	75	+ ?>
	76	+ <div style="clear:right;"></div>
76	77	</div>