Skip to content

Commit 1b5cdf3

Browse files
committed
accessibility improved
1 parent 53d68c1 commit 1b5cdf3

File tree

8 files changed

+38
-51
lines changed

8 files changed

+38
-51
lines changed

administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-07-03.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-07-03.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

administrator/components/com_workflow/resources/scripts/components/App.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
<main
33
id="workflow-app"
44
class="d-flex flex-column flex-grow-1 min-vh-80"
5-
role="main"
65
aria-labelledby="workflow-main-title"
76
>
87
<header
98
id="workflow-header"
109
class="d-flex flex-column flex-shrink-0"
11-
role="banner"
1210
>
1311
<WorkflowTitlebar
1412
:save-status="saveStatus"
@@ -19,7 +17,6 @@
1917
<section
2018
id="main-canvas"
2119
class="flex-grow-1 position-relative"
22-
role="application"
2320
aria-label="Workflow Canvas Application"
2421
aria-describedby="canvas-description"
2522
>

administrator/components/com_workflow/resources/scripts/components/Titlebar.vue

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<section
33
class="d-flex flex-wrap align-items-center justify-content-between"
44
aria-labelledby="workflow-main-title"
5-
role="banner"
65
>
76
<div class="col-md-6 d-flex flex-column">
87
<h1
@@ -15,48 +14,42 @@
1514
class="d-flex align-items-center flex-wrap mb-0"
1615
aria-label="Workflow Details"
1716
>
18-
<div class="me-3 mb-1 d-flex">
19-
<dt class="visually-hidden">
20-
Status:
21-
</dt>
22-
<dd class="mb-0">
23-
<span
24-
class="badge"
25-
:class="workflow.published ? 'bg-success' : 'bg-warning'"
26-
role="status"
27-
:aria-label="`Status: ${workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED')}`"
28-
>
29-
{{ workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED') }}
30-
</span>
31-
</dd>
32-
</div>
17+
<dt class="visually-hidden">
18+
Status:
19+
</dt>
20+
<dd class="me-3 mb-1 d-flex mb-0">
21+
<span
22+
class="badge"
23+
:class="workflow.published ? 'bg-success' : 'bg-warning'"
24+
role="status"
25+
:aria-label="`Status: ${workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED')}`"
26+
>
27+
{{ workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED') }}
28+
</span>
29+
</dd>
3330

34-
<div class="me-3 mb-1 d-flex">
35-
<dt class="visually-hidden">
36-
Stage Count:
37-
</dt>
38-
<dd class="mb-0">
39-
<span aria-label="`${stagesCount} ${stagesCount === 1 ? 'stage' : 'stages'} in workflow`">
40-
{{ stagesCount }} {{ stagesCount === 1 ? translate('COM_WORKFLOW_GRAPH_STAGE') : translate('COM_WORKFLOW_GRAPH_STAGES') }}
41-
</span>
42-
</dd>
43-
</div>
31+
<dt class="visually-hidden">
32+
Stage Count:
33+
</dt>
34+
<dd class="me-3 mb-1 d-flex mb-0">
35+
<span>
36+
{{ stagesCount }} {{ stagesCount === 1 ? translate('COM_WORKFLOW_GRAPH_STAGE') : translate('COM_WORKFLOW_GRAPH_STAGES') }}
37+
</span>
38+
</dd>
4439

45-
<div class="me-3 mb-1 d-flex">
46-
<dt class="visually-hidden">
47-
Transition Count:
48-
</dt>
49-
<dd class="mb-0">
50-
<span :aria-label="`${transitionsCount} ${transitionsCount === 1 ? 'transition' : 'transitions'} in workflow`">
51-
{{ transitionsCount }} {{ transitionsCount === 1 ? translate('COM_WORKFLOW_GRAPH_TRANSITION')
52-
: translate('COM_WORKFLOW_GRAPH_TRANSITIONS') }}
53-
</span>
54-
</dd>
55-
</div>
40+
<dt class="visually-hidden">
41+
Transition Count:
42+
</dt>
43+
<dd class="me-3 mb-1 d-flex mb-0">
44+
<span>
45+
{{ transitionsCount }} {{ transitionsCount === 1 ? translate('COM_WORKFLOW_GRAPH_TRANSITION')
46+
: translate('COM_WORKFLOW_GRAPH_TRANSITIONS') }}
47+
</span>
48+
</dd>
5649
</dl>
5750
</div>
5851

59-
<aside
52+
<div
6053
id="save-status"
6154
class="mb-2 fw-bold"
6255
role="status"
@@ -71,7 +64,7 @@
7164
? translate('COM_WORKFLOW_GRAPH_UNSAVED_CHANGES')
7265
: translate('COM_WORKFLOW_GRAPH_UP_TO_DATE')
7366
}}
74-
</aside>
67+
</div>
7568
</section>
7669
</template>
7770

administrator/components/com_workflow/resources/scripts/components/canvas/ControlsPanel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
position="top-left"
44
aria-labelledby="controls-panel-title"
55
class="d-flex gap-2 p-2"
6-
role="toolbar"
6+
role="group"
77
>
88
<h2 id="controls-panel-title" class="visually-hidden">Workflow Creation Controls</h2>
99

administrator/components/com_workflow/resources/scripts/components/canvas/CustomControls.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<template>
2-
<nav
2+
<div
33
ref="controlsContainer"
44
class="custom-controls z-10"
5-
tabindex="0"
6-
role="toolbar"
5+
role="group"
76
aria-labelledby="canvas-controls-title"
87
>
98
<h2 id="canvas-controls-title" class="visually-hidden">Canvas View Controls</h2>
@@ -55,7 +54,7 @@
5554
</button>
5655
</li>
5756
</ul>
58-
</nav>
57+
</div>
5958
</template>
6059

6160
<script>

administrator/components/com_workflow/src/Controller/StagesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function updateStagesPosition()
218218
}
219219

220220
$app = $this->app;
221-
$input = $app->input;
221+
$input = $app->getInput();
222222
$workflowId = $input->getInt('id');
223223
$positions = $input->get('positions', [], 'array');
224224
$model = $this->getModel('Stages', 'Administrator');

administrator/components/com_workflow/tmpl/graph/default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@
8181
<template id="shortcuts-popup-content">
8282
<?php echo implode($shortcutsHtml); ?>
8383
</template>
84-
<section id="workflow-graph-root" role="region" aria-label="Workflow graph"></section>
84+
<section id="workflow-graph-root" aria-label="Workflow graph"></section>
8585
<script type="module" src="<?php echo $script ?>"></script>

0 commit comments

Comments
 (0)