Merge branch '6.0-dev' into 6.0-dev/remove-bs-fw

Author: dgrammatiko

libraries/src/Form/Field/ModuletagField.php

@@ -40,7 +40,7 @@ class ModuletagField extends ListField
     protected function getOptions()
     {
         $options = parent::getOptions();
-        $tags    = ['address', 'article', 'aside', 'details', 'div', 'footer', 'header', 'main', 'nav', 'section', 'summary'];
+        $tags    = ['address', 'article', 'aside', 'details', 'div', 'footer', 'header', 'main', 'nav', 'search', 'section', 'summary'];
 
         // Create one new option object for each tag
         foreach ($tags as $tag) {

modules/mod_finder/tmpl/default.php

@@ -61,17 +61,19 @@
 
 ?>
 
-<form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" role="search">
-    <?php echo $output; ?>
-
-    <?php $show_advanced = $params->get('show_advanced', 0); ?>
-    <?php if ($show_advanced == 2) : ?>
-        <br>
-        <a href="<?php echo Route::_($route); ?>" class="mod-finder__advanced-link"><?php echo Text::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
-    <?php elseif ($show_advanced == 1) : ?>
-        <div class="mod-finder__advanced js-finder-advanced">
-            <?php echo HTMLHelper::_('filter.select', $query, $params); ?>
-        </div>
-    <?php endif; ?>
-    <?php echo FinderHelper::getGetFields($route, (int) $params->get('set_itemid', 0)); ?>
-</form>
+<search>
+    <form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" aria-label="search">
+        <?php echo $output; ?>
+
+        <?php $show_advanced = $params->get('show_advanced', 0); ?>
+        <?php if ($show_advanced == 2) : ?>
+            <br>
+            <a href="<?php echo Route::_($route); ?>" class="mod-finder__advanced-link"><?php echo Text::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
+        <?php elseif ($show_advanced == 1) : ?>
+            <div class="mod-finder__advanced js-finder-advanced">
+                <?php echo HTMLHelper::_('filter.select', $query, $params); ?>
+            </div>
+        <?php endif; ?>
+        <?php echo FinderHelper::getGetFields($route, (int) $params->get('set_itemid', 0)); ?>
+    </form>
+</search>