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.

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

Bump ODS to 6.2.0 & add necessary changes #5002

Merged
merged 3 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions changelog/unreleased/enhancement-bump-ods-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Update owncloud Design System to v6.2.0

- Lots of updates regarding accessibility topics
- Removal of home icon in breadcrumbs, changed to "All files" link as breadcrumb root
- Added aria-label to sidebar and proper logo-alt attribute to image in sidebar

https://github.com/owncloud/web/pull/5002
6 changes: 3 additions & 3 deletions packages/web-app-files/src/components/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
id="files-breadcrumb"
class="oc-p-s"
:items="breadcrumbs"
home
variation="lead"
/>
<h1 class="oc-invisible-sr" v-text="pageTitle" />
<div
Expand Down Expand Up @@ -192,14 +192,14 @@ export default {
baseUrl = '/files/list/all/'
pathItems.push('/') // as of now we need to add the url encoded root path `/`, otherwise we'll land in the configured homeFolder
breadcrumbs.push({
text: this.$gettext('Home'),
text: this.$gettext('All files'),
to: baseUrl + encodeURIComponent(pathUtil.join(...pathItems))
})
} else {
baseUrl = '/files/public/list/'
pathItems.push(pathSegments.splice(0, 1)[0])
breadcrumbs.push({
text: this.$gettext('Home'),
text: this.$gettext('Public link'),
to: baseUrl + encodeURIComponent(pathUtil.join(...pathItems))
})
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/LocationPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export default {
breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))
}
} else {
breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('Home'), '/'))
breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('All files'), '/'))
for (let i = 0; i < pathSegments.length; i++) {
const itemPath = encodeURIComponent(join.apply(null, pathSegments.slice(0, i + 1)))
breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"luxon": "^1.22.0",
"moment": "^2.24.0",
"oidc-client": "1.10.1",
"owncloud-design-system": "^6.0.1",
"owncloud-design-system": "^6.2.0",
"owncloud-sdk": "^1.0.0-740",
"p-queue": "^6.1.1",
"tus-js-client": "^1.8.0",
Expand Down
11 changes: 8 additions & 3 deletions packages/web-runtime/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
v-touch:swipe.left="handleNavSwipe"
class="oc-app-navigation"
:logo-img="logoImage"
:product-name="productName"
:logo-alt="sidebarLogoAlt"
:nav-items="sidebarNavItems"
:hide-nav="sidebar.navigationHidden"
:class="sidebarClasses"
:fixed="isSidebarFixed"
:accessible-label="accessibleLabel"
@close="toggleAppNavigationVisibility"
>
<template v-if="sidebar.mainContentComponent" v-slot:mainContent>
Expand Down Expand Up @@ -153,8 +154,12 @@ export default {
return this.configuration.theme.logo.sidebar
},

productName() {
return this.configuration.theme.general.name
accessibleLabel() {
return this.$gettext('Sidebar navigation menu')
},

sidebarLogoAlt() {
return this.$gettext('Navigate to all files page')
},

sidebarNavItems() {
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/pageObjects/personalPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ module.exports = {
locateStrategy: 'xpath'
},
resourceBreadcrumb: {
selector: '//div[@id="files-breadcrumb"]//*[(self::a or self::span) and contains(text(),%s)]',
selector: '//nav[@id="files-breadcrumb"]//*[(self::a or self::span) and contains(text(),%s)]',
locateStrategy: 'xpath'
},
resourceBreadcrumbClickable: {
selector: '//div[@id="files-breadcrumb"]//a[contains(text(),%s)]',
selector: '//nav[@id="files-breadcrumb"]//a[contains(text(),%s)]',
locateStrategy: 'xpath'
},
resourceBreadcrumbNonClickable: {
selector: '//div[@id="files-breadcrumb"]//span[contains(text(),%s)]',
selector: '//nav[@id="files-breadcrumb"]//span[contains(text(),%s)]',
locateStrategy: 'xpath'
},
fileUploadButton: {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7604,10 +7604,10 @@ ospec@3.1.0:
dependencies:
glob "^7.1.3"

owncloud-design-system@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.0.1.tgz#bfa8a797fd35b38d320ec7e8e74683c9dd1278be"
integrity sha512-nLcXRMYdcX7UDS3UkWim7urLOx00u2VUP+01SSpeN5Liuufh8UR88ENLIRW+fqcIPPGhu15qlr1JsV5+0MDgEA==
owncloud-design-system@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.2.0.tgz#e8b69705e3418257b4b34cfb72915ffbb23b8172"
integrity sha512-7PmS2l9vQWvS0rLPLysqfiRwwLaIkpAeSP2BiCQ4aZ0WMzu4FBcRvbzPzoSbe38e393+ZsLrKymAnSNYxXl6Gg==

owncloud-sdk@^1.0.0-740:
version "1.0.0-1716"
Expand Down