Minor ARIA

Author: kohler

scripts/script.js

@@ -5731,6 +5731,7 @@ hotcrp.dropmenu.add_builder("row-order-draghandle", function () {
         this.replaceWith(details);
         menu = $e("ul", "uic dropmenu");
         menu.setAttribute("role", "menu");
+        menu.setAttribute("aria-label", "Reordering menu");
         const menucontainer = $e("div", "dropmenu-container dropmenu-draghandle", menu);
         menucontainer.hidden = true;
         details.append(this, menucontainer);
@@ -5740,7 +5741,7 @@ hotcrp.dropmenu.add_builder("row-order-draghandle", function () {
         attr["class"] = className;
         attr["type"] = "button";
         attr["role"] = "menuitem";
-        return $e("li", attr.disabled ? "disabled" : "has-link", $e("button", attr, text));
+        return $e("li", {class: attr.disabled ? "disabled" : "has-link", role: "none"}, $e("button", attr, text));
     }
     let sib = row.previousElementSibling;
     menu.append(buttonli("link ui row-order-dragmenu move-up", {

src/conference.php

@@ -5036,9 +5036,9 @@ function has_active_tracker() {
      * @param null|string|array $args */
     private function _print_profilemenu_link_if_enabled($user, $html, $page, $args = null) {
         if (!$user->is_disabled()) {
-            echo '<li class="has-link">', Ht::link($html, $this->hoturl($page, $args), ["role" => "menuitem"]), '</li>';
+            echo '<li class="has-link" role="none">', Ht::link($html, $this->hoturl($page, $args), ["role" => "menuitem"]), '</li>';
         } else {
-            echo '<li class="dim">', $html, '</li>';
+            echo '<li class="dim" role="menuitem" aria-disabled="true">', $html, '</li>';
         }
     }
 
@@ -5051,10 +5051,10 @@ function print_profilemenu_item(Contact $user, Qrequest $qreq, $pagecs, $gj) {
             }
             $ouser = $user;
             if ($user->is_actas_user()) {
-                echo '<li class="has-quiet-link">', Ht::link("Acting as " . htmlspecialchars($user->email), $this->hoturl("profile"), ["role" => "menuitem"]), '</li>';
-                echo '<li class="has-link">', Ht::link("Switch to <strong>" . htmlspecialchars($user->base_user()->email), $this->selfurl($qreq, ["actas" => null]), ["role" => "menuitem"]), '</strong></li>';
+                echo '<li class="has-quiet-link" role="none">', Ht::link("Acting as " . htmlspecialchars($user->email), $this->hoturl("profile"), ["role" => "menuitem"]), '</li>';
+                echo '<li class="has-link" role="none">', Ht::link("Switch to <strong>" . htmlspecialchars($user->base_user()->email), $this->selfurl($qreq, ["actas" => null]), ["role" => "menuitem"]), '</strong></li>';
             } else if (!$user->is_disabled() && !$user->is_anonymous_user()) {
-                echo '<li class="has-quiet-link">', Ht::link("Signed in as <strong>" . htmlspecialchars($user->email) . "</strong>", $this->hoturl("profile"), ["role" => "menuitem"]), '</li>';
+                echo '<li class="has-quiet-link" role="none">', Ht::link("Signed in as <strong>" . htmlspecialchars($user->email) . "</strong>", $this->hoturl("profile"), ["role" => "menuitem"]), '</li>';
             } else {
                 echo '<li>Signed in as <strong>', htmlspecialchars($user->email), '</strong></li>';
             }
@@ -5074,14 +5074,14 @@ function print_profilemenu_item(Contact $user, Qrequest $qreq, $pagecs, $gj) {
                     $actas_email = null;
                 }
                 if ($email !== "" && strcasecmp($email, $base_email) !== 0) {
-                    echo '<li class="has-link">', Ht::link("Switch to " . htmlspecialchars($email), "{$nav->base_path_relative}u/{$i}/{$sfx}", ["role" => "menuitem"]), '</li>';
+                    echo '<li class="has-link" role="none">', Ht::link("Switch to " . htmlspecialchars($email), "{$nav->base_path_relative}u/{$i}/{$sfx}", ["role" => "menuitem"]), '</li>';
                 }
             }
             if ($actas_email !== null) {
-                echo '<li class="has-link">', Ht::link("Act as ". htmlspecialchars($actas_email), $this->selfurl($qreq, ["actas" => $actas_email]), ["role" => "menuitem"]), '</li>';
+                echo '<li class="has-link" role="none">', Ht::link("Act as ". htmlspecialchars($actas_email), $this->selfurl($qreq, ["actas" => $actas_email]), ["role" => "menuitem"]), '</li>';
             }
             $t = $user->has_email() ? "Add another account" : "Sign in";
-            echo '<li class="has-link">', Ht::link($t, $this->hoturl("signin"), ["role" => "menuitem"]), '</li>';
+            echo '<li class="has-link" role="none">', Ht::link($t, $this->hoturl("signin"), ["role" => "menuitem"]), '</li>';
         } else if ($itemid === "profile") {
             if ($user->has_email()) {
                 $this->_print_profilemenu_link_if_enabled($user, "Account settings", "profile");
@@ -5107,10 +5107,10 @@ function print_profilemenu_item(Contact $user, Qrequest $qreq, $pagecs, $gj) {
                 return;
             }
             if ($user->is_actas_user()) {
-                echo '<li class="has-link">', Ht::link("Return to main account", $this->selfurl($qreq, ["actas" => null]), ["role" => "menuitem"]), '</li>';
+                echo '<li class="has-link" role="none">', Ht::link("Return to main account", $this->selfurl($qreq, ["actas" => null]), ["role" => "menuitem"]), '</li>';
                 return;
             }
-            echo '<li class="has-link">',
+            echo '<li class="has-link" role="none">',
                 Ht::form($this->hoturl("=signout", ["cap" => null])),
                 Ht::button("Sign out", ["type" => "submit", "class" => "link", "role" => "menuitem"]),
                 '</form></li>';
@@ -5135,11 +5135,11 @@ private function print_header_profile($id, Qrequest $qreq, Contact $user) {
         $user_html = $user->has_email() ? htmlspecialchars($user->email) : "Not signed in";
 
         $pagecs = $this->page_components($user, $qreq);
-        $old_separator = $pagecs->swap_separator('<li class="separator"></li>');
+        $old_separator = $pagecs->swap_separator('<li role="separator"></li>');
         echo '<div', $details_id, ' class="dropmenu-details', $details_class, '">',
             '<button type="button" id="h-usermenubutton" class="ui js-dropmenu-open ', $button_class, '" aria-haspopup="menu" aria-controls="h-usermenu">',
             $details_prefix, $user_html, $details_suffix,
-            '</button><div class="dropmenu-container dropmenu-sw" hidden><ul id="h-usermenu" class="uic dropmenu" role="menu">';
+            '</button><div class="dropmenu-container dropmenu-sw" hidden><ul id="h-usermenu" class="uic dropmenu" role="menu" aria-label="Site menu">';
         $pagecs->print_members("__profilemenu");
         $pagecs->swap_separator($old_separator);
         echo '</ul></div></div>';

src/papertable.php

@@ -1663,17 +1663,17 @@ function papstripOutcomeSelector() {
         $this->_papstripBegin("decision", $this->qreq->atab !== "decision", ["class" => "need-paper-select-api ui-fold js-fold-focus"]);
         echo $this->papt("decision", Ht::label("Decision", $id),
                 ["type" => "ps", "fold" => "decision"]),
-            '<form class="ui-submit uin fx">';
+            '<p class="odname js-psedit-result fn">',
+            $this->prow->decision()->name_as(5),
+            '</p><form class="ui-submit uin fx">';
         $opts = [];
         foreach ($this->conf->decision_set() as $dec) {
             $opts[$dec->id] = $dec->name_as(5);
         }
         echo Ht::select("decision", $opts,
                         (string) $this->prow->outcome,
                         ["class" => "w-99 want-focus", "id" => $id]),
-            '</form><p class="fn odname js-psedit-result">',
-            $this->prow->decision()->name_as(5),
-            "</p></div>\n";
+            "</form></div>\n";
     }
 
     function papstripReviewPreference() {

stylesheets/style.css

@@ -1970,7 +1970,8 @@ td.padls, th.padls, div.padls {
 	background-color: #004daa;
 	color: white;
 }
-.dropmenu > li.separator {
+.dropmenu > li.separator,
+.dropmenu > li[role="separator"] {
 	margin: 0.35em 0;
 	padding: 0;
 	border-bottom: 1px solid silver;