← All changes | classes/views/shared/admin-header.php +39 -46 6.25 → 5.5 View file →

		@@ -4,12 +4,34 @@
4	4	}
5	5
6	6	FrmAppHelper::print_admin_banner( ! $has_nav && empty( $atts['switcher'] ) );
7	7	?>
8		-<div id="frm_top_bar" class="<?php echo esc_attr( 'frm_nav_bar' ); ?>">
	8	+<div id="frm_top_bar">
	9	+ <?php if ( FrmAppHelper::is_full_screen() ) { ?>
	10	+ <div class="frm-full-close">
	11	+ <a href="<?php echo esc_attr( $atts['close'] ); ?>" aria-label="<?php esc_attr_e( 'Close', 'formidable' ); ?>">
	12	+ <?php FrmAppHelper::icon_by_class( 'frmfont frm_close_icon', array( 'aria-label' => 'Dismiss' ) ); ?>
	13	+ </a>
	14	+ </div>
	15	+ <?php } ?>
	16	+ <?php
	17	+ if ( isset( $atts['publish'] ) ) {
	18	+ echo '<div id="frm-publishing">';
	19	+ call_user_func( $atts['publish'][0], $atts['publish'][1] );
	20	+ echo '</div>';
	21	+ } elseif ( ! FrmAppHelper::pro_is_installed() ) {
	22	+ ?>
	23	+ <div id="frm-publishing">
	24	+ <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( 'header' ) ); ?>" class="button button-secondary frm-button-secondary">
	25	+ <?php esc_html_e( 'Upgrade', 'formidable' ); ?>
	26	+ </a>
	27	+ </div>
	28	+ <?php
	29	+ }
	30	+ ?>
	31	+
9	32	<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable' ) ); ?>" class="frm-header-logo">
10	33	<?php FrmAppHelper::show_header_logo(); ?>
11		- <span class="screen-reader-text"><?php esc_html_e( 'View Forms', 'formidable' ); ?></span>
12	34	</a>
13	35
14	36	<?php
15	37	// Add form nav
		@@ -19,58 +41,29 @@
19	41	call_user_func( $atts['switcher'][0], $atts['switcher'][1] );
20	42	} else {
21	43	// Used when no form is currently selected.
22	44	?>
23		- <div class="frm_top_left">
	45	+ <div class="frm_top_left <?php echo esc_attr( $atts['import_link'] ? 'frm_top_wide' : '' ); ?>">
24	46	<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">
	47	+ <?php echo esc_html( $atts['label'] ); ?>
	48	+ <?php FrmAppHelper::add_new_item_link( $atts ); ?>
	49	+ <?php if ( $atts['import_link'] ) { ?>
	50	+ <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-import' ) ); ?>" class="button button-secondary frm-button-secondary frm_animate_bg">
	51	+ <?php esc_html_e( 'Import', 'formidable' ); ?>
	52	+ </a>
	53	+ <?php } ?>
	54	+ <?php if ( isset( $atts['cancel_link'] ) ) { ?>
	55	+ <a href="<?php echo esc_url( $atts['cancel_link'] ); ?>" class="button button-secondary frm-button-secondary frm_animate_bg">
32	56	<?php esc_html_e( 'Cancel', 'formidable' ); ?>
33	57	</a>
34		- <?php
35		- }
36		- ?>
	58	+ <?php } ?>
37	59	</h1>
38	60	</div>
39		- <ul class="frm_form_nav"></ul>
40	61	<?php
41		- }//end if
	62	+ }
42	63
43	64	if ( isset( $atts['nav'] ) ) {
44		- FrmAppHelper::kses_echo( $atts['nav'], 'all' );
	65	+ echo FrmAppHelper::kses( $atts['nav'], 'all' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
45	66	}
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 } ?>
	67	+ ?>
	68	+ <div style="clear:right;"></div>
76	69	</div>