From c70fe30ea15d1b00eca154788e19b0fb1cafb450 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 16 Jun 2023 15:23:23 +0200
Subject: [PATCH] accessibility updates

---
 lam/lib/html.inc        | 23 +++++++++++++++++++----
 lam/lib/lists.inc       | 12 ++++++++++++
 lam/templates/login.php | 14 ++++++++++----
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 3400c48e0..c21b5e548 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -1273,7 +1273,7 @@ class htmlAccountPageButton extends htmlButton {
 class htmlSelect extends htmlElement {
 
 	/** name of select field */
-	private $name;
+	protected $name;
 	/** size */
 	private $size;
 	/** allows multi-selection */
@@ -1388,7 +1388,7 @@ class htmlSelect extends htmlElement {
 			echo '<div class="hidden">';
 		}
 		// print select box
-		echo '<select' . $this->getDataAttributesAsString() . $class . $style
+		echo '<select' . $this->getDataAttributesAsString() . $this->getAccessibilityMarkup() . $class . $style
 				. $name . $size . $multi . $disabled . $onchange
 				. ' tabindex="' . $tabindex . "\">\n";
 		$tabindex++;
@@ -2078,6 +2078,8 @@ class htmlInputCheckbox extends htmlElement {
 	protected $elementsToDisable = array();
 	/** onclick event code */
 	private $onClick;
+	/** title */
+	private ?string $title = null;
 
 
 	/**
@@ -2115,6 +2117,10 @@ class htmlInputCheckbox extends htmlElement {
 		if ($this->checked) {
 			$checked = ' checked';
 		}
+		$title = '';
+		if ($this->title !== null) {
+			$title = ' title="' . $this->title . '"';
+		}
 		$tabindexValue = ' tabindex="' . $tabindex . '"';
 		$tabindex++;
 		$disabled = '';
@@ -2210,7 +2216,7 @@ class htmlInputCheckbox extends htmlElement {
 			$onClick = ' onclick="' . $this->onClick . '"';
 		}
 		echo '<input type="checkbox" id="' . $this->name . '" name="' . $this->name . '"' . $classes . $tabindexValue
-			. $this->getAccessibilityMarkup() . $onChange . $onClick . $checked . $disabled . '>';
+			. $this->getAccessibilityMarkup() . $onChange . $onClick . $title . $checked . $disabled . '>';
 		echo $script;
 		if ($this->transient) {
 			return array();
@@ -2311,6 +2317,15 @@ class htmlInputCheckbox extends htmlElement {
 		return $this->name;
 	}
 
+	/**
+	 * Sets the title.
+	 *
+	 * @param string|null $title title
+	 */
+	public function setTitle(?string $title): void {
+		$this->title = $title;
+	}
+
 }
 
 /**
@@ -4367,7 +4382,7 @@ class htmlResponsiveSelect extends htmlSelect {
 		$row = new htmlResponsiveRow();
 		// label text
 		$labelGroup = new htmlGroup();
-		$labelGroup->addElement(new htmlOutputText($this->label));
+		$labelGroup->addElement(new htmlLabel($this->name, $this->label));
 		if (!empty($this->helpID)) {
 			$helpLinkLabel = new htmlHelpLink($this->helpID, $this->helpModule);
 			$helpLinkLabel->setCSSClasses(array('hide-on-tablet', 'margin-left5'));
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index b43805746..2ec8e5b7f 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -370,6 +370,7 @@ class lamList {
 					$navInput->setMinimumAndMaximumNumber(1, $pageCount);
 					$navInput->setCSSClasses(array('listPageInput'));
 					$navInput->setOnKeyPress('listPageNumberKeyPress(\'' . $url . '\', event);');
+					$navInput->setAccessibilityLabel(_('Page'));
 					$navGroup->addElement($navInput);
 				}
 				else {
@@ -453,26 +454,32 @@ class lamList {
 				if ($this->sortDirection < 0) {
 				    $down = new htmlLink(null, $link . '&sortdirection=1', '../../graphics/pan-down.svg');
 				    $down->setCSSClasses(array('icon noMarginSides'));
+				    $down->setTitle(_('Sort ascending'));
 					$buttons->addElement($down);
 					$up = new htmlLink(null, $link . '&sortdirection=-1', '../../graphics/pan-up.svg');
 					$up->setCSSClasses(array('icon icon-active noMarginSides'));
+					$up->setTitle(_('Sort descending'));
 					$buttons->addElement($up);
 				}
 				else {
 					$down = new htmlLink(null, $link . '&sortdirection=1', '../../graphics/pan-down.svg');
 					$down->setCSSClasses(array('icon icon-active noMarginSides'));
+					$down->setTitle(_('Sort ascending'));
 					$buttons->addElement($down);
 					$up = new htmlLink(null, $link . '&sortdirection=-1', '../../graphics/pan-up.svg');
 					$up->setCSSClasses(array('icon noMarginSides'));
+					$up->setTitle(_('Sort descending'));
 					$buttons->addElement($up);
 				}
 			}
 			else {
 				$down = new htmlLink(null, $link . '&sortdirection=1', '../../graphics/pan-down.svg');
 				$down->setCSSClasses(array('icon noMarginSides'));
+				$down->setTitle(_('Sort ascending'));
 				$buttons->addElement($down);
 				$up = new htmlLink(null, $link . '&sortdirection=-1', '../../graphics/pan-up.svg');
 				$up->setCSSClasses(array('icon noMarginSides'));
+				$up->setTitle(_('Sort descending'));
 				$buttons->addElement($up);
 			}
 			$sortElements[] = $buttons;
@@ -490,6 +497,7 @@ class lamList {
 		$selectAll = new htmlInputCheckbox('tableSelectAll', false);
 		$selectAll->setCSSClasses(array('align-middle'));
 		$selectAll->setOnClick('list_switchAccountSelection();');
+		$selectAll->setTitle(_('Select all'));
 		$actionElement->addElement($selectAll);
 		$actionElement->addElement(new htmlSpacer('1rem', null));
 		$actionElement->addElement(new htmlOutputText(_('Filter')));
@@ -534,6 +542,7 @@ class lamList {
 		$filterInput = new htmlInputField('filter' . $attrName, $value, null);
 		$filterInput->setOnKeyPress("SubmitForm('apply_filter', event);");
 		$filterInput->setFieldSize(null);
+		$filterInput->setTitle(_('Filter'));
 		return $filterInput;
 	}
 
@@ -558,6 +567,7 @@ class lamList {
 		$filterInput->setCSSClasses(array($this->type->getScope() . '-bright'));
 		$filterInput->setHasDescriptiveElements(true);
 		$filterInput->setOnchangeEvent('document.getElementsByName(\'apply_filter\')[0].click();');
+		$filterInput->setAccessibilityLabel(_('Filter'));
 		return $filterInput;
 	}
 
@@ -608,6 +618,7 @@ class lamList {
 			$checkbox = new htmlInputCheckbox($rowID, false);
 			$checkbox->setOnClick("list_click('" . $rowID . "');");
 			$checkbox->setCSSClasses(array('accountBoxUnchecked align-middle'));
+			$checkbox->setTitle(_('Select'));
 			$actionElement->addElement($checkbox);
 			$actionElement->addElement(new htmlSpacer('0.5rem', null));
 			$rowNumber = $i - $table_begin + 2;
@@ -975,6 +986,7 @@ class lamList {
 			$suffixSelect->setRightToLeftTextDirection(true);
 			$suffixSelect->setSortElements(false);
 			$suffixSelect->setHasDescriptiveElements(true);
+			$suffixSelect->setAccessibilityLabel(_('Suffix'));
 			$group->addElement($suffixSelect);
 		}
 		return $group;
diff --git a/lam/templates/login.php b/lam/templates/login.php
index df3a1818e..7d73855b0 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -1,6 +1,7 @@
 <?php
 namespace LAM\LOGIN;
 use htmlLabel;
+use htmlResponsiveSelect;
 use LAM\ENV\LAMLicenseValidator;
 use LAM\LIB\TWO_FACTOR\TwoFactorProviderService;
 use \LAMConfig;
@@ -405,10 +406,9 @@ function display_LoginPage(?LAMLicenseValidator $licenseValidator, ?string $erro
 						$serverUrlDiv = new htmlDiv(null, $serverUrl);
 						$serverUrlDiv->setCSSClasses(array('text-left', 'margin3'));
 						$row->addField($serverUrlDiv);
-						$row->addLabel(new htmlOutputText(_("Server profile")));
-						$profileSelect = new htmlSelect('profile', $profiles, array($_SESSION['config']->getName()));
+						$profileSelect = new htmlResponsiveSelect('profile', $profiles, array($_SESSION['config']->getName()), _("Server profile"));
 						$profileSelect->setOnchangeEvent('loginProfileChanged(this)');
-						$row->addField($profileSelect);
+						$row->add($profileSelect);
 
 						parseHtml(null, $row, array(), true, $tabindex, 'user');
 					?>
@@ -461,10 +461,16 @@ function displayLoginHeader() : void {
                         ?>
                 </span>
             </a>
+            <?php
+            if (!isLAMProVersion()) {
+            ?>
             <span class="hide-on-mobile lam-margin-small">
                         &nbsp;&nbsp;&nbsp;&nbsp;
-			    <a href="http://www.ldap-account-manager.org/lamcms/lamPro"> <?php if (!isLAMProVersion()) { echo _("Want more features? Get LAM Pro!");} ?> </a>
+			    <a href="http://www.ldap-account-manager.org/lamcms/lamPro"><?php echo _("Want more features? Get LAM Pro!"); ?></a>
 			</span>
+            <?php
+            }
+            ?>
         </div>
         <a class="lam-header-right lam-menu-icon hide-on-tablet" href="javascript:void(0);" class="icon" onclick="window.lam.topmenu.toggle();">
             <img class="align-middle" width="16" height="16" alt="menu" src="../graphics/menu.svg">