Minor Fixes for WCAG

joomdev · Dec 2, 2020 · 861175c · 861175c
1 parent 2f24787
commit 861175c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/layouts/field.php b/layouts/field.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package   JD Simple Contact Form
  * @author    JoomDev https://www.joomdev.com
@@ -9,16 +10,14 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $show_label = $field->show_label === null ? 1 : $field->show_label;
-if ($field->type == 'hidden' ) {
+if ($field->type == 'hidden') {
    echo $input;
 } else {
 ?>
-<div class="jdscf-col-md-<?php echo $field->width; ?>">
-   <div class="form-group">
-      <?php if ($show_label) { ?>
+   <div class="jdscf-col-md-<?php echo $field->width; ?>">
+      <div class="form-group">
          <?php echo $label; ?>
-      <?php } ?>
-      <?php echo $input; ?>
+         <?php echo $input; ?>
+      </div>
    </div>
-</div>
 <?php } ?>
diff --git a/layouts/fields/calendar.php b/layouts/fields/calendar.php
@@ -9,6 +9,7 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $attrs = [];
+$attrs[] = 'id="' . $field->id . '"';
 if (isset($field->placeholder) && !empty($field->placeholder)) {
     $attrs[] = 'placeholder="' . $field->placeholder . '"';
 }

diff --git a/layouts/fields/checkbox.php b/layouts/fields/checkbox.php
@@ -10,7 +10,7 @@
 extract($displayData);
 $options = ModJDSimpleContactFormHelper::getOptions($field->options);
 $attrs = [];
-
+$attrs[] = 'id="' . $field->id . '"';
 if ($field->required) {
     $attrs[] = 'required';
     if (isset($field->custom_error) && !empty(trim($field->custom_error))) {

diff --git a/layouts/fields/file.php b/layouts/fields/file.php
@@ -9,6 +9,7 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $attrs = [];
+$attrs[] = 'id="' . $field->id . '"';
 if ($field->required) {
     $attrs[] = 'required';
     if (isset($field->custom_error) && !empty(trim($field->custom_error))) {

diff --git a/layouts/fields/text.php b/layouts/fields/text.php
@@ -9,6 +9,7 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $attrs = [];
+$attrs[] = 'id="' . $field->id . '"';
 switch ($field->type) {
    case 'email':
       $attrs[] = 'data-parsley-type="email"';

diff --git a/layouts/fields/textarea.php b/layouts/fields/textarea.php
@@ -9,6 +9,7 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $attrs = [];
+$attrs[] = 'id="' . $field->id . '"';
 if ($field->required) {
     $attrs[] = 'required';
     if (isset($field->custom_error) && !empty(trim($field->custom_error))) {

diff --git a/layouts/label.php b/layouts/label.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package   JD Simple Contact Form
  * @author    JoomDev https://www.joomdev.com
@@ -9,8 +10,9 @@
 defined('_JEXEC') or die;
 extract($displayData);
 $label = ModJDSimpleContactFormHelper::getLabelText($field);
+$show_label = $field->show_label === null ? 1 : $field->show_label;
 ?>
-<label class="d-block">
+<label for="<?php echo $field->id; ?>" class="<?php echo $show_label ? 'd-block' : 'd-none'; ?>">
    <?php echo $label; ?>
    <?php if ($field->required) { ?>
       <small class="text-danger">*</small>