deleted file mode 100644

@@ -1,30 +0,0 @@

-

-<!-- indexer::stop -->

-<div class="<?= $this->class; ?> <?php echo $this->tableless ? 'tableless' : 'tableform'; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>

-

-  <?php if ($this->headline): ?>

-    <<?= $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>

-  <?php endif; ?>

-

-  <form<?php if ($this->action): ?> action="<?= $this->action; ?>"<?php endif; ?> id="<?php echo $this->formId; ?>" method="<?php echo $this->method; ?>" enctype="<?php echo $this->enctype; ?>"<?php echo $this->attributes; ?><?php echo $this->novalidate; ?>>

-    <div class="formbody">

-      <?php if ($this->method != 'get'): ?>

-        <input type="hidden" name="FORM_SUBMIT" value="<?= $this->formSubmit; ?>">

-        <input type="hidden" name="REQUEST_TOKEN" value="{{request_token}}">

-        <?php if ($this->maxFileSize): ?>

-          <input type="hidden" name="MAX_FILE_SIZE" value="<?= $this->maxFileSize; ?>">

-        <?php endif; ?>

-      <?php endif; ?>

-      <?= $this->hidden; ?>

-      <?php if (!$this->tableless): ?>

-        <table>

-          <?= $this->fields; ?>

-        </table>

-      <?php else: ?>

-        <?= $this->fields; ?>

-      <?php endif; ?>

-    </div>

-  </form>

-

-</div>

-<!-- indexer::continue -->

@@ -1,9 +1,6 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('label'); ?>

-<?php if ($this->hasErrors()): ?>

-  <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-<?php endif; ?>

 <?php if ($this->label): ?>

   <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

     <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

@@ -12,8 +9,14 @@

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-<input type="text" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="captcha mandatory<?php if ($this->class) echo ' ' . $this->class; ?>" value="" aria-describedby="captcha_text_<?= $this->id ?>"<?= $this->getAttributes() ?>>

-<span id="captcha_text_<?= $this->id ?>" class="captcha_text<?php if ($this->class) echo ' ' . $this->class; ?>"><?= $this->getQuestion() ?></span>

+

+  <input type="text" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="captcha mandatory<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>" value="" aria-describedby="captcha_text_<?= $this->id ?>"<?= $this->getAttributes() ?>>

+  <span id="captcha_text_<?= $this->id ?>" class="captcha_text<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>"><?= $this->getQuestion() ?></span>

+  <input type="hidden" name="<?= $this->name ?>_hash" value="<?= $this->getHash() ?>">

+

+<?php if ($this->hasErrors()): ?>

+  <p class="error"><?= $this->getErrorAsString() ?></p>

+<?php endif; ?>

 <?php if (!$this->hasErrors()): ?>

   <div style="display:none">

@@ -21,8 +24,15 @@

     <input type="text" name="<?= $this->name ?>_name" id="ctrl_<?= $this->id ?>_hp" value="">

   </div>

   <script>

-    document.getElementById('ctrl_<?= $this->id ?>').parentNode.style.display = 'none';

-    document.getElementById('ctrl_<?= $this->id ?>').value = '<?= $this->getSum() ?>';

+    var e = document.getElementById('ctrl_<?= $this->id ?>'),

+      p = e.parentNode, f = p.parentNode;

+

+    if ('fieldset' === f.nodeName.toLowerCase() && 1 === f.children.length) {

+      p = f;

+    }

+

+    p.style.display = 'none';

+    e.value = '<?= $this->getSum() ?>';

   </script>

 <?php endif ?>

@@ -1,26 +1,38 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('field'); ?>

-<?php if ($this->hasErrors()): ?>

-  <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-<?php endif; ?>

-  <fieldset id="ctrl_<?= $this->id; ?>" class="checkbox_container<?php if ($this->class) echo ' ' . $this->class; ?>">

+  <fieldset id="ctrl_<?= $this->id ?>" class="checkbox_container<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>">

     <?php if ($this->label): ?>

       <legend>

         <?php if ($this->mandatory): ?>

-          <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+          <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

         <?php else: ?>

-          <?= $this->label; ?>

+          <?= $this->label ?>

         <?php endif; ?>

       </legend>

     <?php endif; ?>

-    <input type="hidden" name="<?= $this->name; ?>" value="">

+    <input type="hidden" name="<?= $this->name ?>" value="">

     <?php foreach ($this->getOptions() as $option): ?>

-      <span><input type="checkbox" name="<?= $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="checkbox" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

+      <?php if ('group_start' == $option['type']): ?>

+        <fieldset>

+        <legend><?= $option['label'] ?></legend>

+      <?php endif; ?>

+

+      <?php if ('option' == $option['type']): ?>

+        <span><input type="checkbox" name="<?= $option['name'] ?>" id="opt_<?= $option['id'] ?>" class="checkbox" value="<?= $option['value'] ?>"<?= $option['checked'] ?><?= $option['attributes'] ?>> <label id="lbl_<?= $option['id'] ?>" for="opt_<?= $option['id'] ?>"><?= $option['label'] ?></label></span>

+      <?php endif; ?>

+

+      <?php if ('group_end' == $option['type']): ?>

+        </fieldset>

+      <?php endif; ?>

     <?php endforeach; ?>

+    <?php if ($this->hasErrors()): ?>

+      <p class="error"><?= $this->getErrorAsString() ?></p>

+    <?php endif; ?>

+

   </fieldset>

 <?php $this->endblock(); ?>

@@ -1,14 +1,4 @@

-<?php if ($this->tableless): ?>

-

-  <div class="<?= $this->prefix; ?> explanation<?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?>">

-    <?= $this->generate(); ?>

-  </div>

-

-<?php else: ?>

-

-  <tr class="<?= $this->rowClass; ?>">

-    <td colspan="2" class="colspan explanation"><?= $this->generate(); ?></td>

-  </tr>

-

-<?php endif; ?>

+<div class="<?= $this->prefix ?> explanation<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?= $this->eSM_fl_class; ?><?php endif; ?>">

+  <?= $this->generate() ?>

+</div>

deleted file mode 100644

@@ -1,13 +0,0 @@

-

-<?php if ($this->fsType == 'fsStart'): ?>

-

-  <fieldset<?php if ($this->class): ?> class="<?= $this->class; ?>"<?php endif; ?>>

-  <?php if ($this->label): ?>

-    <legend><?= $this->label; ?></legend>

-  <?php endif; ?>

-

-<?php else: ?>

-

-  </fieldset>

-

-<?php endif; ?>

new file mode 100644

@@ -0,0 +1,6 @@

+

+<fieldset class="<?php if ($this->class): ?><?= $this->class ?><?php endif; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?= $this->eSM_fl_class; ?><?php endif; ?>">

+

+  <?php if ($this->label): ?>

+    <legend><?= $this->label ?></legend>

+  <?php endif; ?>

deleted file mode 100644

@@ -1,14 +0,0 @@

-

-<?php if ($this->tableless): ?>

-

-  <div class="<?= $this->prefix; ?> headline w100">

-    <?= $this->generate(); ?>

-  </div>

-

-<?php else: ?>

-

-  <tr class="<?= $this->rowClass; ?>">

-    <td colspan="2" class="colspan headline"><?= $this->generate(); ?></td>

-  </tr>

-

-<?php endif; ?>

deleted file mode 100644

@@ -1,2 +0,0 @@

-

-<input type="hidden" name="<?= $this->name; ?>" value="<?php echo $this->value; ?>">

deleted file mode 100644

@@ -1,2 +0,0 @@

-

-<?= $this->html; ?>

@@ -1,14 +1,4 @@

-<?php if ($this->tableless): ?>

-

-  <div class="<?= $this->class; ?>">

-    <?= $this->message; ?>

-  </div>

-

-<?php else: ?>

-

-  <tr class="<?= $this->class; ?>">

-    <td colspan="2"><div class="colspan"><?= $this->message; ?></div></td>

-  </tr>

-

-<?php endif; ?>

+<div class="<?= $this->class ?> w100 clr">

+  <?= $this->message ?>

+</div>

@@ -1,41 +1,38 @@

 <?php $this->extend('form_row_double'); ?>

 <?php $this->block('label'); ?>

-  <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

-

   <?php if ($this->label): ?>

-    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->label; ?>

+        <?= $this->label ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="password" name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

+  <input type="password" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="text password<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>" value=""<?= $this->getAttributes() ?>>

-  <?php if ($this->addSubmit): ?>

-    <input type="submit" id="ctrl_<?= $this->id; ?>_submit" class="submit" value="<?php echo $this->slabel; ?>">

+  <?php if ($this->hasErrors()): ?>

+    <p class="error"><?= $this->getErrorAsString() ?></p>

   <?php endif; ?>

+

 <?php $this->endblock(); ?>

 <?php $this->block('label2'); ?>

   <?php if ($this->confirmLabel): ?>

-    <label for="ctrl_<?= $this->id; ?>_confirm" class="confirm<?php if ($this->class) echo ' ' . $this->class; ?>">

+    <label for="ctrl_<?= $this->id ?>_confirm" class="confirm<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>">

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->confirmLabel; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->confirmLabel ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->confirmLabel; ?>

+        <?= $this->confirmLabel ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field2'); ?>

-  <input type="password" name="<?= $this->name; ?>_confirm" id="ctrl_<?php echo $this->id; ?>_confirm" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

+  <input type="password" name="<?= $this->name ?>_confirm" id="ctrl_<?= $this->id ?>_confirm" class="text password<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>" value=""<?= $this->getAttributes() ?>>

 <?php $this->endblock(); ?>

@@ -1,24 +1,36 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('field'); ?>

-  <?php if ($this->hasErrors()): ?>

-  <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

-  <fieldset id="ctrl_<?= $this->id; ?>" class="radio_container<?php if ($this->class) echo ' ' . $this->class; ?>">

+  <fieldset id="ctrl_<?= $this->id ?>" class="radio_container<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>">

     <?php if ($this->label): ?>

       <legend>

         <?php if ($this->mandatory): ?>

-          <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+          <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

         <?php else: ?>

-          <?= $this->label; ?>

+          <?= $this->label ?>

         <?php endif; ?>

       </legend>

     <?php endif; ?>

     <?php foreach ($this->getOptions() as $option): ?>

-      <span><input type="radio" name="<?= $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="radio" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

+      <?php if ('group_start' == $option['type']): ?>

+        <fieldset>

+        <legend><?= $option['label'] ?></legend>

+      <?php endif; ?>

+

+      <?php if ('option' == $option['type']): ?>

+        <span><input type="radio" name="<?= $option['name'] ?>" id="opt_<?= $option['id'] ?>" class="radio" value="<?= $option['value'] ?>"<?= $option['checked'] ?><?= $option['attributes'] ?>> <label id="lbl_<?= $option['id'] ?>" for="opt_<?= $option['id'] ?>"><?= $option['label'] ?></label></span>

+      <?php endif; ?>

+

+      <?php if ('group_end' == $option['type']): ?>

+        </fieldset>

+      <?php endif; ?>

     <?php endforeach; ?>

+    <?php if ($this->hasErrors()): ?>

+      <p class="error"><?= $this->getErrorAsString() ?></p>

+    <?php endif; ?>

+

   </fieldset>

 <?php $this->endblock(); ?>

@@ -1,5 +1,5 @@

-<div class="<?= $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?>">

+<div class="<?= $this->prefix ?><?php if ($this->class): ?> <?= $this->class ?><?php endif; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?= $this->eSM_fl_class; ?><?php endif; ?>">

   <?php $this->block('label'); ?>

   <?php $this->endblock(); ?>

@@ -1,5 +1,5 @@

-<div class="<?= $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?>">

+<div class="<?= $this->prefix ?><?php if ($this->class): ?> <?= $this->class ?><?php endif; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?= $this->eSM_fl_class; ?><?php endif; ?>">

   <?php $this->block('label'); ?>

   <?php $this->endblock(); ?>

@@ -7,7 +7,7 @@

   <?php $this->endblock(); ?>

 </div>

-<div class="<?= $this->prefix; ?> confirm<?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?>">

+<div class="<?= $this->prefix ?> confirm<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?= $this->eSM_fl_class; ?><?php endif; ?>">

   <?php $this->block('label2'); ?>

   <?php $this->endblock(); ?>

@@ -1,35 +1,41 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('label'); ?>

-  <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

-

   <?php if ($this->label): ?>

-    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->label; ?>

+        <?= $this->label ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <select name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="<?php echo $this->class; ?>"<?php echo $this->getAttributes(); ?>>

+

+  <?php if ($this->multiple): ?>

+    <input type="hidden" name="<?= rtrim($this->name, '[]') ?>" value="">

+  <?php endif; ?>

+

+  <select name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="<?= $this->class ?>"<?= $this->getAttributes() ?>>

     <?php foreach ($this->getOptions() as $option): ?>

-      <?php if ($option['type'] == 'group_start'): ?>

-        <optgroup label="<?= $option['label']; ?>">

+      <?php if ('group_start' == $option['type']): ?>

+        <optgroup label="<?= $option['label'] ?>">

       <?php endif; ?>

-      <?php if ($option['type'] == 'option'): ?>

-        <option value="<?= $option['value']; ?>"<?php echo $option['selected']; ?>><?php echo $option['label']; ?></option>

+      <?php if ('option' == $option['type']): ?>

+        <option value="<?= $option['value'] ?>"<?= $option['selected'] ?>><?= $option['label'] ?></option>

       <?php endif; ?>

-      <?php if ($option['type'] == 'group_end'): ?>

+      <?php if ('group_end' == $option['type']): ?>

         </optgroup>

       <?php endif; ?>

     <?php endforeach; ?>

   </select>

+

+  <?php if ($this->hasErrors()): ?>

+    <p class="error"><?= $this->getErrorAsString() ?></p>

+  <?php endif; ?>

+

 <?php $this->endblock(); ?>

deleted file mode 100644

@@ -1,7 +0,0 @@

-<div class="submit_container widget<?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?><?php if ($this->eSM_fl_lblpadding): ?> lblp<?php endif; ?><?php if ($this->eSM_fl_alignment): ?> <?php echo $this->eSM_fl_alignment; ?><?php endif; ?>">

-  <?php if ($this->src): ?>

-    <input type="image" src="<?= $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

-  <?php else: ?>

-    <button type="submit" id="ctrl_<?= $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>><?php echo specialchars($this->slabel); ?></button>

-  <?php endif; ?>

-</div>

@@ -1,20 +1,22 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('label'); ?>

-  <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->label; ?>

+        <?= $this->label ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <textarea name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="textarea<?php if ($this->class) echo ' ' . $this->class; ?>" rows="<?php echo $this->rows; ?>" cols="<?php echo $this->cols; ?>"<?php echo $this->getAttributes(); ?>><?php echo $this->value; ?></textarea>

+  <textarea name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="textarea<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>" rows="<?= $this->rows ?>" cols="<?= $this->cols ?>"<?= $this->getAttributes() ?>><?= $this->value ?></textarea>

+

+  <?php if ($this->hasErrors()): ?>

+    <p class="error"><?= $this->getErrorAsString() ?></p>

+  <?php endif; ?>

+

 <?php $this->endblock(); ?>

@@ -1,20 +1,21 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('label'); ?>

-  <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->label; ?>

+        <?= $this->label ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="<?= $this->type; ?>" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text<?php if ($this->hideInput) echo ' password'; ?><?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->value); ?>"<?php echo $this->getAttributes(); ?>>

+  <?php if ($this->hasErrors()): ?>

+    <p class="error"><?= $this->getErrorAsString() ?></p>

+  <?php endif; ?>

+

+  <input type="<?= $this->type ?>" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="text<?php if ($this->hideInput): ?> password<?php endif; ?><?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>" value="<?= Contao\StringUtil::specialchars($this->value) ?>"<?= $this->getAttributes() ?>>

 <?php $this->endblock(); ?>

@@ -1,21 +1,22 @@

 <?php $this->extend('form_row'); ?>

 <?php $this->block('label'); ?>

-  <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

-  <?php endif; ?>

-

   <?php if ($this->label): ?>

-    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id ?>"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField ?> </span><?= $this->label ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?= $this->label; ?>

+        <?= $this->label ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="file" name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="upload<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>>

+  <input type="file" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" class="upload<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>"<?= $this->getAttributes() ?>>

+

+  <?php if ($this->hasErrors()): ?>

+    <p class="error"><?= $this->getErrorAsString() ?></p>

+  <?php endif; ?>

+

 <?php $this->endblock(); ?>

deleted file mode 100644

@@ -1,9 +0,0 @@

-<?php if (!$this->tableless): ?>

-  <tr class="<?= $this->rowClass; ?>">

-    <td class="col_0 col_first"><?= $this->generateLabel(); ?></td>

-    <td class="col_1 col_last"><?= $this->generateWithError(); ?></td>

-  </tr>

-<?php else: ?>

-  <?= $this->generateLabel(); ?>

-  <?= $this->generateWithError(); ?><br>

-<?php endif; ?>

\ No newline at end of file

deleted file mode 100644

@@ -1,17 +0,0 @@

-<?= '<?'; ?>xml version="1.0" encoding="<?php echo $this->charset; ?>" standalone="yes" ?>

-<!DOCTYPE form [

-  <!ELEMENT form (field)+>

-  <!ELEMENT field (name, value+)>

-  <!ELEMENT name (#PCDATA)>

-  <!ELEMENT value (#PCDATA)>

-]>

-<form>

-  <?php foreach ($this->fields as $field): ?>

-    <field>

-      <name><?= $field['name']; ?></name>

-      <?php foreach ($field['values'] as $value): ?>

-        <value><?= $value; ?></value>

-      <?php endforeach; ?>

-    </field>

-  <?php endforeach; ?>

-</form>

\ No newline at end of file