Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vladishev <aleksander.vladishev@zabbix.com>2022-08-15 10:55:01 +0300
committerAlexander Vladishev <aleksander.vladishev@zabbix.com>2022-08-15 10:55:58 +0300
commit4fe6dbf45a77febb6089b2814f4d4c3b9337c62c (patch)
tree2978e2fb9c2ddf4f4fb398c355929d702c4b69f8
parent81f5b0d88b1d8b16d3db3b691508811989f515d4 (diff)
..F....... [ZBX-21449] fixed accessibility attributes
-rw-r--r--ChangeLog.d/bugfix/ZBX-214491
-rw-r--r--frontends/php/app/views/administration.authentication.edit.php2
-rw-r--r--frontends/php/app/views/administration.mediatype.edit.php2
-rw-r--r--frontends/php/app/views/administration.proxy.edit.php2
-rw-r--r--frontends/php/app/views/administration.script.edit.php2
-rw-r--r--frontends/php/app/views/monitoring.acknowledge.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.gui.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.housekeeper.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.iconmap.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.image.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.macros.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.other.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.regularexpressions.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.trigger.options.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.trigseverity.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.valuemapping.edit.php2
-rw-r--r--frontends/php/include/views/administration.general.workingtime.edit.php2
-rw-r--r--frontends/php/include/views/administration.usergroups.edit.php2
-rw-r--r--frontends/php/include/views/administration.users.edit.php2
-rw-r--r--frontends/php/include/views/conf.import.php2
-rw-r--r--frontends/php/include/views/configuration.action.edit.php2
-rw-r--r--frontends/php/include/views/configuration.application.edit.php2
-rw-r--r--frontends/php/include/views/configuration.copy.elements.php2
-rw-r--r--frontends/php/include/views/configuration.correlation.edit.php2
-rw-r--r--frontends/php/include/views/configuration.discovery.edit.php2
-rw-r--r--frontends/php/include/views/configuration.graph.edit.php2
-rw-r--r--frontends/php/include/views/configuration.host.discovery.edit.php2
-rw-r--r--frontends/php/include/views/configuration.host.edit.php2
-rw-r--r--frontends/php/include/views/configuration.host.massupdate.php2
-rw-r--r--frontends/php/include/views/configuration.host.prototype.edit.php2
-rw-r--r--frontends/php/include/views/configuration.hostgroups.edit.php2
-rw-r--r--frontends/php/include/views/configuration.httpconf.edit.php2
-rw-r--r--frontends/php/include/views/configuration.item.edit.php2
-rw-r--r--frontends/php/include/views/configuration.item.massupdate.php2
-rw-r--r--frontends/php/include/views/configuration.item.prototype.edit.php2
-rw-r--r--frontends/php/include/views/configuration.maintenance.edit.php2
-rw-r--r--frontends/php/include/views/configuration.services.edit.php2
-rw-r--r--frontends/php/include/views/configuration.template.edit.php2
-rw-r--r--frontends/php/include/views/configuration.trigger.prototype.edit.php2
-rw-r--r--frontends/php/include/views/configuration.trigger.prototype.massupdate.php2
-rw-r--r--frontends/php/include/views/configuration.triggers.edit.php2
-rw-r--r--frontends/php/include/views/configuration.triggers.massupdate.php2
-rw-r--r--frontends/php/include/views/inventory.host.view.php2
-rw-r--r--frontends/php/include/views/monitoring.screen.constructor.edit.php2
-rw-r--r--frontends/php/include/views/monitoring.screen.edit.php2
-rw-r--r--frontends/php/include/views/monitoring.slideconf.edit.php2
-rw-r--r--frontends/php/js/dashboard.grid.js2
-rw-r--r--frontends/php/js/functions.js4
-rw-r--r--frontends/php/js/menupopup.js2
49 files changed, 50 insertions, 49 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21449 b/ChangeLog.d/bugfix/ZBX-21449
new file mode 100644
index 00000000000..1b2645dfe9c
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21449
@@ -0,0 +1 @@
+..F....... [ZBX-21449] fixed accessibility attributes (Sasha)
diff --git a/frontends/php/app/views/administration.authentication.edit.php b/frontends/php/app/views/administration.authentication.edit.php
index c96c550cef7..5442e854bb7 100644
--- a/frontends/php/app/views/administration.authentication.edit.php
+++ b/frontends/php/app/views/administration.authentication.edit.php
@@ -139,7 +139,7 @@ $ldap_tab = (new CFormList('list_ldap'))
->addVar('action', $data['action_submit'])
->addVar('db_authentication_type', $data['db_authentication_type'])
->setName('form_auth')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->disablePasswordAutofill()
->addItem((new CTabView())
->setSelected($data['form_refresh'] ? null : 0)
diff --git a/frontends/php/app/views/administration.mediatype.edit.php b/frontends/php/app/views/administration.mediatype.edit.php
index 37642609876..e0de819167c 100644
--- a/frontends/php/app/views/administration.mediatype.edit.php
+++ b/frontends/php/app/views/administration.mediatype.edit.php
@@ -36,7 +36,7 @@ $mediaTypeForm = (new CForm())
->addVar('mediatypeid', $data['mediatypeid'])
->addItem((new CVar('status', MEDIA_TYPE_STATUS_DISABLED))->removeId())
->disablePasswordAutofill()
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE);
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE);
// Create form list.
$mediatype_formlist = (new CFormList())
diff --git a/frontends/php/app/views/administration.proxy.edit.php b/frontends/php/app/views/administration.proxy.edit.php
index df7cc29c2f9..e5663a12d07 100644
--- a/frontends/php/app/views/administration.proxy.edit.php
+++ b/frontends/php/app/views/administration.proxy.edit.php
@@ -33,7 +33,7 @@ $proxyForm = (new CForm())
->setId('proxyForm')
->addVar('proxyid', $data['proxyid'])
->addVar('tls_accept', $data['tls_accept'])
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE);
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE);
if ($data['status'] == HOST_STATUS_PROXY_PASSIVE && array_key_exists('interfaceid', $data)) {
$proxyForm->addVar('interfaceid', $data['interfaceid']);
diff --git a/frontends/php/app/views/administration.script.edit.php b/frontends/php/app/views/administration.script.edit.php
index 410012140dd..fec23a68375 100644
--- a/frontends/php/app/views/administration.script.edit.php
+++ b/frontends/php/app/views/administration.script.edit.php
@@ -27,7 +27,7 @@ $widget = (new CWidget())->setTitle(_('Scripts'));
$scriptForm = (new CForm())
->setId('scriptForm')
->setName('scripts')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', 1)
->addVar('scriptid', $data['scriptid']);
diff --git a/frontends/php/app/views/monitoring.acknowledge.edit.php b/frontends/php/app/views/monitoring.acknowledge.edit.php
index b413e3c9a79..e77836fab2f 100644
--- a/frontends/php/app/views/monitoring.acknowledge.edit.php
+++ b/frontends/php/app/views/monitoring.acknowledge.edit.php
@@ -93,7 +93,7 @@ $footer_buttons = makeFormFooter(
->addItem(
(new CForm())
->setId('acknowledge_form')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('eventids', $data['eventids'])
->addVar('backurl', $data['backurl'])
->addItem(
diff --git a/frontends/php/include/views/administration.general.gui.edit.php b/frontends/php/include/views/administration.general.gui.edit.php
index a333fa44195..566d9201417 100644
--- a/frontends/php/include/views/administration.general.gui.edit.php
+++ b/frontends/php/include/views/administration.general.gui.edit.php
@@ -68,7 +68,7 @@ $guiView = (new CTabView())
->setFooter(makeFormFooter(new CSubmit('update', _('Update'))));
$guiForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem($guiView);
$widget->addItem($guiForm);
diff --git a/frontends/php/include/views/administration.general.housekeeper.edit.php b/frontends/php/include/views/administration.general.housekeeper.edit.php
index ef10dc21b59..495863d4895 100644
--- a/frontends/php/include/views/administration.general.housekeeper.edit.php
+++ b/frontends/php/include/views/administration.general.housekeeper.edit.php
@@ -158,7 +158,7 @@ $houseKeeperView = (new CTabView())
));
$widget->addItem((new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem($houseKeeperView)
);
diff --git a/frontends/php/include/views/administration.general.iconmap.edit.php b/frontends/php/include/views/administration.general.iconmap.edit.php
index 4a27d28841c..9e1a70c45c7 100644
--- a/frontends/php/include/views/administration.general.iconmap.edit.php
+++ b/frontends/php/include/views/administration.general.iconmap.edit.php
@@ -43,7 +43,7 @@ $name = (new CTextBox('iconmap[name]', $this->data['iconmap']['name']))
$iconMapTab->addRow((new CLabel(_('Name'), 'iconmap[name]'))->setAsteriskMark(), $name);
$iconMapForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', 1);
if (isset($this->data['iconmapid'])) {
$iconMapForm->addVar('iconmapid', $this->data['iconmap']['iconmapid']);
diff --git a/frontends/php/include/views/administration.general.image.edit.php b/frontends/php/include/views/administration.general.image.edit.php
index dd2674ffc75..63e15fedc20 100644
--- a/frontends/php/include/views/administration.general.image.edit.php
+++ b/frontends/php/include/views/administration.general.image.edit.php
@@ -29,7 +29,7 @@ $widget = (new CWidget())
);
$imageForm = (new CForm('post', null, 'multipart/form-data'))
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form']);
if (isset($this->data['imageid'])) {
$imageForm->addVar('imageid', $this->data['imageid']);
diff --git a/frontends/php/include/views/administration.general.macros.edit.php b/frontends/php/include/views/administration.general.macros.edit.php
index 776872c505e..27d1e552301 100644
--- a/frontends/php/include/views/administration.general.macros.edit.php
+++ b/frontends/php/include/views/administration.general.macros.edit.php
@@ -86,7 +86,7 @@ $tab_view->setFooter(makeFormFooter($saveButton));
$form = (new CForm())
->setName('macrosForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem($tab_view);
$widget->addItem($form);
diff --git a/frontends/php/include/views/administration.general.other.edit.php b/frontends/php/include/views/administration.general.other.edit.php
index 129de01b561..a27ee7bad69 100644
--- a/frontends/php/include/views/administration.general.other.edit.php
+++ b/frontends/php/include/views/administration.general.other.edit.php
@@ -66,7 +66,7 @@ $otherTab
$otherForm = (new CForm())
->setName('otherForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem(
(new CTabView())
->addTab('other', _('Other parameters'), $otherTab)
diff --git a/frontends/php/include/views/administration.general.regularexpressions.edit.php b/frontends/php/include/views/administration.general.regularexpressions.edit.php
index f4f552c4f82..69d808147be 100644
--- a/frontends/php/include/views/administration.general.regularexpressions.edit.php
+++ b/frontends/php/include/views/administration.general.regularexpressions.edit.php
@@ -35,7 +35,7 @@ $widget = (new CWidget())
$form = (new CForm())
->setId('zabbixRegExpForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', 1)
->addVar('regexpid', $data['regexpid']);
diff --git a/frontends/php/include/views/administration.general.trigger.options.edit.php b/frontends/php/include/views/administration.general.trigger.options.edit.php
index ee84e52fe1f..a0b1b17f924 100644
--- a/frontends/php/include/views/administration.general.trigger.options.edit.php
+++ b/frontends/php/include/views/administration.general.trigger.options.edit.php
@@ -93,7 +93,7 @@ $triggerDOFormList = (new CFormList())
]);
$severityForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem(
(new CTabView())
->addTab('triggerdo', _('Trigger displaying options'), $triggerDOFormList)
diff --git a/frontends/php/include/views/administration.general.trigseverity.edit.php b/frontends/php/include/views/administration.general.trigseverity.edit.php
index f15c5060518..7926ba67cf9 100644
--- a/frontends/php/include/views/administration.general.trigseverity.edit.php
+++ b/frontends/php/include/views/administration.general.trigseverity.edit.php
@@ -87,7 +87,7 @@ $severityTab = (new CFormList())
->addInfo(_('Custom severity names affect all locales and require manual translation!'));
$severityForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem(
(new CTabView())
->addTab('severities', _('Trigger severities'), $severityTab)
diff --git a/frontends/php/include/views/administration.general.valuemapping.edit.php b/frontends/php/include/views/administration.general.valuemapping.edit.php
index 9a504cc47d2..105ec40782f 100644
--- a/frontends/php/include/views/administration.general.valuemapping.edit.php
+++ b/frontends/php/include/views/administration.general.valuemapping.edit.php
@@ -34,7 +34,7 @@ $widget = (new CWidget())
);
$form = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['valuemapid'] != 0) {
diff --git a/frontends/php/include/views/administration.general.workingtime.edit.php b/frontends/php/include/views/administration.general.workingtime.edit.php
index 21a4810f60d..e4d5a145100 100644
--- a/frontends/php/include/views/administration.general.workingtime.edit.php
+++ b/frontends/php/include/views/administration.general.workingtime.edit.php
@@ -44,7 +44,7 @@ $workingTimeView = (new CTabView())
->setFooter(makeFormFooter(new CSubmit('update', _('Update'))));
$workingTimeForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem($workingTimeView);
$widget->addItem($workingTimeForm);
diff --git a/frontends/php/include/views/administration.usergroups.edit.php b/frontends/php/include/views/administration.usergroups.edit.php
index 6055fcd16ee..a2ae36a4457 100644
--- a/frontends/php/include/views/administration.usergroups.edit.php
+++ b/frontends/php/include/views/administration.usergroups.edit.php
@@ -24,7 +24,7 @@ $widget = (new CWidget())->setTitle(_('User groups'));
// create form
$userGroupForm = (new CForm())
->setName('userGroupsForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['usrgrpid'] != 0) {
diff --git a/frontends/php/include/views/administration.users.edit.php b/frontends/php/include/views/administration.users.edit.php
index ab0811b7b96..99bcabc8066 100644
--- a/frontends/php/include/views/administration.users.edit.php
+++ b/frontends/php/include/views/administration.users.edit.php
@@ -33,7 +33,7 @@ else {
// create form
$userForm = (new CForm())
->setName('userForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['userid'] != 0) {
diff --git a/frontends/php/include/views/conf.import.php b/frontends/php/include/views/conf.import.php
index 02d16969730..e516e445798 100644
--- a/frontends/php/include/views/conf.import.php
+++ b/frontends/php/include/views/conf.import.php
@@ -127,7 +127,7 @@ $tab_view->setFooter(makeFormFooter(
));
$form = (new CForm('post', null, 'multipart/form-data'))
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('backurl', $data['backurl'])
->addItem($tab_view);
diff --git a/frontends/php/include/views/configuration.action.edit.php b/frontends/php/include/views/configuration.action.edit.php
index 42c3264b039..e62abae5e9b 100644
--- a/frontends/php/include/views/configuration.action.edit.php
+++ b/frontends/php/include/views/configuration.action.edit.php
@@ -26,7 +26,7 @@ $widget = (new CWidget())->setTitle(_('Actions'));
// create form
$actionForm = (new CForm())
->setName('action.edit')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addVar('eventsource', $data['eventsource']);
diff --git a/frontends/php/include/views/configuration.application.edit.php b/frontends/php/include/views/configuration.application.edit.php
index b6191cc8f37..9720d2e198f 100644
--- a/frontends/php/include/views/configuration.application.edit.php
+++ b/frontends/php/include/views/configuration.application.edit.php
@@ -25,7 +25,7 @@ $widget = (new CWidget())
// create form
$applicationForm = (new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('hostid', $this->data['hostid']);
if (!empty($this->data['applicationid'])) {
diff --git a/frontends/php/include/views/configuration.copy.elements.php b/frontends/php/include/views/configuration.copy.elements.php
index 67a5026d75d..999d795e843 100644
--- a/frontends/php/include/views/configuration.copy.elements.php
+++ b/frontends/php/include/views/configuration.copy.elements.php
@@ -43,7 +43,7 @@ if ($data['hostid'] != 0) {
// create form
$form = (new CForm())
->setName('elements_form')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('action', $data['action'])
->addVar($data['elements_field'], $data['elements'])
->addVar('hostid', $data['hostid']);
diff --git a/frontends/php/include/views/configuration.correlation.edit.php b/frontends/php/include/views/configuration.correlation.edit.php
index 0282ac71724..3c100b16241 100644
--- a/frontends/php/include/views/configuration.correlation.edit.php
+++ b/frontends/php/include/views/configuration.correlation.edit.php
@@ -25,7 +25,7 @@ $widget = (new CWidget())->setTitle(_('Event correlation rules'));
$form = (new CForm())
->setName('correlation.edit')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['correlationid']) {
diff --git a/frontends/php/include/views/configuration.discovery.edit.php b/frontends/php/include/views/configuration.discovery.edit.php
index a04f2bd2e0d..525a549493e 100644
--- a/frontends/php/include/views/configuration.discovery.edit.php
+++ b/frontends/php/include/views/configuration.discovery.edit.php
@@ -26,7 +26,7 @@ $widget = (new CWidget())->setTitle(_('Discovery rules'));
// create form
$discoveryForm = (new CForm())
->setName('discoveryForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form']);
if (!empty($this->data['druleid'])) {
$discoveryForm->addVar('druleid', $this->data['druleid']);
diff --git a/frontends/php/include/views/configuration.graph.edit.php b/frontends/php/include/views/configuration.graph.edit.php
index 24e8565e804..574910c2140 100644
--- a/frontends/php/include/views/configuration.graph.edit.php
+++ b/frontends/php/include/views/configuration.graph.edit.php
@@ -35,7 +35,7 @@ else {
// Create form.
$graphForm = (new CForm())
->setName('graphForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('hostid', $this->data['hostid'])
->addVar('ymin_itemid', $this->data['ymin_itemid'])
diff --git a/frontends/php/include/views/configuration.host.discovery.edit.php b/frontends/php/include/views/configuration.host.discovery.edit.php
index 8c98ccff10f..c6cc384f1dd 100644
--- a/frontends/php/include/views/configuration.host.discovery.edit.php
+++ b/frontends/php/include/views/configuration.host.discovery.edit.php
@@ -28,7 +28,7 @@ $widget = (new CWidget())
// create form
$itemForm = (new CForm())
->setName('itemForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('hostid', $this->data['hostid']);
diff --git a/frontends/php/include/views/configuration.host.edit.php b/frontends/php/include/views/configuration.host.edit.php
index 8d4066833b4..e11263b6338 100644
--- a/frontends/php/include/views/configuration.host.edit.php
+++ b/frontends/php/include/views/configuration.host.edit.php
@@ -32,7 +32,7 @@ if (!hasRequest('form_refresh')) {
$frmHost = (new CForm())
->setName('hostsForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addVar('clear_templates', $data['clear_templates'])
->addVar('flags', $data['flags'])
diff --git a/frontends/php/include/views/configuration.host.massupdate.php b/frontends/php/include/views/configuration.host.massupdate.php
index c9d487fe72b..5f34fdcfaa6 100644
--- a/frontends/php/include/views/configuration.host.massupdate.php
+++ b/frontends/php/include/views/configuration.host.massupdate.php
@@ -26,7 +26,7 @@ $hostWidget = (new CWidget())->setTitle(_('Hosts'));
// create form
$hostView = (new CForm())
->setName('hostForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('action', 'host.massupdate')
->addVar('tls_accept', $data['tls_accept'])
->setAttribute('id', 'hostForm');
diff --git a/frontends/php/include/views/configuration.host.prototype.edit.php b/frontends/php/include/views/configuration.host.prototype.edit.php
index b96983a0d6c..9bf7dc10784 100644
--- a/frontends/php/include/views/configuration.host.prototype.edit.php
+++ b/frontends/php/include/views/configuration.host.prototype.edit.php
@@ -37,7 +37,7 @@ if (!hasRequest('form_refresh')) {
$frmHost = (new CForm())
->setName('hostPrototypeForm.')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', getRequest('form', 1))
->addVar('parent_discoveryid', $discoveryRule['itemid'])
->addVar('tls_accept', $parentHost['tls_accept']);
diff --git a/frontends/php/include/views/configuration.hostgroups.edit.php b/frontends/php/include/views/configuration.hostgroups.edit.php
index 86f2897ad66..32158c98e94 100644
--- a/frontends/php/include/views/configuration.hostgroups.edit.php
+++ b/frontends/php/include/views/configuration.hostgroups.edit.php
@@ -23,7 +23,7 @@ $widget = (new CWidget())->setTitle(_('Host groups'));
$form = (new CForm())
->setName('hostgroupForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('groupid', $data['groupid'])
->addVar('form', $data['form']);
diff --git a/frontends/php/include/views/configuration.httpconf.edit.php b/frontends/php/include/views/configuration.httpconf.edit.php
index 8a12af02bdf..6aeb45aa4e5 100644
--- a/frontends/php/include/views/configuration.httpconf.edit.php
+++ b/frontends/php/include/views/configuration.httpconf.edit.php
@@ -30,7 +30,7 @@ if (!empty($this->data['hostid'])) {
$http_form = (new CForm())
->setName('httpForm')
->setId('httpForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('hostid', $this->data['hostid'])
->addVar('templated', $this->data['templated']);
diff --git a/frontends/php/include/views/configuration.item.edit.php b/frontends/php/include/views/configuration.item.edit.php
index 88c77efe762..dd08b29fbf2 100644
--- a/frontends/php/include/views/configuration.item.edit.php
+++ b/frontends/php/include/views/configuration.item.edit.php
@@ -30,7 +30,7 @@ if (!empty($data['hostid'])) {
// Create form.
$itemForm = (new CForm())
->setName('itemForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addVar('hostid', $data['hostid']);
diff --git a/frontends/php/include/views/configuration.item.massupdate.php b/frontends/php/include/views/configuration.item.massupdate.php
index 3e0bcf7ceab..630550b5100 100644
--- a/frontends/php/include/views/configuration.item.massupdate.php
+++ b/frontends/php/include/views/configuration.item.massupdate.php
@@ -28,7 +28,7 @@ if ($data['hostid'] != 0) {
// create form
$itemForm = (new CForm())
->setName('itemForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('group_itemid', $data['itemids'])
->addVar('hostid', $data['hostid'])
->addVar('action', $data['action']);
diff --git a/frontends/php/include/views/configuration.item.prototype.edit.php b/frontends/php/include/views/configuration.item.prototype.edit.php
index da7662cd225..10742844236 100644
--- a/frontends/php/include/views/configuration.item.prototype.edit.php
+++ b/frontends/php/include/views/configuration.item.prototype.edit.php
@@ -28,7 +28,7 @@ if (!empty($this->data['hostid'])) {
// create form
$itemForm = (new CForm())
->setName('itemForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
diff --git a/frontends/php/include/views/configuration.maintenance.edit.php b/frontends/php/include/views/configuration.maintenance.edit.php
index 6fd10f58180..d195194c836 100644
--- a/frontends/php/include/views/configuration.maintenance.edit.php
+++ b/frontends/php/include/views/configuration.maintenance.edit.php
@@ -26,7 +26,7 @@ $widget = (new CWidget())->setTitle(_('Maintenance periods'));
// create form
$maintenanceForm = (new CForm())
->setName('maintenanceForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form']);
if (isset($this->data['maintenanceid'])) {
$maintenanceForm->addVar('maintenanceid', $this->data['maintenanceid']);
diff --git a/frontends/php/include/views/configuration.services.edit.php b/frontends/php/include/views/configuration.services.edit.php
index e74ec72066a..7ebb702c778 100644
--- a/frontends/php/include/views/configuration.services.edit.php
+++ b/frontends/php/include/views/configuration.services.edit.php
@@ -28,7 +28,7 @@ $widget = (new CWidget())->setTitle(_('Services'));
// create form
$servicesForm = (new CForm())
->setName('servicesForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $this->data['form'])
->addVar('parentid', $this->data['parentid'])
->addVar('parentname', $this->data['parentname'])
diff --git a/frontends/php/include/views/configuration.template.edit.php b/frontends/php/include/views/configuration.template.edit.php
index 7c4bc989c91..bdd1e0b54af 100644
--- a/frontends/php/include/views/configuration.template.edit.php
+++ b/frontends/php/include/views/configuration.template.edit.php
@@ -44,7 +44,7 @@ if ($data['templateid'] != 0) {
}
$frmHost = (new CForm())
->setName('templatesForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['templateid'] != 0) {
diff --git a/frontends/php/include/views/configuration.trigger.prototype.edit.php b/frontends/php/include/views/configuration.trigger.prototype.edit.php
index 8aaffbe48e1..442f05617a2 100644
--- a/frontends/php/include/views/configuration.trigger.prototype.edit.php
+++ b/frontends/php/include/views/configuration.trigger.prototype.edit.php
@@ -28,7 +28,7 @@ $triggersWidget = (new CWidget())
// create form
$triggersForm = (new CForm())
->setName('triggersForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addItem((new CVar('parent_discoveryid', $data['parent_discoveryid']))->removeId())
->addVar('expression_constructor', $data['expression_constructor'])
diff --git a/frontends/php/include/views/configuration.trigger.prototype.massupdate.php b/frontends/php/include/views/configuration.trigger.prototype.massupdate.php
index 213225be20e..f8fb6aca290 100644
--- a/frontends/php/include/views/configuration.trigger.prototype.massupdate.php
+++ b/frontends/php/include/views/configuration.trigger.prototype.massupdate.php
@@ -28,7 +28,7 @@ $triggersWidget->addItem(get_header_host_table('trigger_prototypes', $data['host
$triggersForm = (new CForm())
->setName('triggersForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('action', $data['action'])
->addVar('parent_discoveryid', $data['parent_discoveryid']);
diff --git a/frontends/php/include/views/configuration.triggers.edit.php b/frontends/php/include/views/configuration.triggers.edit.php
index 76b6335b555..f1d09715cee 100644
--- a/frontends/php/include/views/configuration.triggers.edit.php
+++ b/frontends/php/include/views/configuration.triggers.edit.php
@@ -31,7 +31,7 @@ if (!empty($data['hostid'])) {
// Create form.
$triggersForm = (new CForm())
->setName('triggersForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addVar('hostid', $data['hostid'])
->addVar('expression_constructor', $data['expression_constructor'])
diff --git a/frontends/php/include/views/configuration.triggers.massupdate.php b/frontends/php/include/views/configuration.triggers.massupdate.php
index c571496b723..d185e63c279 100644
--- a/frontends/php/include/views/configuration.triggers.massupdate.php
+++ b/frontends/php/include/views/configuration.triggers.massupdate.php
@@ -31,7 +31,7 @@ if (!empty($data['hostid'])) {
// create form
$triggersForm = (new CForm())
->setName('triggersForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('hostid', $data['hostid'])
->addVar('action', $data['action']);
diff --git a/frontends/php/include/views/inventory.host.view.php b/frontends/php/include/views/inventory.host.view.php
index cc029b3dcf6..75398d650c0 100644
--- a/frontends/php/include/views/inventory.host.view.php
+++ b/frontends/php/include/views/inventory.host.view.php
@@ -222,6 +222,6 @@ return (new CWidget())
->setWebLayoutMode(CView::getLayoutMode())
->setControls((new CList())->addItem(get_icon('fullscreen')))
->addItem((new CForm())
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addItem($hostInventoriesTab)
);
diff --git a/frontends/php/include/views/monitoring.screen.constructor.edit.php b/frontends/php/include/views/monitoring.screen.constructor.edit.php
index e3dba9ee9c8..cf0677f2c98 100644
--- a/frontends/php/include/views/monitoring.screen.constructor.edit.php
+++ b/frontends/php/include/views/monitoring.screen.constructor.edit.php
@@ -26,7 +26,7 @@ if (isset($_REQUEST['screenitemid'])) {
$form = (new CForm('post', $action))
->setName('screen_item_form')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('screenid', getRequest('screenid'));
if (array_key_exists('templateid', $data['screen'])) {
diff --git a/frontends/php/include/views/monitoring.screen.edit.php b/frontends/php/include/views/monitoring.screen.edit.php
index 404db14adbc..6aeaa1c9b61 100644
--- a/frontends/php/include/views/monitoring.screen.edit.php
+++ b/frontends/php/include/views/monitoring.screen.edit.php
@@ -36,7 +36,7 @@ if (array_key_exists('templateid', $data['screen'])) {
// create form
$form = (new CForm())
->setName('screenForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if (array_key_exists('templateid', $data['screen'])) {
diff --git a/frontends/php/include/views/monitoring.slideconf.edit.php b/frontends/php/include/views/monitoring.slideconf.edit.php
index 13648874130..81b1d0c45fe 100644
--- a/frontends/php/include/views/monitoring.slideconf.edit.php
+++ b/frontends/php/include/views/monitoring.slideconf.edit.php
@@ -32,7 +32,7 @@ if (!$data['form_refresh']) {
// create form
$form = (new CForm())
->setName('slideForm')
- ->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
+ ->setAttribute('aria-labelledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form'])
->addVar('slides', $data['slides_without_delay'])
->addVar('current_user_userid', $data['current_user_userid'])
diff --git a/frontends/php/js/dashboard.grid.js b/frontends/php/js/dashboard.grid.js
index 400442adc50..81dd5302088 100644
--- a/frontends/php/js/dashboard.grid.js
+++ b/frontends/php/js/dashboard.grid.js
@@ -2424,7 +2424,7 @@
body.append(resp.messages);
}
- body.find('form').attr('aria-labeledby', header.find('h4').attr('id'));
+ body.find('form').attr('aria-labelledby', header.find('h4').attr('id'));
// Change submit function for returned form.
$('#widget_dialogue_form', body).on('submit', function(e) {
diff --git a/frontends/php/js/functions.js b/frontends/php/js/functions.js
index e1b1ef82685..c338b841280 100644
--- a/frontends/php/js/functions.js
+++ b/frontends/php/js/functions.js
@@ -529,7 +529,7 @@ function overlayDialogue(params, trigger_elmnt, xhr) {
'data-dialogueid': params.dialogueid,
'role': 'dialog',
'aria-modal': 'true',
- 'aria-labeledby': headerid
+ 'aria-labelledby': headerid
});
overlay_bg = jQuery('<div>', {
@@ -637,7 +637,7 @@ function overlayDialogue(params, trigger_elmnt, xhr) {
body_mutation_observer.observe(this, {childList: true, subtree: true});
})
.find('form')
- .attr('aria-labeledby', headerid)
+ .attr('aria-labelledby', headerid)
.end()
)
.append(overlay_dialogue_footer)
diff --git a/frontends/php/js/menupopup.js b/frontends/php/js/menupopup.js
index d220e6aa133..550af1cddfe 100644
--- a/frontends/php/js/menupopup.js
+++ b/frontends/php/js/menupopup.js
@@ -1322,7 +1322,7 @@ jQuery(function($) {
link.attr({
'aria-haspopup': 'true',
'aria-expanded': 'false',
- 'area-hidden': 'true'
+ 'aria-hidden': 'true'
});
}