Skip to content

Commit e0bd971

Browse files
avonvilleavonville
authored
Merge pull request #139 from BoldGrid/issue-136
Added data-style to all fields
2 parents 794a6ae + 05a143e commit e0bd971

16 files changed

+113
-60
lines changed

‎includes/class-form.php‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ public function entries() {
373373
/**
374374
* When a user is editing their form they may change a fields name.
375375
* This method will loop through existing entries to match the new field names.
376-
*
376+
*
377377
* @since 1.6.9
378-
*
378+
*
379379
* @param int $form_id
380380
* @param array $form_fields
381381
*/
@@ -386,23 +386,22 @@ public function maybe_update_entries( $form_fields ) {
386386
$updated_fields = $this->rename_field( $old, $new );
387387
}
388388
}
389-
389+
390390
/**
391391
* When a user is editing their form they may change a fields name.
392392
* This method will loop through all fields that have changed.
393-
*
393+
*
394394
* @since 1.6.9
395-
*
395+
*
396396
* @param int $form_id
397397
* @param array $form_fields
398-
*
398+
*
399399
* @return array
400400
*/
401401
public function get_changed_fields( $form_fields ) {
402402
$changed_fields = array();
403403
foreach ( $form_fields as $field ) {
404404
$org_field = $field['original_name'];
405-
error_log("Org Field" . " = " . print_r($org_field,1));
406405
// All form fields should have an original name.
407406
if ( empty( $field['original_name'] ) ) {
408407
continue;
@@ -420,20 +419,20 @@ public function get_changed_fields( $form_fields ) {
420419
/**
421420
* When a user changes the field names of a form, the existing entries will need updated.
422421
* This method will loop through the existing entries and update them will the new names.
423-
*
422+
*
424423
* @since 1.6.9
425-
*
424+
*
426425
* @param int $form_id
427426
* @param array $form_fields
428-
*
427+
*
429428
* @return array
430429
*/
431430
public function rename_field ( $old, $new ) {
432431
global $wpdb;
433432

434433
$entries = weforms_get_form_entries( $this->id );
435434

436-
foreach ( $entries as $entry ) {
435+
foreach ( $entries as $entry ) {
437436
$entry_id = $entry->id;
438437
$values = weforms_get_entry_meta( $entry_id );
439438
$update_keys = $wpdb->update( $wpdb->weforms_entrymeta, array( 'meta_key' => $new ), array( 'meta_key' => $old, 'weforms_entry_id' => $entry_id ) );

‎includes/fields/class-field-checkbox.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23-
$selected = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
24+
$selected = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
2425
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2526
<?php $this->print_label( $field_settings, $form_id ); ?>
26-
2727
<?php do_action( 'weforms_checkbox_field_after_label', $field_settings ); ?>
28-
<div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio">
29-
28+
<div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
3029
<?php
3130
if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
3231
foreach ( $field_settings['options'] as $value => $option ) {

‎includes/fields/class-field-column.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ public function __construct() {
2222
* @return void
2323
*/
2424
public function render( $field_settings, $form_id, $type = 'post', $post_id = null ) {
25-
$i = 1;
26-
$columns = $field_settings['columns'];
27-
$columns_size = $field_settings['inner_columns_size'];
28-
$column_space = $field_settings['column_space'];
29-
$inner_fields = $field_settings['inner_fields'];
30-
$atts = []; ?>
25+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
26+
$i = 1;
27+
$columns = $field_settings['columns'];
28+
$columns_size = $field_settings['inner_columns_size'];
29+
$column_space = $field_settings['column_space'];
30+
$inner_fields = $field_settings['inner_fields'];
31+
$atts = []; ?>
3132
<li class="wpuf-el">
32-
<div class="wpuf-field-columns <?php echo 'has-columns-' . esc_attr( $columns ); ?>">
33+
<div class="wpuf-field-columns <?php echo 'has-columns-' . esc_attr( $columns ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
3334
<div class="wpuf-column-field-inner-columns">
3435
<div class="wpuf-column">
3536
<?php while ( $i <= $columns ) { ?>

‎includes/fields/class-field-date.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,25 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23-
$value = ''; ?>
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
24+
$value = '';
25+
?>
2426
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2527
<?php $this->print_label( $field_settings ); ?>
2628

2729
<div class="wpuf-fields">
28-
<input id="wpuf-date-<?php echo esc_attr( $field_settings['name'] ); ?>" type="text" <?php echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly'; ?> class="datepicker <?php echo ' wpuf_'.esc_attr( $field_settings['name'] ).'_'. esc_attr($form_id); ?>" data-required="<?php echo esc_attr($field_settings['required']) ?>" data-type="text" name="<?php echo esc_attr( $field_settings['name'] ); ?>" placeholder="<?php echo esc_attr( $field_settings['format'] ); ?>" value="<?php echo esc_attr( $value ) ?>" size="30" />
30+
<input
31+
id="wpuf-date-<?php echo esc_attr( $field_settings['name'] ); ?>"
32+
type="text" <?php echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly'; ?>
33+
class="datepicker <?php echo ' wpuf_'.esc_attr( $field_settings['name'] ).'_'. esc_attr($form_id); ?>"
34+
data-required="<?php echo esc_attr($field_settings['required']) ?>"
35+
data-type="text"
36+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
37+
name="<?php echo esc_attr( $field_settings['name'] ); ?>"
38+
placeholder="<?php echo esc_attr( $field_settings['format'] ); ?>"
39+
value="<?php echo esc_attr( $value ) ?>"
40+
size="30"
41+
/>
2942
<?php $this->help_text( $field_settings ); ?>
3043
</div>
3144
</li>

‎includes/fields/class-field-dropdown.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23-
$selected = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
24-
$name = $field_settings['name']; ?>
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
24+
$selected = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
25+
$name = $field_settings['name']; ?>
2526
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2627
<?php $this->print_label( $field_settings, $form_id ); ?>
2728

@@ -33,12 +34,12 @@ class="<?php echo 'wpuf_'. esc_attr( $field_settings['name'] ) .'_'. esc_attr( $
3334
id="<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>"
3435
name="<?php echo esc_attr( $name ); ?>"
3536
data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
36-
data-type="select">
37-
37+
data-type="select"
38+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
39+
>
3840
<?php if ( !empty( $field_settings['first'] ) ) { ?>
3941
<option value=""><?php echo esc_attr( $field_settings['first'] ); ?></option>
4042
<?php } ?>
41-
4243
<?php
4344
if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
4445
foreach ($field_settings['options'] as $value => $option) {

‎includes/fields/class-field-email.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public function render( $field_settings, $form_id ) {
2525
if ( isset( $field_settings['auto_populate'] ) && $field_settings['auto_populate'] == 'yes' && is_user_logged_in() ) {
2626
return;
2727
}
28-
29-
$value = $field_settings['default']; ?>
28+
$form_settings = weforms()->form->get( $form_id )->get_settings();
29+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
30+
$value = $field_settings['default']; ?>
3031
<li <?php $this->print_list_attributes( $field_settings ); ?>>
3132
<?php $this->print_label( $field_settings, $form_id ); ?>
3233

@@ -38,6 +39,7 @@ class="email <?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_a
3839
data-duplicate="<?php echo isset( $field_settings['duplicate'] ) ? esc_attr( $field_settings['duplicate'] ) : 'no'; ?>"
3940
data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
4041
data-type="email"
42+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
4143
name="<?php echo esc_attr( $field_settings['name'] ); ?>"
4244
placeholder="<?php echo esc_attr( $field_settings['placeholder'] ); ?>"
4345
value="<?php echo esc_attr( $value ); ?>"

‎includes/fields/class-field-html.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
2324
?>
2425
<li <?php $this->print_list_attributes( $field_settings ); ?>>
25-
<div class="wpuf-fields <?php echo 'html_' . esc_attr( $form_id ); ?><?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>">
26+
<div class="wpuf-fields <?php echo 'html_' . esc_attr( $form_id ); ?><?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
2627
<?php echo $field_settings['html']; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
2728
</div>
2829

‎includes/fields/class-field-image.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
2324
$unique_id = sprintf( '%s-%d', $field_settings['name'], $form_id ); ?>
2425
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2526
<?php $this->print_label( $field_settings, $form_id ); ?>
26-
2727
<div class="wpuf-fields">
2828
<div id="wpuf-<?php echo esc_attr( $unique_id ); ?>-upload-container">
29-
<div class="wpuf-attachment-upload-filelist" data-type="file" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>">
29+
<div class="wpuf-attachment-upload-filelist" data-type="file" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
3030
<a id="wpuf-<?php echo esc_attr( $unique_id ); ?>-pickfiles" data-form_id="<?php echo esc_attr( $form_id ); ?>" class="button file-selector <?php echo ' wpuf_' . esc_attr( $field_settings['name'] ) . '_' . esc_attr(
3131
$form_id); ?>" href="#"><?php echo esc_attr ( $field_settings['button_label'] ); ?></a>
3232

‎includes/fields/class-field-multidropdown.php‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,26 @@ public function __construct() {
2020
* @return void
2121
*/
2222
public function render( $field_settings, $form_id ) {
23-
$selected = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
24-
$selected = is_array( $selected ) ? $selected : [];
25-
$name = $field_settings['name'] . '[]'; ?>
23+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
24+
$selected = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
25+
$selected = is_array( $selected ) ? $selected : [];
26+
$name = $field_settings['name'] . '[]'; ?>
2627
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2728
<?php $this->print_label( $field_settings, $form_id ); ?>
2829

2930
<?php do_action( 'weforms_multidropdown_field_after_label', $field_settings ); ?>
3031

3132
<div class="wpuf-fields">
32-
<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">
33+
<select
34+
multiple="multiple"
35+
class="multiselect <?php echo 'wpuf_'. esc_attr( $field_settings['name'] ) .'_'. esc_attr( $form_id ); ?>"
36+
id="<?php echo esc_attr($field_settings['name']) . '_' . esc_attr($form_id); ?>"
37+
name="<?php echo esc_attr($name); ?>"
38+
mulitple="multiple"
39+
data-required="<?php echo esc_attr($field_settings['required']) ?>"
40+
data-type="multiselect"
41+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
42+
>
3343

3444
<?php if ( !empty( $field_settings['first'] ) ) { ?>
3545
<option value=""><?php echo esc_attr($field_settings['first']); ?></option>

‎includes/fields/class-field-name.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ public function render( $field_settings, $form_id ) {
2424
// let's not show the name field if user choose to auto populate for logged users
2525
if ( isset( $field_settings['auto_populate'] ) && $field_settings['auto_populate'] == 'yes' && is_user_logged_in() ) {
2626
return;
27-
} ?>
27+
}
28+
$form_settings = weforms()->form->get( $form_id )->get_settings();
29+
30+
$use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
31+
?>
2832
<li <?php $this->print_list_attributes( $field_settings ); ?>>
2933
<?php $this->print_label( $field_settings, $form_id ); ?>
3034

3135
<div class="wpuf-fields">
32-
<div class="wpuf-name-field-wrap format-<?php echo esc_attr( $field_settings['format'] ); ?>">
36+
<div class="wpuf-name-field-wrap format-<?php echo esc_attr( $field_settings['format'] ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
3337
<div class="wpuf-name-field-first-name">
3438
<input
3539
name="<?php echo esc_attr( $field_settings['name'] ) ?>[first]"
@@ -39,11 +43,12 @@ public function render( $field_settings, $form_id ) {
3943
size="40"
4044
data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
4145
data-type="text"
46+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
4247
class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php echo esc_attr( $form_id); ?>"
4348
autocomplete="given-name"
4449
>
4550
<?php if ( ! $field_settings['hide_subs'] ) : ?>
46-
<label class="wpuf-form-sub-label"><?php esc_html_e( 'First', 'weforms' ); ?></label>
51+
<label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'First', 'weforms' ); ?></label>
4752
<?php endif; ?>
4853
</div>
4954

@@ -56,9 +61,10 @@ class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php e
5661
value="<?php echo esc_attr( $field_settings['middle_name']['default'] ); ?>"
5762
size="40"
5863
autocomplete="additional-name"
64+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
5965
>
6066
<?php if ( ! $field_settings['hide_subs'] ) : ?>
61-
<label class="wpuf-form-sub-label"><?php esc_html_e( 'Middle', 'weforms' ); ?></label>
67+
<label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'Middle', 'weforms' ); ?></label>
6268
<?php endif; ?>
6369
</div>
6470
<?php } else { ?>
@@ -73,9 +79,10 @@ class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php e
7379
value="<?php echo esc_attr( $field_settings['last_name']['default'] ); ?>"
7480
size="40"
7581
autocomplete="family-name"
82+
data-style="<?php echo esc_attr( $use_theme_css ); ?>"
7683
>
7784
<?php if ( ! $field_settings['hide_subs'] ) : ?>
78-
<label class="wpuf-form-sub-label"><?php esc_html_e( 'Last', 'weforms' ); ?></label>
85+
<label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'Last', 'weforms' ); ?></label>
7986
<?php endif; ?>
8087
</div>
8188
</div>

0 commit comments

Comments
 (0)