Skip to content

Commit 49424f4

Browse files
author
roadiz-ci
committed
refactor: Replace anchor tags with buttons for better accessibility and consistency, removed unused twig templates for thumbnails
1 parent ce0aee2 commit 49424f4

10 files changed

Lines changed: 50 additions & 173 deletions

‎templates/documents/filtersBar.html.twig‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@
3939
</form>
4040
{% endif %}
4141

42-
<a class="uk-button uk-button-select-all uk-button-bulk-select-documents" href="#" title="{% trans %}select.all{% endtrans %}" data-uk-tooltip="{animation:true}"><i class="uk-icon-check-square-o"></i> {% trans %}select.all{% endtrans %}</a>
42+
<button
43+
type="button"
44+
class="uk-button uk-button-select-all uk-button-bulk-select-documents"
45+
title="{% trans %}select.all{% endtrans %}"
46+
data-uk-tooltip="{animation:true}"
47+
><i class="uk-icon-check-square-o"></i> {% trans %}select.all{% endtrans %}</button>
4348
</div>
4449

4550
{% if filters.itemPerPage and filters.itemCount > filters.itemPerPage %}
@@ -63,7 +68,12 @@
6368
<h3 class="bulk-actions-title documents-bulk-actions-title">{% trans %}bulk.actions{% endtrans %}</h3>
6469
</div>
6570
<div class="bulk-actions__actions">
66-
<a class="uk-button uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-documents" href="#" title="{% trans %}deselect.all{% endtrans %}" data-uk-tooltip="{animation:true}"><i class="uk-icon-square-o"></i></a>
71+
<button
72+
type="button"
73+
class="uk-button uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-documents"
74+
title="{% trans %}deselect.all{% endtrans %}"
75+
data-uk-tooltip="{animation:true}"
76+
><i class="uk-icon-square-o"></i></button>
6777

6878
<form class="uk-form uk-form-horizontal"
6979
action="{{ path('documentsBulkDownloadPage') }}"
@@ -76,11 +86,11 @@
7686
</form>
7787

7888
{% if joinFolderForm %}
79-
<a class="uk-button uk-button-bulk uk-button-bulk-folder uk-button-bulk-folder-documents"
80-
href="#"
89+
<button type="button"
90+
class="uk-button uk-button-bulk uk-button-bulk-folder uk-button-bulk-folder-documents"
8191
data-bulk-group="documents-bulk-folder-cont"
8292
title="{% trans %}bulk.fold.documents{% endtrans %}"
83-
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-folder-tree-mini"></i></a>
93+
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-folder-tree-mini"></i></button>
8494
{% endif %}
8595
<form class="uk-form uk-form-horizontal"
8696
action="{{ path('documentsBulkDeletePage') }}"

‎templates/forms.html.twig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,13 +427,12 @@
427427
<div class="uk-button"><i class="uk-icon-rz-plus-simple"></i></div>
428428
<div class="uk-dropdown uk-dropdown-navbar">
429429
{% for linkedType in linkedTypes %}
430-
<a class="uk-button uk-button-small"
431-
href="#"
430+
<button type="button" class="uk-button uk-button-small"
432431
data-children-node-type="{{ linkedType.name }}"
433432
data-children-parent-node="{{ nodeTree.rootNode.id }}"
434433
data-translation-id="{{ nodeTree.translation.id }}">
435434
<i class="uk-icon-rz-plus-simple"></i>{{ linkedType.displayName }}
436-
</a>
435+
</button>
437436
{% endfor %}
438437
</div>
439438
</li>

‎templates/nodes/filtersBar.html.twig‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
</div>
1212
</form>
1313

14-
<a class="uk-button uk-button-select-all uk-button-bulk-select-nodes" href="#" title="{% trans %}select.all{% endtrans %}" data-uk-tooltip="{animation:true}"><i class="uk-icon-check-square-o"></i> {% trans %}select.all{% endtrans %}</a>
14+
<button type="button"
15+
class="uk-button uk-button-select-all uk-button-bulk-select-nodes"
16+
title="{% trans %}select.all{% endtrans %}"
17+
data-uk-tooltip="{animation:true}"><i class="uk-icon-check-square-o"></i> {% trans %}select.all{% endtrans %}</button>
1518
</div>
1619

1720
{% if filters.itemCount > filters.itemPerPage %}
@@ -36,21 +39,25 @@
3639
<h3 class="bulk-actions-title nodes-bulk-actions-title">{% trans %}bulk.actions{% endtrans %}</h3>
3740
</div>
3841
<div class="bulk-actions__actions">
39-
<a class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-nodes" href="#" title="{% trans %}deselect.all{% endtrans %}" data-uk-tooltip="{animation:true}"><i class="uk-icon-square-o"></i></a>
42+
<button
43+
type="button"
44+
class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-nodes"
45+
title="{% trans %}deselect.all{% endtrans %}"
46+
data-uk-tooltip="{animation:true}"><i class="uk-icon-square-o"></i></button>
4047
{# Links #}
4148
{% if tagNodesForm %}
42-
<a class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-folder uk-button-bulk-folder-nodes"
43-
href="#"
49+
<button type="button"
50+
class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-folder uk-button-bulk-folder-nodes"
4451
data-bulk-group="nodes-bulk-folder-form-cont"
4552
title="{% trans %}link.tags{% endtrans %}"
46-
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-tags"></i></a>
53+
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-tags"></i></button>
4754
{% endif %}
4855
{% if statusNodesForm %}
49-
<a class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-status uk-button-bulk-status-nodes"
50-
href="#"
56+
<button type="button"
57+
class="uk-button rz-no-ajax-link uk-button-bulk uk-button-bulk-status uk-button-bulk-status-nodes"
5158
data-bulk-group="nodes-bulk-status-form-cont"
5259
title="{% trans %}nodes.status{% endtrans %}"
53-
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-published"></i></a>
60+
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-published"></i></button>
5461
{% endif %}
5562

5663
{% if deleteNodesForm %}

‎templates/nodes/tree.html.twig‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@
3838
<div class="content-header-action-menu stack-tree-quick-creation">
3939
{% for stackType in node.stackTypes %}
4040
{% set nodeType = getNodeType(stackType) %}
41-
<a data-children-node-type="{{ nodeType.name }}"
42-
data-children-parent-node="{{ node.id }}"
43-
{% if specificNodeTree.tag %}data-filter-tag="{{ specificNodeTree.tag.id }}"{% endif %}
44-
class="uk-button rz-no-ajax-link rz-add-child-node"
45-
href="#"><i class="uk-icon-rz-plus-simple"></i> {{ nodeType.displayName }}</a>
41+
<button
42+
type="button"
43+
data-children-node-type="{{ nodeType.name }}"
44+
data-children-parent-node="{{ node.id }}"
45+
{% if specificNodeTree.tag %}data-filter-tag="{{ specificNodeTree.tag.id }}"{% endif %}
46+
class="uk-button rz-add-child-node"
47+
><i class="uk-icon-rz-plus-simple"></i> {{ nodeType.displayName }}</button>
4648
{% endfor %}
4749
</div>
4850
{% endif %}

‎templates/settings/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
</td>
7777
<td class="table-actions-row">
7878
<div class="uk-button-group">
79-
<a class="uk-button uk-button-content uk-button-small uk-button-settings-save no-ajax-link uk-button-success mobile-hidden"
80-
href="#"
79+
<button class="uk-button uk-button-content uk-button-small uk-button-settings-save no-ajax-link uk-button-success mobile-hidden"
80+
type="button"
8181
title="{% trans %}save{% endtrans %}"
82-
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-save-mini"></i></a>
82+
data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-save-mini"></i></button>
8383
<a class="uk-button uk-button-content uk-button-small"
8484
href="{{ path('settingsEditPage', { settingId: setting.setting.getId }) }}"
8585
title="{% trans %}edit{% endtrans %}"

‎templates/tags/filtersBar.html.twig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@
3333
<h3 class="bulk-actions-title tags-bulk-actions-title">{% trans %}bulk.actions{% endtrans %}</h3>
3434
</div>
3535
<div class="bulk-actions__actions">
36-
<a class="uk-button uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-tags" href="#" title="{% trans %}deselect.all{% endtrans %}" data-uk-tooltip="{animation:true}"><i class="uk-icon-square-o"></i></a>
36+
<button
37+
type="button"
38+
class="uk-button uk-button-bulk uk-button-bulk-deselect uk-button-bulk-deselect-tags"
39+
title="{% trans %}deselect.all{% endtrans %}"
40+
data-uk-tooltip="{animation:true}"
41+
><i class="uk-icon-square-o"></i></button>
3742
{# Links #}
3843
{% if deleteTagsForm %}
3944
{% form_theme deleteTagsForm '@RoadizRozier/horizontalForms.html.twig' %}

‎templates/widgets/customFormSmallThumbnail.html.twig‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎templates/widgets/documentSmallThumbnail.html.twig‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎templates/widgets/nodeSmallThumbnail.html.twig‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎templates/widgets/nodeTree/nodeTree.html.twig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@
3333
<ul class="nodetree-langs{% if nodeTree.availableTranslations|length <= 5 %} few-langs{% endif %}">
3434
{%- for lang in nodeTree.availableTranslations -%}
3535
<li class="{% if lang.id == nodeTree.translation.id %}active{% endif %}">
36-
<a href="#"
37-
class="rz-no-ajax-link"
36+
<button type="button"
3837
{% if nodeTree.tag %}data-filter-tag="{{ nodeTree.tag.id }}"{% endif %}
3938
data-children-parent-node="{{ nodeTree.rootNode.id }}"
40-
data-translation-id="{{ lang.id }}">{{ lang.preferredLocale|capitalize }}</a>
39+
data-translation-id="{{ lang.id }}">{{ lang.preferredLocale|capitalize }}</button>
4140
</li>
4241
{%- endfor -%}
4342
</ul>

0 commit comments

Comments
 (0)