| @@ -9,11 +9,12 @@ | ||
| 9 | 9 | if ( ! defined( 'ABSPATH' ) ) { |
| 10 | 10 | exit; // Exit if accessed directly. |
| 11 | 11 | } |
| 12 | 12 | ?> |
| 13 | + | |
| 13 | 14 | <?php |
| 14 | 15 | |
| 15 | -//wmvc_dump($field); | |
| 16 | +//dump($field); | |
| 16 | 17 | |
| 17 | 18 | if(isset($field->field)) |
| 18 | 19 | { |
| 19 | 20 | $field_id = $field->field; |
| @@ -23,9 +24,12 @@ | ||
| 23 | 24 | $field_id = 'field_'.$field->idfield; |
| 24 | 25 | } |
| 25 | 26 | |
| 26 | 27 | if(!isset($field->hint))$field->hint = ''; |
| 28 | +if(!isset($field->class))$field->class = ''; | |
| 27 | 29 | if(!isset($field->columns_number))$field->columns_number = ''; |
| 30 | +if(!isset($field->values))$field->values = array($field_id => $field->field_label); | |
| 31 | + | |
| 28 | 32 | $field_label = $field->field_label; |
| 29 | 33 | |
| 30 | 34 | $required = ''; |
| 31 | 35 | if(isset($field->is_required) && $field->is_required == 1) |
| @@ -30,34 +34,22 @@ | ||
| 30 | 34 | $required = ''; |
| 31 | 35 | if(isset($field->is_required) && $field->is_required == 1) |
| 32 | 36 | $required = '*'; |
| 33 | 37 | |
| 34 | -if(!empty($field->values) && is_array($field->values)){ | |
| 35 | - $values = $field->values; | |
| 36 | -} else { | |
| 37 | - $values = array(); | |
| 38 | - if(!empty($field->values_list)){ | |
| 39 | - $values = explode(',', $field->values_list); | |
| 40 | - $values = array(''=> __('Not Selected', 'wpdirectorykit')) + array_combine($values, $values); | |
| 41 | - } | |
| 42 | -} | |
| 38 | +if(isset($field->rules) && strpos($field->rules, 'required') !== FALSE) | |
| 39 | + $required = '*'; | |
| 43 | 40 | ?> |
| 44 | 41 | |
| 45 | -<div class="wdk-field-edit <?php echo esc_attr($field->field_type); ?> wdk-col-<?php echo esc_attr($field->columns_number); ?> <?php echo esc_attr($field->class); ?>"> | |
| 42 | +<div class="wdk-field-<?php echo esc_attr($field_id);?> wdk-field-edit <?php echo esc_attr($field->field_type); ?> wdk-col-<?php echo esc_attr($field->columns_number); ?> <?php echo esc_attr($field->class); ?>"> | |
| 46 | 43 | <label for="<?php echo esc_attr($field_id); ?>"><?php echo esc_html($field_label).esc_html($required); ?></label> |
| 47 | 44 | <div class="wdk-field-container"> |
| 48 | 45 | <fieldset> |
| 49 | - <legend class="screen-reader-text"><span><?php echo __('Visible on','wpdirectorykit'); ?></span></legend> | |
| 50 | - | |
| 51 | - <?php foreach($values as $key => $value):?> | |
| 52 | - <div> | |
| 53 | - <label for="<?php echo esc_attr($field_id.'_'.$key); ?>"> | |
| 54 | - <input name="<?php echo esc_attr($field_id); ?>" type="radio" id="<?php echo esc_attr($field_id.'_'.$key); ?>" value="<?php echo esc_html($key);?>" <?php echo (wmvc_show_data($field_id, $db_data, '') == $value)?'checked':''; ?>> <?php echo esc_html($value);?> | |
| 55 | - </label> | |
| 56 | - </div> | |
| 57 | - <?php endforeach;?> | |
| 46 | + <legend class="screen-reader-text"><span><?php echo esc_html__('Visible on','wpdirectorykit'); ?></span></legend> | |
| 47 | + <?php foreach($field->values as $field_key => $field_value): ?> | |
| 48 | + <input name="<?php echo esc_attr($field_id); ?>" type="radio" id="<?php echo esc_attr($field_id); ?>_<?php echo esc_attr($field_key); ?>" value="<?php echo esc_attr($field_key); ?>" <?php echo !empty(wmvc_show_data($field_id, $db_data, '') == $field_key)?'checked':''; ?>> | |
| 49 | + <label for="<?php echo esc_attr($field_id); ?>_<?php echo esc_attr($field_key); ?>"><?php echo esc_html($field_value); ?></label> | |
| 50 | + <?php endforeach; ?> | |
| 58 | 51 | </fieldset> |
| 59 | - | |
| 60 | 52 | <?php if(!empty($field->hint)):?> |
| 61 | 53 | <p class="wdk-hint"> |
| 62 | 54 | <?php echo esc_html($field->hint); ?> |
| 63 | 55 | </p> |
| @@ -62,5 +54,5 @@ | ||
| 62 | 54 | <?php echo esc_html($field->hint); ?> |
| 63 | 55 | </p> |
| 64 | 56 | <?php endif;?> |
| 65 | 57 | </div> |
| 66 | -</div> | |
| 58 | +</div> | |