Skip to content

Commit

Permalink
adding wcag rules for delegations panels
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Jan 12, 2024
1 parent 814f1a8 commit 98b0c54
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 15 deletions.
2 changes: 1 addition & 1 deletion ...ain/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/DelegatedToMePanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div class="assignments" wicket:id="assignments" about="assignments">
<div class="assignments" wicket:id="assignments" about="assignments" wicket:message="aria-label:DelegatedToMePanel.title">
<div class="d-flex assignable-header assignments-header">

<div class="d-flex">
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserDelegationsPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="row">
<div class="col-md-12">
<div wicket:id="delegationsContainer">
<div wicket:id="delegationsPanel" />
<div tabindex="0" wicket:id="delegationsPanel" wicket:message="aria-label:UserDelegationsPanel.title"/>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<input class="align-self-center mr-2" type="checkbox" wicket:id="assignmentsCheckAll" />
<h3><span wicket:id="assignmentsHeader" /></h3>
</div>
<div class="col-xs-2 cog cog-xs ml-auto" wicket:id="assignmentsMenu" />
<div class="col-xs-2 cog cog-xs ml-auto" wicket:id="assignmentsMenu"/>
</div>
<hr class="hr mt-1"/>

Expand Down
11 changes: 11 additions & 0 deletions ...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ protected void onInitialize() {
protected String getSpecialButtonClass() {
return "btn btn-default";
}

@Override
protected void onInitialize() {
super.onInitialize();
getButtonContainer().add(AttributeModifier.append("aria-label", "AssignmentTablePanel.operationMenu"));
}
};
assignmentMenu.setVisible(getAssignmentMenuVisibility());
assignments.add(assignmentMenu);
Expand Down Expand Up @@ -135,6 +141,11 @@ public boolean isVisible(){
return count != getModelObject().size();
}
});
checkAll.add(AttributeModifier.append(
"aria-label",
createStringResource(
"AssignmentTablePanel.selectAll",
createStringResource(getLabel().getObject()).getString())));
assignments.add(checkAll);

}
Expand Down
14 changes: 7 additions & 7 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="card-header p-0">
<div class="d-flex p-3" wicket:id="headerRow">
<div class="d-flex p-3" wicket:id="headerRow" tabindex="0">
<div class="row check-table-header" style="margin-left: 2px;">
<input type="checkbox" wicket:id="selected"/>
<input type="checkbox" wicket:id="selected" wicket:message="aria-label:DelegationEditorPanel.select"/>
<div class="check-table-label">
<i class="check-table-header-icon" wicket:id="typeImage"></i>
<a class="check-table-header-name" wicket:id="name">
Expand All @@ -36,7 +36,7 @@
<span class="text-gray font-weight-bold text-center"><wicket:message key="AssignmentEditorPanel.description"/></span>
</div>
<div>
<textarea class="form-control form-control-sm" rows="2" wicket:id="delegationDescription"></textarea>
<textarea class="form-control form-control-sm" rows="2" wicket:id="delegationDescription" wicket:message="aria-label:AssignmentEditorPanel.description"></textarea>
</div>
</div>
<div class="d-flex flex-column mb-3">
Expand All @@ -62,7 +62,7 @@
</div>
<div>
<div class="pull-left">
<input type="checkbox" wicket:id="assignmentPrivilegesCheckbox"/>
<input type="checkbox" wicket:id="assignmentPrivilegesCheckbox" wicket:message="aria-label:AssignmentEditorPanel.privileges"/>
</div>
<div>
<div wicket:id="assignmentPrivilegesLabelContainer">
Expand All @@ -82,7 +82,7 @@
<span class="text-gray font-weight-bold text-center"><wicket:message key="DelegationEditorPanel.assignmentLimitations"/></span>
</div>
<div>
<input type="checkbox" wicket:id="allowTransitive"/>
<input type="checkbox" wicket:id="allowTransitive" wicket:message="aria-label:DelegationEditorPanel.allowTransitive"/>
<wicket:message key="DelegationEditorPanel.allowTransitive"/>
</div>
</div>
Expand All @@ -91,11 +91,11 @@
<span class="text-gray font-weight-bold text-center"><wicket:message key="DelegationEditorPanel.workflowApprovals"/></span>
</div>
<div>
<input type="checkbox" wicket:id="approvalWorkItems"/>
<input type="checkbox" wicket:id="approvalWorkItems" wicket:message="aria-label:DelegationEditorPanel.delegateCaseWorkItems"/>
<wicket:message key="DelegationEditorPanel.delegateCaseWorkItems"/>
</div>
<div>
<input class="pull-left" type="checkbox" wicket:id="certificationWorkItems"/>
<input class="pull-left" type="checkbox" wicket:id="certificationWorkItems" wicket:message="aria-label:DelegationEditorPanel.delegateCertificationWorkItems"/>
<wicket:message key="DelegationEditorPanel.delegateCertificationWorkItems"/>
</div>
<div>
Expand Down
32 changes: 27 additions & 5 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
Expand Down Expand Up @@ -152,10 +153,19 @@ public void onClick(AjaxRequestTarget target) {
if (delegatedToMe) {
OperationResult result = new OperationResult(OPERATION_GET_TARGET_REF_NAME);
Task task = pageBase.createSimpleTask(OPERATION_GET_TARGET_REF_NAME);
nameLabel = new Label(ID_NAME_LABEL,
WebModelServiceUtils.resolveReferenceName(getModelObject().getTargetRef(), pageBase, task, result));
String nameValue = WebModelServiceUtils.resolveReferenceName(getModelObject().getTargetRef(), pageBase, task, result);
nameLabel = new Label(ID_NAME_LABEL,nameValue);
headerRow.add(AttributeModifier.append(
"aria-label",
createStringResource("DelegationEditorPanel.delegationFrom", nameValue)));
} else {
nameLabel = new Label(ID_NAME_LABEL, pageBase.createStringResource("DelegationEditorPanel.meLabel"));
name.add(AttributeAppender.append(
"aria-expanded",
() -> getModel().getObject().isMinimized() ? "false" : "true"));
name.add(AttributeAppender.append(
"aria-label",
() -> createStringResource("DelegationEditorPanel.showDetails." + !getModel().getObject().isMinimized()).getString()));
}
nameLabel.setOutputMarkupId(true);
name.add(nameLabel);
Expand Down Expand Up @@ -193,8 +203,18 @@ public void onClick(AjaxRequestTarget target) {
Label delegatedToNameLabel;
if (delegatedToMe) {
delegatedToNameLabel = new Label(ID_DELEGATED_TO_LABEL, pageBase.createStringResource("DelegationEditorPanel.meLabel"));
delegatedToName.add(AttributeAppender.append(
"aria-expanded",
() -> getModel().getObject().isMinimized() ? "false" : "true"));
delegatedToName.add(AttributeAppender.append(
"aria-label",
() -> createStringResource("DelegationEditorPanel.showDetails." + !getModel().getObject().isMinimized()).getString()));
} else {
delegatedToNameLabel = new Label(ID_DELEGATED_TO_LABEL, getUserDisplayName());
String nameValue = getUserDisplayName();
headerRow.add(AttributeModifier.append(
"aria-label",
createStringResource("DelegationEditorPanel.delegationTo", nameValue)));
delegatedToNameLabel = new Label(ID_DELEGATED_TO_LABEL, nameValue);
}
delegatedToNameLabel.setOutputMarkupId(true);
delegatedToName.add(delegatedToNameLabel);
Expand All @@ -214,6 +234,8 @@ public boolean isOn() {
}
};
headerRow.add(expandButton);
expandButton.add(AttributeAppender.append("aria-label", () -> createStringResource("DelegationEditorPanel.showDetails." + expandButton.isOn()).getString()));
expandButton.add(AttributeAppender.append("aria-expanded", () -> expandButton.isOn() ? "true" : "false"));
}

private void navigateToDetails(AjaxRequestTarget target, String oid) {
Expand Down Expand Up @@ -249,8 +271,8 @@ protected void initBodyLayout(WebMarkupContainer body) {
body.add(validTo);

TextArea<String> description = new TextArea<>(ID_DESCRIPTION,
new PropertyModel<String>(getModel(), AssignmentEditorDto.F_DESCRIPTION));
description.setEnabled(getModel().getObject().isEditable());
new PropertyModel<>(getModel(), AssignmentEditorDto.F_DESCRIPTION));
description.add(AttributeAppender.append("readonly", () -> getModel().getObject().isEditable() ? null : "readonly"));
body.add(description);

WebMarkupContainer assignmentPrivilegesContainer = new WebMarkupContainer(ID_ASSIGNMENT_PRIVILEGES_CONTAINER);
Expand Down

0 comments on commit 98b0c54

Please sign in to comment.