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

Links components (e.g. 'Footer links') can not be tabbed to #6305

Merged
merged 10 commits into from
Sep 15, 2019
Merged

Links components (e.g. 'Footer links') can not be tabbed to #6305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
87cd3d1
Remove params that appears to be unused
BatJan Sep 8, 2019
2680c12
Add aria-hidden attribute for the i element and removing the ng-href …
BatJan Sep 8, 2019
887d5dc
Re-add unused params after a chat with abjerner - There is a reason b…
BatJan Sep 8, 2019
e794bc1
Adjust the styling so it looks the same whether it's <a> or <button> …
BatJan Sep 8, 2019
b38f5ba
Extend the directive with an isEditExpanded option
BatJan Sep 8, 2019
8855973
Add an isOpen scope variable to be passed for the is-edit-extended op…
BatJan Sep 8, 2019
d1ce7c5
If the editUrl, openUrl and removeUrl values are falsy we render a bu…
BatJan Sep 8, 2019
eaf56c6
Remove uneeded line
BatJan Sep 8, 2019
9187694
Add aria attributes
BatJan Sep 8, 2019
c2b771f
Undo aria-extended since it's usage scenario is not correct in this case
BatJan Sep 9, 2019
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
3 changes: 3 additions & 0 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
}

.umb-node-preview__action {
background: transparent;
padding: 0;
border: 0 none;
margin-left: 5px;
margin-right: 5px;
font-size: 13px;
Expand Down
77 changes: 72 additions & 5 deletions src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="umb-node-preview" ng-class="{'umb-node-preview--sortable': sortable, 'umb-node-preview--unpublished': published === false }">
<i ng-if="icon" class="umb-node-preview__icon {{ icon }}"></i>
<i ng-if="icon" class="umb-node-preview__icon {{ icon }}" aria-hidden="true"></i>
<div class="umb-node-preview__content">

<div class="umb-node-preview__name" ng-attr-title="{{alias}}">{{ name }}</div>
<div class="umb-node-preview__description" ng-if="description">{{ description }}</div>

Expand All @@ -13,9 +13,76 @@
</div>
</div>
<div class="umb-node-preview__actions">
<a class="umb-node-preview__action" title="Edit" ng-href="{{editUrl}}" ng-if="allowEdit" ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
<a class="umb-node-preview__action" title="Open" ng-href="{{openUrl}}" ng-if="allowOpen" ng-click="onOpen()"><localize key="general_open">Open</localize></a>
<a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" ng-href="{{removeUrl}}" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
<!-- If editUrl has a value we render a link otherwise a button-->
<a
class="umb-node-preview__action"
title="Edit {{name}}"
ng-href="{{editUrl}}"
ng-if="allowEdit && editUrl"
ng-click="onEdit()"
>
<localize key="general_edit">Edit</localize>
<span class="sr-only">{{name}}</span>
</a>

<button
type="button"
class="umb-node-preview__action"
title="Edit {{name}}"
ng-if="allowEdit && !editUrl"
ng-click="onEdit()"
aria-haspopup="dialog"
>
<localize key="general_edit">Edit</localize>
<span class="sr-only">{{name}}</span>
</button>

<!-- If openUrl has a value we render a link otherwise a button-->
<a
class="umb-node-preview__action"
title="Open {{name}}"
ng-href="{{openUrl}}"
ng-if="allowOpen && openUrl"
ng-click="onOpen()"
>
<localize key="general_open">Open</localize>
<span class="sr-only">{{name}}</span>
</a>

<button
type="button"
class="umb-node-preview__action"
title="Open {{name}}"
ng-if="allowOpen && !openUrl"
ng-click="onOpen()"
aria-haspopup="dialog"
>
<localize key="general_open">Open</localize>
<span class="sr-only">{{name}}</span>
</button>

<!-- If removeUrl has a value we render a link otherwise a button-->
<a
class="umb-node-preview__action umb-node-preview__action--red"
title="Remove {{name}}"
ng-href="{{removeUrl}}"
ng-if="allowRemove && removeUrl"
ng-click="onRemove()"
>
<localize key="general_remove">Remove</localize>
<span class="sr-only">{{name}}</span>
</a>

<button
type="button"
class="umb-node-preview__action umb-node-preview__action--red"
title="Remove {{name}}"
ng-if="allowRemove && !removeUrl"
ng-click="onRemove()"
>
<localize key="general_remove">Remove</localize>
<span class="sr-only">{{name}}</span>
</button>
</div>

</div>
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
allow-remove="allowRemove"
allow-edit="allowEdit"
on-remove="remove($index)"
on-edit="openContentPicker()">
on-edit="openContentPicker()">
</umb-node-preview>
</div>

Expand Down