| @@ -4,9 +4,32 @@ | ||
| 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 | 34 | </a> |
| 12 | 35 | |
| @@ -18,25 +41,24 @@ | ||
| 18 | 41 | call_user_func( $atts['switcher'][0], $atts['switcher'][1] ); |
| 19 | 42 | } else { |
| 20 | 43 | // Used when no form is currently selected. |
| 21 | 44 | ?> |
| 22 | - <div class="frm_top_left"> | |
| 45 | + <div class="frm_top_left <?php echo esc_attr( $atts['import_link'] ? 'frm_top_wide' : '' ); ?>"> | |
| 23 | 46 | <h1> |
| 24 | - <?php | |
| 25 | - echo esc_html( $atts['label'] ); | |
| 26 | - FrmAppHelper::add_new_item_link( $atts ); | |
| 27 | - | |
| 28 | - if ( isset( $atts['cancel_link'] ) ) { | |
| 29 | - ?> | |
| 30 | - <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"> | |
| 31 | 56 | <?php esc_html_e( 'Cancel', 'formidable' ); ?> |
| 32 | 57 | </a> |
| 33 | - <?php | |
| 34 | - } | |
| 35 | - ?> | |
| 58 | + <?php } ?> | |
| 36 | 59 | </h1> |
| 37 | 60 | </div> |
| 38 | - <ul class="frm_form_nav"></ul> | |
| 39 | 61 | <?php |
| 40 | 62 | } |
| 41 | 63 | |
| 42 | 64 | if ( isset( $atts['nav'] ) ) { |
| @@ -41,35 +63,7 @@ | ||
| 41 | 63 | |
| 42 | 64 | if ( isset( $atts['nav'] ) ) { |
| 43 | 65 | echo FrmAppHelper::kses( $atts['nav'], 'all' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 44 | 66 | } |
| 45 | - | |
| 46 | - echo '<div id="frm-publishing">'; | |
| 47 | - if ( ! empty( $atts['publish'] ) || ! empty( $atts['import_link'] ) ) { | |
| 48 | - $btn_type = 'primary'; | |
| 49 | - if ( isset( $atts['publish'] ) && is_array( $atts['publish'] ) ) { | |
| 50 | - call_user_func( $atts['publish'][0], $atts['publish'][1] ); | |
| 51 | - $btn_type = 'secondary'; | |
| 52 | - } | |
| 53 | - | |
| 54 | - if ( $atts['import_link'] ) { | |
| 55 | - // Use primary style if it's the only button. | |
| 56 | - FrmAppHelper::import_link( $btn_type ); | |
| 57 | - } | |
| 58 | - } elseif ( ! FrmAppHelper::pro_is_installed() ) { | |
| 59 | - ?> | |
| 60 | - <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( 'header' ) ); ?>" class="button button-secondary frm-button-secondary"> | |
| 61 | - <?php esc_html_e( 'Upgrade', 'formidable' ); ?> | |
| 62 | - </a> | |
| 63 | - <?php | |
| 64 | - } | |
| 65 | - echo '</div>'; | |
| 66 | - | |
| 67 | - if ( FrmAppHelper::is_full_screen() ) { | |
| 68 | - ?> | |
| 69 | - <div class="frm-full-close"> | |
| 70 | - <a href="<?php echo esc_attr( $atts['close'] ); ?>" aria-label="<?php esc_attr_e( 'Close', 'formidable' ); ?>"> | |
| 71 | - <?php FrmAppHelper::icon_by_class( 'frmfont frm_close_icon', array( 'aria-label' => 'Dismiss' ) ); ?> | |
| 72 | - </a> | |
| 73 | - </div> | |
| 74 | - <?php } ?> | |
| 67 | + ?> | |
| 68 | + <div style="clear:right;"></div> | |
| 75 | 69 | </div> |
