| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | <?php |
| 2 | -// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped -- PFBC View class, HTML output is controlled | |
| 3 | 2 | class AccuaForm_View_Standard extends View { |
| 4 | 3 | public function render() { |
| 5 | 4 | echo '<form', $this->form->getAttributes(), '>'; |
| 6 | 5 | $this->form->getError()->render(); |
| @@ -25,32 +24,18 @@ | ||
| 25 | 24 | } |
| 26 | 25 | if ($element instanceof AccuaForm_Element_FieldsetBegin || $element instanceof AccuaForm_Element_FieldsetEnd) { |
| 27 | 26 | $element->render(); |
| 28 | 27 | } else { |
| 29 | - echo '<div class="pfbc-element-', $elementCount, ' pfbc-element'; | |
| 30 | - if($element->hasErrors()) { | |
| 31 | - echo ' pfbc-element-has-error'; | |
| 32 | - } | |
| 33 | - $_wrapperClass = $element->getWrapperCssClass(); | |
| 34 | - if(!empty($_wrapperClass)) { | |
| 35 | - echo ' ', esc_attr($_wrapperClass); | |
| 36 | - } | |
| 37 | - echo '"'; | |
| 38 | - $_wrapperId = $element->getWrapperCssId(); | |
| 39 | - if(!empty($_wrapperId)) { | |
| 40 | - echo ' id="', esc_attr($_wrapperId), '"'; | |
| 41 | - } | |
| 42 | - echo '>', $element->getPreHTML(); | |
| 28 | + echo '<div class="pfbc-element-', $elementCount, ' pfbc-element">', $element->getPreHTML(); | |
| 43 | 29 | $this->renderLabel($element); |
| 44 | - if ($element instanceof Element_HTML) { | |
| 45 | - $element->render(); | |
| 46 | - } else { | |
| 47 | - echo '<div class="pfbc-fieldwrap">'; | |
| 30 | + if ($element instanceof Element_HTML) { | |
| 31 | + $element->render(); | |
| 32 | + } else { | |
| 33 | + echo '<div class="pfbc-fieldwrap">'; | |
| 48 | 34 | $element->render(); |
| 49 | 35 | echo '</div>'; |
| 50 | - $this->renderInlineError($element); | |
| 51 | 36 | } |
| 52 | - echo $element->getPostHTML(), '<div class="pfbc-elementbottom"></div></div>'; | |
| 37 | + echo $element->getPostHTML(), '<div class="pfbc-elementbottom"></div></div>'; | |
| 53 | 38 | ++$elementCount; |
| 54 | 39 | } |
| 55 | 40 | } |
| 56 | 41 | } |
| @@ -72,9 +57,9 @@ | ||
| 72 | 57 | echo '<div class="pfbc-label">'; |
| 73 | 58 | if(!empty($label)) { |
| 74 | 59 | echo '<label for="', $id, '">', $label; |
| 75 | 60 | if($element->isRequired()) |
| 76 | - echo ' <span class="pfbc-required" aria-label="required">*</span>'; | |
| 61 | + echo ' <strong>*</strong>'; | |
| 77 | 62 | echo '</label>'; |
| 78 | 63 | } |
| 79 | 64 | if(!empty($description)) |
| 80 | 65 | echo '<em>', $description, '</em>'; |