Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accessibility upgrades #297

Merged
merged 3 commits into from
Jun 5, 2024
Merged

Accessibility upgrades #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edd0f15
Accessibility minor upgrades
Jun 5, 2024
43b137c
Accessibility minor upgrades
Jun 5, 2024
5bebfde
Merge branch 'main' into main
Lcanet2 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion inc/html.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,6 @@ static function header($title, $url = '', $sector = "none", $item = "none", $opt

$user = new User();
$user->getFromDB(Session::getLoginUserID());
$twig_vars['accessibilityMenu'] = $user->fields['accessibility_menu'];

$twig_vars['username'] = getUserName(Session::getLoginUserID());
$twig_vars['main_menu']['args']['access'] = Session::getCurrentInterface();
Expand Down
2 changes: 1 addition & 1 deletion inc/impact.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ public static function printImpactNetworkContainer() {

echo '<h4>' . __('Max depth') . '</h4>';
echo '<div class="impact-side-settings-item">';
echo '<input id="max_depth" type="range" class="impact-range" min="1" max ="10" step="1" value="5"><span id="max_depth_view" class="impact-checkbox-label"></span>';
echo '<input id="max_depth" type="range" aria-label="Max Depth" class="impact-range" min="1" max ="10" step="1" value="5"><span id="max_depth_view" class="impact-checkbox-label"></span>';
echo '</div>';

echo '</div>'; // div class="impact-side-settings">
Expand Down
5 changes: 0 additions & 5 deletions inc/user.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2615,11 +2615,6 @@ function showMyForm($target, $ID) {
'name' => 'password2',
'type' => 'password',
] : [],
__('Accessibility menu') => [
'type' => 'checkbox',
'name' => 'accessibility_menu',
'value' => $this->fields["accessibility_menu"],
],
__('Time zone') => ($tz_available || Session::haveRight("config", READ)) ? ( $tz_available ? [
'type' => 'select',
'name' => 'timezone',
Expand Down
1 change: 0 additions & 1 deletion install/itsm_update_151_200.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ function update151to200() : bool {
'menu_position' => "text default 'menu-left'",
'menu_small' => "text default 'false'",
'menu_open' => "longtext default '[]'",
'accessibility_menu' => "tinyint(1) default '0'",
];
foreach ($userModifications as $field => $definition) {
if (!$DB->fieldExists('glpi_users', $field)) {
Expand Down
1 change: 0 additions & 1 deletion install/mysql/glpi-empty.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7144,7 +7144,6 @@ CREATE TABLE `glpi_users` (
`menu_position` text DEFAULT 'menu-left',
`menu_small` text DEFAULT 'false',
`menu_open` longtext DEFAULT '[]',
`accessibility_menu` tinyint(1) DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `unicityloginauth` (`name`, `authtype`, `auths_id`),
KEY `firstname` (`firstname`),
Expand Down
98 changes: 98 additions & 0 deletions js/accessibility.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
function toggleClassForBody(className) {
const body = $("body");
const isClassPresent = body.hasClass(className);

if (!isClassPresent) {
body.addClass(className);
sessionStorage.setItem(className, !isClassPresent);
} else {
body.removeClass(className);
sessionStorage.removeItem(className);
}
}

function changeFontSize(size) {
const html = $("html");
const currentSize = html.css("font-size");
const newSize = parseInt(currentSize) + size;

const maxFontSize = 24;
const minFontSize = 12;

if (newSize + size > maxFontSize || newSize + size < minFontSize) return;
html.css("font-size", newSize + "px");
placeAccessibilityButton();
sessionStorage.setItem("accessibility-font-size", newSize);
}

function toggleHighContrast() {
const body = $("body");
const isHighContrast = body.hasClass("accessibility-high-contrast");

if (body.hasClass("accessibility-negative-high-contrast")) body.removeClass("accessibility-negative-high-contrast");
if (!isHighContrast) {
if (body.hasClass("accessibility-negative-high-contrast")) body.removeClass("accessibility-negative-high-contrast");
body.addClass("accessibility-high-contrast");
sessionStorage.setItem("accessibility-high-contrast", !isHighContrast);
} else {
body.removeClass("accessibility-high-contrast");
sessionStorage.removeItem("accessibility-high-contrast");
}
}

function toggleNegativeHighContrast() {
const body = $("body");
const isHighContrast = body.hasClass("accessibility-negative-high-contrast");

if (body.hasClass("accessibility-high-contrast")) body.removeClass("accessibility-high-contrast");
if (!isHighContrast) {
body.addClass("accessibility-negative-high-contrast");
sessionStorage.setItem("accessibility-negative-high-contrast", !isHighContrast);
} else {
body.removeClass("accessibility-negative-high-contrast");
sessionStorage.removeItem("accessibility-negative-high-contrast");
}
}

function resetAllAccessibilityOptions() {
const body = $("body");
body.removeClass("accessibility-grayscale");
sessionStorage.removeItem("accessibility-grayscale");

body.removeClass("accessibility-high-contrast");
sessionStorage.removeItem("accessibility-high-contrast");

body.removeClass("accessibility-negative-high-contrast");
sessionStorage.removeItem("accessibility-negative-high-contrast");

body.removeClass("accessibility-link-underline");
sessionStorage.removeItem("accessibility-link-underline");

body.removeClass("accessibility-readable-font");
sessionStorage.removeItem("accessibility-readable-font");

$("html").css("font-size", "");
sessionStorage.removeItem("accessibility-font-size");

placeAccessibilityButton();
}

function placeAccessibilityButton() {
const button = $("#accessibility-menu").find("button");
const buttonWidth = button.outerWidth();

button.css("left", -buttonWidth + "px");
}

$(document).ready(function () {
if (sessionStorage.getItem("accessibility-font-size")) $("html").css("font-size", sessionStorage.getItem("accessibility-font-size") + "px");
if (sessionStorage.getItem("accessibility-high-contrast")) $("body").addClass("accessibility-high-contrast");
if (sessionStorage.getItem("accessibility-negative-high-contrast")) $("body").addClass("accessibility-negative-high-contrast");
if (sessionStorage.getItem("accessibility-grayscale")) $("body").addClass("accessibility-grayscale");
if (sessionStorage.getItem("accessibility-link-underline")) $("body").addClass("accessibility-link-underline");
if (sessionStorage.getItem("accessibility-readable-font")) $("body").addClass("accessibility-readable-font");

const menu = $("#accessibility-menu");
menu.css("right", -menu.outerWidth() + "px");
placeAccessibilityButton();
});
12 changes: 10 additions & 2 deletions templates/headers/header.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
{% include impersonate_banner.path with impersonate_banner.args%}
{% endif %}

<button class="skip-link sr-only sr-only-focusable">{{'Jump to menu'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="changeFontSize(1)">{{'Increase Text'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="changeFontSize(-1)">{{'Decrease Text'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="toggleClassForBody('accessibility-grayscale')">{{'GrayScale'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="toggleHighContrast()">{{'High contrast'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="toggleNegativeHighContrast()">{{'Negative contrast'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="toggleClassForBody('accessibility-link-underline')">{{'Links underline'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="toggleClassForBody('accessibility-readable-font')">{{'Readable font'|trans}}</button>
<button class="skip-link sr-only sr-only-focusable" onclick="resetAllAccessibilityOptions()">{{'Reset'|trans}}</button>
<script src="{{root_doc}}/js/accessibility.js"></script>
<header role='banner' id='header_top' class='d-flex justify-content-between align-items-center'>
<div class="header_logo m-3" id='c_logo'>
<a href="{{root_doc}}/" accesskey='1' title={{"Home"|trans}}>
Expand Down Expand Up @@ -107,5 +117,3 @@
{% include "headers/utils/actions.twig" with {'links': links, 'root_doc':root_doc} %}
</div>
<main role='main' id='page'>


121 changes: 59 additions & 62 deletions templates/headers/utils/actions.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,62 @@
<li class='icons_block'>
<span>
{% if links['add'] is defined %}
<a href='{{root_doc}}{{links['add']}}' class='pointer' title={{'Add'|trans}}>
<i class='fa fa-plus' aria-hidden="true"></i>
<span class='sr-only'>{{'Add'|trans}}</span>
</a>
{% else %}
<a href='#' class='pointer disabled' title={{'Add is disabled'|trans}}>
<i class='fa fa-plus' aria-hidden="true"></i>
<span class='sr-only'>{{'Add is disabled'|trans}}</span>
</a>
{% endif %}
</span>
<span>
{% if links['search'] is defined %}
<a onClick='$(searchcriteria).toggle()' class='pointer' title="{{'Search'|trans}}">
<i class='fa fa-search'></i>
<span class='sr-only'>{{'Search'|trans}}</span>
</a>
{% else %}
<a href='#' class='pointer disabled' title='{{"Search is disabled"|trans}}'>
<i class='fa fa-search' aria-hidden="true"></i>
<span class='sr-only'>{{'Search is disabled'|trans}}</span>
</a>
{% endif %}
</span>
{# if (count($links) > 0) { #}
{% for key,val in links %}
{% if key == "template" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Manage templates...'|trans}}">
<i class="pointer fa fa-layer-group" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "showall" %}
<span>
<img src="{{root_doc}}/pics/menu_showall.png" url="{{root_doc}}{{val}}" alt="{{'Show all'|trans}}">
</span>
{% elseif key == "summary" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Summary'|trans}}">
<i class="pointer fas fa-stream" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "summary_kanban" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Global Kanban'|trans}}">
<i class="pointer fas fa-columns" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "config" %}
<span>
<img src="{{root_doc}}/pics/menu_showall.png" url="{{root_doc}}{{val}}" alt="{{'Setup'|trans}}">
</span>
{# {% else %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}"></a>
</span> #}
{% endif %}
{% endfor %}
</li>
<ul>
<li class='icons_block'>
<span>
{% if links['add'] is defined %}
<a href='{{root_doc}}{{links['add']}}' class='pointer' title='{{'Add'|trans}}'>
<i class='fa fa-plus' aria-hidden="true"></i>
<span class='sr-only'>{{'Add'|trans}}</span>
</a>
{% else %}
<a href='#' class='pointer disabled' title='{{'Add is disabled'|trans}}'>
<i class='fa fa-plus' aria-hidden="true"></i>
<span class='sr-only'>{{'Add is disabled'|trans}}</span>
</a>
{% endif %}
</span>
<span>
{% if links['search'] is defined %}
<a onClick='$(searchcriteria).toggle()' class='pointer' title="{{'Search'|trans}}">
<i class='fa fa-search'></i>
<span class='sr-only'>{{'Search'|trans}}</span>
</a>
{% else %}
<a href='#' class='pointer disabled' title='{{"Search is disabled"|trans}}'>
<i class='fa fa-search' aria-hidden="true"></i>
<span class='sr-only'>{{'Search is disabled'|trans}}</span>
</a>
{% endif %}
</span>
{% for key, val in links %}
{% if key == "template" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Manage templates...'|trans}}">
<i class="pointer fa fa-layer-group" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "showall" %}
<span>
<img src="{{root_doc}}/pics/menu_showall.png" url="{{root_doc}}{{val}}" alt="{{'Show all'|trans}}">
</span>
{% elseif key == "summary" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Summary'|trans}}">
<i class="pointer fas fa-stream" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "summary_kanban" %}
<span>
<a class="pointer" href="{{root_doc}}{{val}}" title="{{'Global Kanban'|trans}}">
<i class="pointer fas fa-columns" aria-hidden="true"></i>
</a>
</span>
{% elseif key == "config" %}
<span>
<img src="{{root_doc}}/pics/menu_showall.png" url="{{root_doc}}{{val}}" alt="{{'Setup'|trans}}">
</span>
{% endif %}
{% endfor %}
</li>
</ul>

{% if show_ticket %}
<span>
Expand Down
2 changes: 1 addition & 1 deletion templates/macros/input.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% if attributes.type == 'checkbox' %}
<div class="form-switch">
{% if not attributes.no_zero %}
<input type="hidden" name="{{attributes.name}}" value="0" {% if attributes.class %} class="{{attributes.class}}" {% endif %}>
<input type="hidden" name="{{attributes.name}}" value="0" {% if attributes.class %} class="{{attributes.class}}" {% endif %}>
{% endif %}
<input role="switch" class='form-check-input {% if attributes.class %} {{attributes.class}} {% endif %}'
{% for name, value in attributes|filter((v, k) => k != 'value') %}
Expand Down
24 changes: 14 additions & 10 deletions templates/nav/menu.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,26 @@
{% for menu_name, data in menu|filter(data => data['show_menu']) %}
{% for sub_menu_name,val in data['content']|filter(val => val['show_sub_menu']) %}
{% if val['is_favorite'] %}
<a data-menu-name="{{menu_name}}" data-submenu-name="{{sub_menu_name}}" href="{{root_doc}}{{val['page']}}" {{val['shortcut_attr']|raw}} id='favorite-section-{{sub_menu_name}}' class="{{val['is_favorite'] ? 'section-favorite'}} {{menu[val['part']]['content'][sub_menu_name]['sub_menu_class']}}">
<i class='submenu-icon fa-fw {{val['icon']}}' aria-hidden="true"></i>
<span>{{val['title']}}</span>
<i class="star-icon" title="add/remove favorite"></i>
</a>
<li>
<a data-menu-name="{{menu_name}}" data-submenu-name="{{sub_menu_name}}" href="{{root_doc}}{{val['page']}}" {{val['shortcut_attr']|raw}} id='favorite-section-{{sub_menu_name}}' class="{{val['is_favorite'] ? 'section-favorite'}} {{menu[val['part']]['content'][sub_menu_name]['sub_menu_class']}}">
<i class='submenu-icon fa-fw {{val['icon']}}' aria-hidden="true"></i>
<span>{{val['title']}}</span>
<i class="star-icon" title="add/remove favorite"></i>
</a>
</li>
{% endif %}
{% endfor %}
{% endfor %}
{% endif %}
{% for sub_menu_name,val in data['content']|filter(val => val['show_sub_menu']) %}
{% if val.title and (access == 'central' or (val.page != '/front/reminder.php' and val.page != '/front/rssfeed.php')) %}
<a data-menu-name="{{menu_name}}" data-submenu-name="{{sub_menu_name}}" href="{{root_doc}}{{val['page']}}" {{val['shortcut_attr']|raw}} id='section-{{sub_menu_name}}' class="{{val['is_open'] ? 'show' : ''}} {{val['is_favorite'] ? 'section-favorite'}} {{menu[val['part']]['content'][sub_menu_name]['sub_menu_class']}}">
<i class='submenu-icon fa-fw {{val['icon']}}' aria-hidden="true"></i>
<span>{{val['title']}}</span>
<i class="star-icon" title="favorite icon"></i>
</a>
<li>
<a data-menu-name="{{menu_name}}" data-submenu-name="{{sub_menu_name}}" href="{{root_doc}}{{val['page']}}" {{val['shortcut_attr']|raw}} id='section-{{sub_menu_name}}' class="{{val['is_open'] ? 'show' : ''}} {{val['is_favorite'] ? 'section-favorite'}} {{menu[val['part']]['content'][sub_menu_name]['sub_menu_class']}}">
<i class='submenu-icon fa-fw {{val['icon']}}' aria-hidden="true"></i>
<span>{{val['title']}}</span>
<i class="star-icon" title="favorite icon"></i>
</a>
</li>
{% endif %}
{% endfor %}
</ul>
Expand Down
Loading