| @@ -42,12 +42,23 @@ | ||
| 42 | 42 | <?php esc_html_e( 'Show the form description', 'formidable' ); ?> |
| 43 | 43 | </label> |
| 44 | 44 | </p> |
| 45 | 45 | |
| 46 | -<?php if ( ! $values['is_template'] ) { ?> | |
| 47 | - <?php $first_h3 = ''; ?> | |
| 46 | +<?php | |
| 47 | +/** | |
| 48 | + * Fires after the form description field. | |
| 49 | + * | |
| 50 | + * @since 6.18 | |
| 51 | + * | |
| 52 | + * @param array $values The form values. | |
| 53 | + */ | |
| 54 | +do_action( 'frm_settings_after_form_description', $values ); | |
| 48 | 55 | |
| 49 | - <?php if ( has_action( 'frm_settings_buttons' ) ) { ?> | |
| 56 | +if ( ! $values['is_template'] ) { | |
| 57 | + $first_h3 = ''; | |
| 58 | + | |
| 59 | + if ( has_action( 'frm_settings_buttons' ) ) { | |
| 60 | + ?> | |
| 50 | 61 | <h3 class="<?php echo esc_attr( $first_h3 ); ?>"> |
| 51 | 62 | <?php esc_html_e( 'Form Settings', 'formidable' ); ?> |
| 52 | 63 | </h3> |
| 53 | 64 | <div class="misc-pub-section"> |
| @@ -53,18 +64,20 @@ | ||
| 53 | 64 | <div class="misc-pub-section"> |
| 54 | 65 | <?php do_action( 'frm_settings_buttons', $values ); ?> |
| 55 | 66 | <div class="clear"></div> |
| 56 | 67 | </div> |
| 57 | - <?php $first_h3 = ''; ?> | |
| 58 | - <?php } ?> | |
| 59 | -<?php } ?> | |
| 68 | + <?php | |
| 69 | + $first_h3 = ''; | |
| 70 | + } | |
| 71 | +} | |
| 72 | +?> | |
| 60 | 73 | |
| 61 | 74 | <h3 class="<?php echo esc_attr( $first_h3 ); ?>"> |
| 62 | 75 | <?php esc_html_e( 'On Submit', 'formidable' ); ?> |
| 63 | - <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Choose what will happen after the user submits this form.', 'formidable' ); ?>"></span> | |
| 76 | + <?php FrmAppHelper::tooltip_icon( __( 'Choose what will happen after the user submits this form.', 'formidable' ) ); ?> | |
| 64 | 77 | </h3> |
| 65 | 78 | |
| 66 | -<input type="hidden" name="options[on_submit_migrated]" value="<?php echo empty( $values['on_submit_migrated'] ) ? '' : intval( $values['on_submit_migrated'] ); ?>" /> | |
| 79 | +<input type="hidden" name="options[on_submit_migrated]" value="<?php echo ! empty( $values['on_submit_migrated'] ) ? intval( $values['on_submit_migrated'] ) : ''; ?>" /> | |
| 67 | 80 | |
| 68 | 81 | <p class="frm8 frm_form_field"> |
| 69 | 82 | <label for="no_save" class="frm_inline_block"> |
| 70 | 83 | <input type="checkbox" name="options[no_save]" id="no_save" value="1" <?php checked( $values['no_save'], 1 ); ?> /> |
| @@ -71,16 +84,20 @@ | ||
| 71 | 84 | <?php esc_html_e( 'Do not store entries submitted from this form', 'formidable' ); ?> |
| 72 | 85 | </label> |
| 73 | 86 | </p> |
| 74 | 87 | |
| 88 | +<div class="frm_note_style"> | |
| 89 | + <?php esc_html_e( 'Spam settings have been moved to a new section.', 'formidable' ); ?> | |
| 90 | + <a href="#spam_settings"><?php esc_html_e( 'Click here to jump to Spam settings.', 'formidable' ); ?></a> | |
| 91 | +</div> | |
| 92 | + | |
| 75 | 93 | <?php |
| 76 | -is_callable( 'FrmFormsController::render_spam_settings' ) && FrmFormsController::render_spam_settings( $values ); | |
| 77 | 94 | FrmTipsHelper::pro_tip( 'get_form_settings_tip', 'p' ); |
| 78 | 95 | ?> |
| 79 | 96 | |
| 80 | 97 | <!--AJAX Section--> |
| 81 | 98 | <h3><?php esc_html_e( 'AJAX', 'formidable' ); ?> |
| 82 | - <span class="frm_help frm_icon_font frm_tooltip_icon" data-placement="right" title="<?php esc_attr_e( 'Make stuff happen in the background without a page refresh', 'formidable' ); ?>" ></span> | |
| 99 | + <?php FrmAppHelper::tooltip_icon( __( 'Make stuff happen in the background without a page refresh', 'formidable' ), array( 'data-placement' => 'right' ) ); ?> | |
| 83 | 100 | </h3> |
| 84 | 101 | |
| 85 | 102 | <table class="form-table"> |
| 86 | 103 | <tr> |
| @@ -85,40 +102,40 @@ | ||
| 85 | 102 | <table class="form-table"> |
| 86 | 103 | <tr> |
| 87 | 104 | <td> |
| 88 | 105 | <label for="ajax_load" class="frm_inline_block"> |
| 89 | - <input type="checkbox" name="options[ajax_load]" id="ajax_load" value="1"<?php echo ( $values['ajax_load'] ) ? ' checked="checked"' : ''; ?> /> <?php esc_html_e( 'Load and save form builder page with AJAX', 'formidable' ); ?> | |
| 90 | - <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Recommended for long forms.', 'formidable' ); ?>"></span> | |
| 106 | + <input type="checkbox" name="options[ajax_load]" id="ajax_load" value="1"<?php echo $values['ajax_load'] ? ' checked="checked"' : ''; ?> /> <?php esc_html_e( 'Load and save form builder page with AJAX', 'formidable' ); ?> | |
| 107 | + <?php FrmAppHelper::tooltip_icon( __( 'Recommended for long forms.', 'formidable' ) ); ?> | |
| 91 | 108 | </label> |
| 92 | 109 | </td> |
| 93 | 110 | </tr> |
| 94 | 111 | <?php do_action( 'frm_add_form_ajax_options', $values ); ?> |
| 95 | - <?php if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() ) { ?> | |
| 96 | - <tr> | |
| 97 | - <td> | |
| 98 | - <label for="ajax_submit"> | |
| 99 | - <input type="checkbox" name="options[ajax_submit]" id="ajax_submit" value="1" <?php checked( $values['ajax_submit'], 1 ); ?> /> | |
| 100 | - <?php esc_html_e( 'Submit this form with AJAX', 'formidable' ); ?> | |
| 101 | - <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Submit the form without refreshing the page.', 'formidable' ); ?>"></span> | |
| 102 | - </label> | |
| 103 | - </td> | |
| 104 | - </tr> | |
| 105 | - <?php } ?> | |
| 106 | 112 | <tr> |
| 107 | 113 | <td> |
| 114 | + <label for="ajax_submit"> | |
| 115 | + <input type="checkbox" name="options[ajax_submit]" id="ajax_submit" value="1" <?php checked( $values['ajax_submit'], 1 ); ?> /> | |
| 116 | + <?php esc_html_e( 'Submit this form with AJAX', 'formidable' ); ?> | |
| 117 | + <?php FrmAppHelper::tooltip_icon( __( 'Submit the form without refreshing the page.', 'formidable' ) ); ?> | |
| 118 | + </label> | |
| 119 | + </td> | |
| 120 | + </tr> | |
| 121 | + <tr> | |
| 122 | + <td> | |
| 108 | 123 | <label for="js_validate" class="frm_inline_block"> |
| 109 | 124 | <input type="checkbox" name="options[js_validate]" id="js_validate" value="1" <?php checked( $values['js_validate'], 1 ); ?> /> |
| 110 | 125 | <?php esc_html_e( 'Validate this form with javascript', 'formidable' ); ?> |
| 111 | - <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Required fields, email format, and number format can be checked instantly in your browser. You may want to turn this option off if you have any customizations to remove validation messages on certain fields.', 'formidable' ); ?>" data-container="body"></span> | |
| 126 | + <?php FrmAppHelper::tooltip_icon( __( 'Required fields, email format, and number format can be checked instantly in your browser. You may want to turn this option off if you have any customizations to remove validation messages on certain fields.', 'formidable' ), array( 'data-container' => 'body' ) ); ?> | |
| 112 | 127 | </label> |
| 113 | 128 | </td> |
| 114 | 129 | </tr> |
| 115 | 130 | </table> |
| 116 | 131 | |
| 132 | +<input type="hidden" name="options[custom_style]" value="<?php echo esc_attr( $values['custom_style'] ); ?>" /> | |
| 133 | + | |
| 117 | 134 | <!--Permissions Section--> |
| 118 | -<?php do_action( 'frm_add_form_perm_options', $values ); ?> | |
| 135 | +<?php | |
| 136 | +do_action( 'frm_add_form_perm_options', $values ); | |
| 119 | 137 | |
| 120 | -<?php | |
| 121 | 138 | /* |
| 122 | 139 | * We keep this section to make the frm_add_form_msg_options hook still work after we moved the Success message option |
| 123 | 140 | * to the On Submit action, and moved the Draft message option to the below of its checkbox. |
| 124 | 141 | */ |