Skip to content

Commit 6974adf

Browse files
sapaythsapayth
authored
enhance: revamp registration template 1 (#1723)
* enhance: revamp registration template 1 * fix: form preview styling is not working * optimization * added layout5 * fix: registration form preview is not working * fix: Respect use_theme_css and enqueue correct layout template styles Fix use_theme_css setting detection and properly map layout values (layout1, layout2, etc.) to registered style handles (reg-template-1, reg-template-2, etc.). Remove incorrect style enqueue and debug logging.
1 parent 27a13f1 commit 6974adf

File tree

6 files changed

+76
-23
lines changed

6 files changed

+76
-23
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ tests/chrome_recordings
5353
*.min.js.*
5454
*.min.css.*
5555
tests/e2e/plugins-page-wpuf-lite-check.png
56-
tests/e2e/screenshots
56+
tests/e2e/screenshots

‎includes/Fields/Form_Field_MultiDropdown.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public function __construct() {
2424
* @return void
2525
*/
2626
public function render( $field_settings, $form_id, $type = 'post', $post_id = null ) {
27+
// Enqueue custom multi-select assets
28+
$this->enqueue_multiselect_assets();
29+
2730
if ( isset( $post_id ) && $post_id != '0' ) {
2831
$selected = $this->get_meta( $post_id, $field_settings['name'], $type );
2932

@@ -47,7 +50,7 @@ public function render( $field_settings, $form_id, $type = 'post', $post_id = nu
4750
<?php do_action( 'WPUF_multidropdown_field_after_label', $field_settings ); ?>
4851

4952
<div class="wpuf-fields">
50-
<select multiple="multiple" class="multiselect <?php echo 'wpuf_' . esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>" id="<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>" name="<?php echo esc_attr( $name ); ?>" mulitple="multiple" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>" data-type="multiselect">
53+
<select multiple="multiple" class="multiselect wpuf-multiselect-field <?php echo 'wpuf_' . esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>" id="<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>" name="<?php echo esc_attr( $name ); ?>" multiple="multiple" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>" data-type="multiselect" data-placeholder="<?php echo esc_attr( $field_settings['first'] ); ?>">
5154

5255
<?php if ( !empty( $field_settings['first'] ) ) { ?>
5356
<option value="-1"><?php echo esc_attr( $field_settings['first'] ); ?></option>
@@ -170,4 +173,18 @@ public function render_field_data( $data, $field ) {
170173
<?php
171174
return ob_get_clean();
172175
}
176+
177+
/**
178+
* Enqueue custom multi-select assets
179+
*
180+
* @since WPUF_SINCE
181+
*
182+
* @return void
183+
*/
184+
private function enqueue_multiselect_assets() {
185+
// Check if we're in the frontend
186+
if ( ! is_admin() ) {
187+
wp_enqueue_script( 'wpuf-custom-multiselect' );
188+
}
189+
}
173190
}

‎includes/Frontend_Render_Form.php‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace WeDevs\Wpuf;
44

5+
use WeDevs\Wpuf\Admin\Forms\Form;
56
use WeDevs\Wpuf\Admin\Subscription;
67

78
class Frontend_Render_Form {
@@ -197,15 +198,50 @@ public function render_form( $form_id, $post_id = null, $atts = [], $form = null
197198

198199
$label_position = isset( $this->form_settings['label_position'] ) ? $this->form_settings['label_position'] : 'left';
199200

200-
$layout = isset( $this->form_settings['form_layout'] ) ? $this->form_settings['form_layout'] : 'layout1';
201+
$layout = 'layout1';
201202

202203
$theme_css = isset( $this->form_settings['use_theme_css'] ) ? $this->form_settings['use_theme_css'] : 'wpuf-style';
203204

204205
do_action( 'wpuf_before_form_render', $form_id );
205206

206-
if ( ! empty( $layout ) ) {
207-
wp_enqueue_style( 'wpuf-' . $layout );
207+
$form = new Form($form_id);
208+
209+
// Check if Use Theme CSS is enabled - if so, don't enqueue plugin styles
210+
$use_theme_css = isset( $this->form_settings['use_theme_css'] ) ? $this->form_settings['use_theme_css'] : '';
211+
212+
if ( 'wpuf_profile' === $form->data->post_type && 'on' !== $use_theme_css ) {
213+
$layout = isset( $this->form_settings['profile_form_layout'] ) ? $this->form_settings['profile_form_layout'] : 'layout1';
214+
switch ( $layout ) {
215+
case 'layout2':
216+
wp_enqueue_style( 'wpuf-reg-template-2' );
217+
break;
218+
219+
case 'layout3':
220+
wp_enqueue_style( 'wpuf-reg-template-3' );
221+
break;
222+
223+
case 'layout4':
224+
wp_enqueue_style( 'wpuf-reg-template-4' );
225+
break;
226+
227+
case 'layout5':
228+
wp_enqueue_style( 'wpuf-reg-template-5' );
229+
break;
230+
231+
default:
232+
wp_enqueue_style( 'wpuf-reg-template-1' );
233+
break;
234+
}
235+
} else {
236+
$layout = isset( $this->form_settings['form_layout'] ) ? $this->form_settings['form_layout'] : 'layout1';
237+
238+
if ( ! empty( $layout ) && 'on' !== $use_theme_css ) {
239+
// Always enqueue the base template style
240+
wp_enqueue_style( 'wpuf-reg-template-base' );
241+
wp_enqueue_style( 'wpuf-' . $layout );
242+
}
208243
}
244+
209245
if ( ! is_user_logged_in() && ( ! empty( $this->form_settings['post_permission'] ) && 'guest_post' !== $this->form_settings['post_permission'] ) ) {
210246
$login = wpuf()->frontend->simple_login->get_login_url();
211247
$register = wpuf()->frontend->simple_login->get_registration_url();

‎includes/Render_Form.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public function render_form( $form_id, $post_id = null ) {
251251

252252
do_action( 'wpuf_before_form_render', $form_id );
253253

254-
if ( !empty( $layout ) ) {
254+
if ( ! empty( $layout ) && 'on' !== $theme_css ) {
255255
wp_enqueue_style( 'wpuf-' . $layout );
256256
}
257257

@@ -1334,12 +1334,12 @@ private function is_taxonomy_field_gated( $form_field ) {
13341334
if ( $form_field['input_type'] !== 'taxonomy' ) {
13351335
return false;
13361336
}
1337-
1337+
13381338
// If pro is active, no fields are gated
13391339
if ( wpuf_is_pro_active() ) {
13401340
return false;
13411341
}
1342-
1342+
13431343
// Check if this is a custom taxonomy
13441344
$builtin_taxonomies = apply_filters( 'wpuf_builtin_taxonomies_free', array( 'category', 'post_tag' ) );
13451345
return ! in_array( $form_field['name'], $builtin_taxonomies, true );

‎languages/wp-user-frontend.pot‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ msgstr ""
779779

780780
#: admin/html/form-settings-post.php:22 class/render-form.php:776
781781
#: includes/Admin/Forms/Admin_Form_Builder.php:83
782-
#: includes/Frontend_Render_Form.php:79 includes/Render_Form.php:638
782+
#: includes/Frontend_Render_Form.php:80 includes/Render_Form.php:638
783783
#: includes/class-frontend-render-form.php:183
784784
msgid "Save Draft"
785785
msgstr ""
@@ -1208,7 +1208,7 @@ msgstr ""
12081208
#: includes/Ajax/Admin_Form_Builder_Ajax.php:138
12091209
#: includes/Ajax/Admin_Form_Builder_Ajax.php:142
12101210
#: includes/Ajax/Admin_Form_Builder_Ajax.php:218
1211-
#: includes/Frontend_Render_Form.php:123
1211+
#: includes/Frontend_Render_Form.php:124
12121212
#: includes/Integrations/WPUF_ACF_Compatibility.php:76
12131213
#: includes/Integrations/WPUF_ACF_Compatibility.php:94
12141214
#: includes/Integrations/WPUF_ACF_Compatibility.php:160
@@ -1256,7 +1256,7 @@ msgstr ""
12561256
#: admin/template-post.php:150 includes/Admin/Forms/Template_Post.php:159
12571257
#: includes/Fields/Field_Contract.php:494
12581258
#: includes/Fields/Form_Field_MultiDropdown.php:11
1259-
#: includes/Fields/Form_Field_MultiDropdown.php:81
1259+
#: includes/Fields/Form_Field_MultiDropdown.php:84
12601260
msgid "Multi Select"
12611261
msgstr ""
12621262

@@ -1677,12 +1677,12 @@ msgstr ""
16771677
msgid "Invisible reCAPTCHA validation failed"
16781678
msgstr ""
16791679

1680-
#: class/render-form.php:378 includes/Frontend_Render_Form.php:187
1680+
#: class/render-form.php:378 includes/Frontend_Render_Form.php:188
16811681
#: includes/Render_Form.php:235 includes/class-frontend-render-form.php:289
16821682
msgid "Your selected form is no longer available."
16831683
msgstr ""
16841684

1685-
#: class/render-form.php:384 includes/Frontend_Render_Form.php:193
1685+
#: class/render-form.php:384 includes/Frontend_Render_Form.php:194
16861686
#: includes/Render_Form.php:241 includes/class-frontend-render-form.php:295
16871687
msgid "Please make sure you've published your form."
16881688
msgstr ""
@@ -2899,7 +2899,7 @@ msgstr ""
28992899
#: includes/Admin/Forms/Post/Templates/Post_Form_Template_Video.php:104
29002900
#: includes/Fields/Field_Contract.php:238
29012901
#: includes/Fields/Form_Field_Dropdown.php:110
2902-
#: includes/Fields/Form_Field_MultiDropdown.php:85
2902+
#: includes/Fields/Form_Field_MultiDropdown.php:88
29032903
#: includes/Fields/Form_Field_Post_Taxonomy.php:500
29042904
msgid "- Select -"
29052905
msgstr ""
@@ -2940,7 +2940,7 @@ msgstr ""
29402940
#: includes/Admin/Forms/Admin_Form_Builder.php:336
29412941
#: includes/Fields/Form_Field_Checkbox.php:112
29422942
#: includes/Fields/Form_Field_Dropdown.php:109
2943-
#: includes/Fields/Form_Field_MultiDropdown.php:84
2943+
#: includes/Fields/Form_Field_MultiDropdown.php:87
29442944
#: includes/Fields/Form_Field_Radio.php:111
29452945
msgid "Option"
29462946
msgstr ""
@@ -4732,7 +4732,7 @@ msgid "You already have an account in our site. Please login to continue."
47324732
msgstr ""
47334733

47344734
#: includes/Ajax/Frontend_Form_Ajax.php:752
4735-
#: includes/Frontend_Render_Form.php:227
4735+
#: includes/Frontend_Render_Form.php:258
47364736
#: includes/class-frontend-render-form.php:323
47374737
msgid "You do not have sufficient permissions to access this form."
47384738
msgstr ""
@@ -6922,13 +6922,13 @@ msgstr ""
69226922
msgid "Please Cancel Your Currently Active Pack first!"
69236923
msgstr ""
69246924

6925-
#: includes/Frontend_Render_Form.php:327
6925+
#: includes/Frontend_Render_Form.php:358
69266926
#: includes/class-frontend-render-form.php:928
69276927
#: templates/dashboard/posts.php:120
69286928
msgid "Featured"
69296929
msgstr ""
69306930

6931-
#: includes/Frontend_Render_Form.php:334
6931+
#: includes/Frontend_Render_Form.php:365
69326932
#: includes/class-frontend-render-form.php:936
69336933
#. translators: %1$s is Post type and %2$d is item
69346934
#. translators: %1$s is Post type and %2$s is total feature item

‎wpuf-functions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -531,27 +531,27 @@ function wpuf_get_image_sizes() {
531531
function wpuf_allowed_extensions() {
532532
$extesions = [
533533
'images' => [
534-
'ext' => 'jpg,jpeg,gif,png,bmp,webp',
534+
'ext' => 'jpg, jpeg, gif, png, bmp, webp',
535535
'label' => __( 'Images', 'wp-user-frontend' ),
536536
],
537537
'audio' => [
538-
'ext' => 'mp3,wav,ogg,wma,mka,m4a,ra,mid,midi',
538+
'ext' => 'mp3, wav, ogg, wma, mka, m4a, ra, mid, midi',
539539
'label' => __( 'Audio', 'wp-user-frontend' ),
540540
],
541541
'video' => [
542-
'ext' => 'avi,divx,flv,mov,ogv,mkv,mp4,m4v,divx,mpg,mpeg,mpe',
542+
'ext' => 'avi, divx, flv, mov, ogv, mkv, mp4, m4v, divx, mpg, mpeg, mpe',
543543
'label' => __( 'Videos', 'wp-user-frontend' ),
544544
],
545545
'pdf' => [
546546
'ext' => 'pdf',
547547
'label' => __( 'PDF', 'wp-user-frontend' ),
548548
],
549549
'office' => [
550-
'ext' => 'doc,ppt,pps,xls,mdb,docx,xlsx,pptx,odt,odp,ods,odg,odc,odb,odf,rtf,txt',
550+
'ext' => 'doc, ppt, pps, xls, mdb, docx, xlsx, pptx, odt, odp, ods, odg, odc, odb, odf, rtf, txt',
551551
'label' => __( 'Office Documents', 'wp-user-frontend' ),
552552
],
553553
'zip' => [
554-
'ext' => 'zip,gz,gzip,rar,7z',
554+
'ext' => 'zip, gz, gzip, rar, 7z',
555555
'label' => __( 'Zip Archives', 'wp-user-frontend' ),
556556
],
557557
'exe' => [

0 commit comments

Comments
 (0)