Accessibility: Add <label> to <select>

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 39e5e49974388447c26df7e2527a96e5f052159f..f7aabd4642bb06630095a802848f78f0c1d89fdc 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -149,9 +149,9 @@ if (adminer()->homepage()) {
                                $databases = (support("scheme") ? adminer()->schemas() : adminer()->databases());
                                if (count($databases) != 1 && JUSH != "sqlite") {
                                        $db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
-                                       echo "<p>" . lang('Move to other database') . ": ";
+                                       echo "<p><label>" . lang('Move to other database') . ": ";
                                        echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
-                                       echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
+                                       echo "</label> <input type='submit' name='move' value='" . lang('Move') . "'>";
                                        echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'> " . checkbox("overwrite", 1, $_POST["overwrite"], lang('overwrite')) : "");
                                        echo "\n";
                                }

diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php
index 6d4aecc95cd05ed05a42963943248abe365bb9a3..45f0b7ba796c9c202e79515d6c9ca649e6a9a21f 100644 (file)
--- a/adminer/foreign.inc.php
+++ b/adminer/foreign.inc.php
@@ -67,12 +67,12 @@ if ($row["ns"] != "") {
 $referencable = array_keys(array_filter(table_status('', true), 'Adminer\fk_support'));
 $target = array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable)));
 $onchange = "this.form['change-js'].value = '1'; this.form.submit();";
-echo "<p>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "\n";
+echo "<p><label>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "</label>\n";
 if (support("scheme")) {
        $schemas = array_filter(adminer()->schemas(), function ($schema) {
                return !preg_match('~^information_schema$~i', $schema);
        });
-       echo lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
+       echo "<label>" . lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange) . "</label>";
        if ($row["ns"] != "") {
                set_schema($orig_schema);
        }
@@ -83,7 +83,7 @@ if (support("scheme")) {
                        $dbs[] = $db;
                }
        }
-       echo lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange);
+       echo "<label>" . lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange) . "</label>";
 }
 echo input_hidden("change-js");
 ?>
@@ -101,8 +101,8 @@ foreach ($row["source"] as $key => $val) {
 ?>
 </table>
 <p>
-<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", driver()->onActions), $row["on_delete"]); ?>
- <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", driver()->onActions), $row["on_update"]); ?>
+<label><?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", driver()->onActions), $row["on_delete"]); ?></label>
+<label><?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", driver()->onActions), $row["on_update"]); ?></label>
 <?php echo doc_link(array(
        'sql' => "innodb-foreign-key-constraints.html",
        'mariadb' => "foreign-keys/",

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 04ae426a975925293cbaa91dcd2030edb2eea718..e508748be948fc9aeece09eb3567bdeea4a88fd0 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1046,14 +1046,14 @@ class Adminer {
                echo "<form action=''>\n<p id='dbs'>\n";
                hidden_fields_get();
                $db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
-               echo "<span title='" . lang('Database') . "'>" . lang('DB') . ":</span> " . ($databases
+               echo "<label title='" . lang('Database') . "'>" . lang('DB') . ": " . ($databases
                        ? html_select("db", array("" => "") + $databases, DB) . $db_events
                        : "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
-               );
+               ) . "</label>";
                echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
                if (support("scheme")) {
                        if ($missing != "db" && DB != "" && connection()->select_db(DB)) {
-                               echo "<br><span>" . lang('Schema') . ":</span> " . html_select("ns", array("" => "") + adminer()->schemas(), $_GET["ns"]) . $db_events;
+                               echo "<br><label>" . lang('Schema') . ": " . html_select("ns", array("" => "") + adminer()->schemas(), $_GET["ns"]) . "$db_events</label>";
                                if ($_GET["ns"] != "") {
                                        set_schema($_GET["ns"]);
                                }

diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index 20849f45ed055055875f9ee4f63736b46c83ec27..497354814ebc7d66b2e8d0b24d727f7e5e990c91 100644 (file)
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -99,7 +99,7 @@ function langs(): array {
 
 function switch_lang(): void {
        echo "<form action='' method='post'>\n<div id='lang'>";
-       echo lang('Language') . ": " . html_select("lang", langs(), LANG, "this.form.submit();");
+       echo "<label>" . lang('Language') . ": " . html_select("lang", langs(), LANG, "this.form.submit();") . "</label>";
        echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
        echo input_token();
        echo "</div>\n</form>\n";

diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 7037a3acf3df0d99cdbb244b65fc08e5a115a14f..beb091ea7e27ea569287bdc714128c5ddca8f872 100644 (file)
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -48,7 +48,7 @@ echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</
 
 <form action="" method="post" id="form">
 <p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" data-maxlength="64" autocapitalize="off">
-<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
+<?php echo ($routine_languages ? "<label>" . lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "</label>\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <div class="scrollable">
 <table class="nowrap">