Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
64ae274
Add email settings tab
truongwp Jul 17, 2025
363d27b
Update icons
truongwp Jul 17, 2025
a1bbc2a
Completed email style settings tab
truongwp Jul 23, 2025
a948948
Add email style dropdown to Send mail action
truongwp Jul 24, 2025
8ddb0d8
Implement new email style setting in email
truongwp Jul 24, 2025
76609ed
Add email style preview handler
truongwp Jul 24, 2025
1aa7587
Improve Email Style dropdown
truongwp Jul 25, 2025
8d80989
Doing preview email style
truongwp Jul 25, 2025
6ddb425
Completed email style classic preview
truongwp Jul 28, 2025
18d1bdd
Completed email style plain text preview
truongwp Jul 28, 2025
3a2b1e7
Working on send test email
truongwp Jul 29, 2025
2b7e055
Complete send test email
truongwp Jul 29, 2025
91e4410
Complete previewing compact style
truongwp Jul 30, 2025
05bc561
Complete previewing modern and sleek style
truongwp Jul 30, 2025
6ebdeb1
Improve styling of Pro styles
truongwp Jul 30, 2025
8363458
Improve styling of email styles backend
truongwp Jul 31, 2025
44cc26f
Move upsell settings to hook
truongwp Jul 31, 2025
c9a982c
Improve email styles settings
truongwp Jul 31, 2025
40c83eb
Move email styles out of table generator
truongwp Aug 12, 2025
af0ff84
Move some Pro code to Lite
truongwp Aug 13, 2025
81c3a39
Improve table generator
truongwp Aug 13, 2025
1aff8f9
Fix email header image in previewing
truongwp Aug 13, 2025
4ef03bd
Restore classic email style when previewing
truongwp Aug 13, 2025
a86fe29
Add border color setting
truongwp Aug 14, 2025
b5ce9e4
Add some getter for table styles
truongwp Aug 15, 2025
c9f0752
Fix wrong email style
truongwp Aug 18, 2025
4a846a6
Update email settings styling
truongwp Aug 19, 2025
8cd9a17
Use fake color picker for upsell settings
truongwp Aug 22, 2025
92f092a
Add doc comments
truongwp Aug 27, 2025
d5d09e2
Merge branch 'master' into email-styles
truongwp Aug 27, 2025
7ea7acf
Fix PHPCS
truongwp Aug 27, 2025
a6f1c5d
Fix PHPSyntax
truongwp Aug 27, 2025
18f14d3
Merge branch 'master' into email-styles
truongwp Aug 28, 2025
6422f86
Fix style tag is stripped
truongwp Aug 28, 2025
7f53b5c
Use frm_change_settings cap
truongwp Aug 28, 2025
a173e6c
Fix doc comment types
truongwp Aug 28, 2025
c4d9aeb
Fix wrong comment
truongwp Aug 28, 2025
b433b29
Fix types
truongwp Aug 28, 2025
468af73
Fix JS isn't loaded
truongwp Aug 29, 2025
f08f0a7
Fix Cypress errors
truongwp Aug 29, 2025
fde930c
Fix PHPUnit
truongwp Aug 29, 2025
faca4e4
Set email style to classic when Pro is deactivated
truongwp Aug 29, 2025
649536a
Fix PHPCS
truongwp Aug 29, 2025
24ebb0a
Fix eslint
truongwp Aug 29, 2025
27cfd5e
Set email style to classic when Pro is deactivated
truongwp Aug 29, 2025
b59fad8
Pass email style to entry formatter
truongwp Aug 29, 2025
f097347
Refactor code
truongwp Aug 29, 2025
7f09cb8
Add more unit tests
truongwp Sep 8, 2025
7c60102
Fix PHP CS Fixer
truongwp Sep 8, 2025
ae7ef45
Add more unit tests
truongwp Sep 8, 2025
2d0979c
Clean code
truongwp Sep 8, 2025
8e0df5c
Merge branch 'master' into email-styles
truongwp Sep 8, 2025
de3c02e
Merge branch 'master' into email-styles
truongwp Sep 24, 2025
24787d8
Improve colorpicker style in email settings
truongwp Sep 29, 2025
dc07a0b
Improve colorpicker style in settings
truongwp Sep 29, 2025
039a40a
Improve some styling
truongwp Sep 29, 2025
16785aa
Fix PHPCS
truongwp Sep 29, 2025
d0d34b7
Clean code
truongwp Sep 30, 2025
9d18c91
Separate function
truongwp Sep 30, 2025
49bb3f5
Merge branch 'master' into email-styles
truongwp Sep 30, 2025
f483047
Use border-spacing instead of cellspacing
truongwp Sep 30, 2025
aceff68
Fix phpcs
truongwp Sep 30, 2025
b790250
Fix phpcs
truongwp Sep 30, 2025
dd1f3ee
Fix PHPUnit
truongwp Sep 30, 2025
fb772fb
Merge branch 'master' into email-styles
Crabcyborg Sep 30, 2025
02bcd66
Remove commented code
truongwp Sep 30, 2025
3f86d80
Merge branch 'email-styles' of github.com:Strategy11/formidable-forms…
truongwp Sep 30, 2025
cb5f046
Improve email content type header code
truongwp Oct 1, 2025
a76bb31
Update email style tip URL
truongwp Oct 1, 2025
f60c848
Update email style tip URL
truongwp Oct 2, 2025
301e10c
Merge branch 'master' into email-styles
Crabcyborg Oct 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions classes/controllers/FrmAppController.php
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,8 @@ public static function admin_js() {

global $pagenow;
if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) {
self::enqueue_global_settings_scripts( $page );

wp_enqueue_script( 'admin-widgets' );
wp_enqueue_style( 'widgets' );
self::maybe_deregister_popper2();
Expand Down Expand Up @@ -809,6 +811,18 @@ private static function enqueue_builder_assets( $plugin_url, $version ) {
wp_enqueue_script( 'formidable-settings-components' );
}

/**
* Enqueues global settings scripts.
*
* @param string $page The `page` param in URL.
*/
private static function enqueue_global_settings_scripts( $page ) {
if ( 'formidable-settings' === $page ) {
wp_enqueue_style( 'wp-color-picker' );
wp_enqueue_script( 'formidable_settings' );
}
}

/**
* Avoid loading dropzone CSS on the form list page. It isn't required there.
*
Expand Down
Loading