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

Update ods 1.10.1 #4086

Merged
merged 15 commits into from
Sep 21, 2020
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
48 changes: 27 additions & 21 deletions apps/files/src/components/Collaborators/Collaborator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<oc-button
:id="$_resharerToggleId"
variation="raw"
justify-content="left"
gap-size="xsmall"
:aria-label="$gettext('Show resharer details')"
:uk-tooltip="$gettext('Show resharer details')"
>
<span class="uk-flex uk-flex-middle">
<oc-icon name="repeat" class="uk-preserve-width oc-icon-xsmall" />
<span
class="uk-padding-remove uk-margin-xsmall-left uk-text-truncate files-collaborators-collaborator-reshare-information"
>{{ $_reshareInformation }}</span
>
</span>
<oc-icon name="repeat" size="xsmall" class="uk-preserve-width" />
<span
class="uk-padding-remove uk-text-truncate files-collaborators-collaborator-reshare-information"
>{{ $_reshareInformation }}</span
>
</oc-button>
<oc-drop
ref="menu"
Expand Down Expand Up @@ -139,26 +139,32 @@
</div>
</oc-table-cell>
<oc-table-cell shrink>
<oc-button
v-if="$_editButtonVisible"
:aria-label="$gettext('Edit share')"
:uk-tooltip="$gettext('Edit share')"
variation="raw"
class="files-collaborators-collaborator-edit"
@click="$emit('onEdit', collaborator)"
>
<oc-icon name="edit" />
</oc-button>
<div class="uk-flex uk-flex-nowrap uk-flex-middle">
<oc-button
v-if="$_editButtonVisible"
:aria-label="$gettext('Edit share')"
:uk-tooltip="$gettext('Edit share')"
variation="raw"
class="files-collaborators-collaborator-edit"
@click="$emit('onEdit', collaborator)"
>
<oc-icon name="edit" />
</oc-button>
</div>
</oc-table-cell>
</oc-table-row>
<oc-table-row v-if="$_viaLabel" class="files-collaborators-collaborator-table-row-bottom">
<oc-table-cell shrink :colspan="firstColumn ? 2 : 1"></oc-table-cell>
<oc-table-cell colspan="2">
<div class="uk-text-meta">
<router-link
<oc-button
type="router-link"
variation="raw"
justify-content="left"
gap-size="xsmall"
:to="$_viaRouterParams"
:aria-label="$gettext('Navigate to parent')"
class="files-collaborators-collaborator-follow-via uk-flex uk-flex-middle"
class="files-collaborators-collaborator-follow-via"
>
<oc-icon
name="exit_to_app"
Expand All @@ -167,10 +173,10 @@
:uk-tooltip="$gettext('Navigate to parent')"
/>
<span
class="oc-file-name uk-padding-remove uk-margin-xsmall-left uk-text-truncate files-collaborators-collaborator-via-label"
class="oc-file-name uk-padding-remove uk-text-truncate files-collaborators-collaborator-via-label"
>{{ $_viaLabel }}</span
>
</router-link>
</oc-button>
</div>
</oc-table-cell>
</oc-table-row>
Expand Down
10 changes: 4 additions & 6 deletions apps/files/src/components/Collaborators/EditCollaborator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,11 @@
>
<translate>Cancel</translate>
</oc-button>
</div>
<div>
<oc-button v-if="saving" key="edit-collaborator-saving-button" :disabled="true">
<oc-spinner
:aria-label="$gettext('Saving Share')"
class="uk-position-small uk-position-center-left"
size="xsmall"
/>
<span v-translate :aria-hidden="true" class="uk-margin-small-left">Saving Share</span>
<oc-spinner :aria-label="$gettext('Saving Share')" size="xsmall" />
<span v-translate :aria-hidden="true">Saving Share</span>
</oc-button>
<oc-button
v-else
Expand Down
10 changes: 4 additions & 6 deletions apps/files/src/components/Collaborators/NewCollaborator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,11 @@
>
<translate>Cancel</translate>
</oc-button>
</div>
<div>
<oc-button v-if="saving" key="new-collaborator-saving-button" :disabled="true">
<oc-spinner
:aria-label="$gettext('Adding People')"
class="uk-position-small uk-position-center-left"
size="xsmall"
/>
<span v-translate :aria-hidden="true" class="uk-margin-small-left">Adding People</span>
<oc-spinner :aria-label="$gettext('Adding People')" size="xsmall" />
<span v-translate :aria-hidden="true">Adding People</span>
</oc-button>
<oc-button
v-else
Expand Down
18 changes: 10 additions & 8 deletions apps/files/src/components/Collaborators/SharedFilesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,23 +114,25 @@
>
</span>
</div>
<div v-else :key="item.id + item.status" class="uk-text-nowrap">
<a
<div v-else :key="item.id + item.status" class="uk-text-nowrap uk-flex uk-flex-middle">
<oc-button
v-if="item.status === 1 || item.status === 2"
v-translate
variation="raw"
class="file-row-share-status-action uk-text-meta"
@click="pendingShareAction(item, 'POST')"
>Accept</a
>
<a
<translate>Accept</translate>
</oc-button>
<oc-button
v-if="item.status === 1"
v-translate
variation="raw"
class="file-row-share-status-action uk-text-meta uk-margin-left"
@click="pendingShareAction(item, 'DELETE')"
>Decline</a
>
<translate>Decline</translate>
</oc-button>
<span
class="uk-text-small uk-margin-left file-row-share-status-text"
class="uk-text-small uk-margin-left file-row-share-status-text uk-text-baseline"
v-text="shareStatus(item.status)"
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/FileInfoVersions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</oc-table-cell>
</oc-table-cell>
<oc-table-cell shrink>
<div class="uk-button-group uk-margin-small-right">
<div class="uk-button-group">
<oc-button
variation="raw"
:aria-label="$gettext('Restore older version')"
Expand All @@ -28,7 +28,7 @@
</div>
</oc-table-cell>
<oc-table-cell shrink>
<div class="uk-button-group uk-margin-small-right">
<div class="uk-button-group">
<oc-button
variation="raw"
:aria-label="$gettext('Download older version')"
Expand Down
6 changes: 4 additions & 2 deletions apps/files/src/components/FileLinkSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<oc-loader v-if="linksLoading" :aria-label="$gettext('Loading list of file links')" />
<template v-else>
<section v-if="$_privateLinkOfHighlightedFile">
<div class="uk-text-bold">
<div class="uk-text-bold uk-flex">
<span v-translate>Private Link</span>
<oc-button
:aria-label="$_privateLinkCopyLabel"
Expand Down Expand Up @@ -57,8 +57,10 @@
variation="primary"
:aria-label="$_addButtonAriaLabel"
@click="$_addPublicLink"
>{{ $_addButtonLabel }}</oc-button
>
<oc-icon name="add" />
{{ $_addButtonLabel }}
</oc-button>
</div>
<transition-group
class="uk-list uk-list-divider uk-overflow-hidden uk-margin-remove"
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/FileSharingSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<div v-if="$_ocCollaborators_canShare" class="uk-margin-small-top uk-margin-small-bottom">
<oc-button
variation="primary"
icon="add"
class="files-collaborators-open-add-share-dialog-button"
@click="$_ocCollaborators_addShare"
>
<oc-icon name="add" aria-hidden="true" />
<translate>Share</translate>
</oc-button>
</div>
Expand Down
46 changes: 20 additions & 26 deletions apps/files/src/components/FilesAppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@
@progress="onFileProgress"
/>
<div>
<div>
<div class="uk-flex uk-margin-small-bottom">
<oc-breadcrumb
v-if="showBreadcrumb"
id="files-breadcrumb"
:items="breadcrumbs"
home
></oc-breadcrumb>
</div>
<div class="uk-margin-small-bottom">
<oc-breadcrumb v-if="showBreadcrumb" id="files-breadcrumb" :items="breadcrumbs" home />
<span v-if="!showBreadcrumb" class="uk-flex uk-flex-middle uk-margin-small-bottom">
<oc-icon v-if="pageIcon" :name="pageIcon" class="uk-margin-small-right" />
<h1 class="oc-page-title" v-text="pageTitle" />
Expand All @@ -34,11 +27,12 @@
id="new-file-menu-btn"
key="new-file-menu-btn-enabled"
variation="primary"
icon="add"
:uk-tooltip="_cannotCreateDialogText"
:disabled="isNewBtnDisabled"
><translate>New</translate></oc-button
>
<oc-icon name="add" aria-hidden="true" />
<translate>New</translate>
</oc-button>
<oc-drop
drop-id="new-file-menu-drop"
toggle="#new-file-menu-btn"
Expand Down Expand Up @@ -112,55 +106,55 @@
<oc-button
v-if="selectedFiles.length > 0"
key="restore-btn"
icon="restore"
class="uk-margin-small-right"
@click="$_ocTrashbin_restoreFiles()"
>
<oc-icon name="restore" aria-hidden="true" />
<translate>Restore</translate>
</oc-button>
<oc-button
id="delete-selected-btn"
key="delete-btn"
icon="delete"
:disabled="files.length === 0"
@click="
selectedFiles.length < 1 ? $_ocTrashbin_empty() : $_deleteResources_displayDialog()
"
>
<oc-icon name="delete" aria-hidden="true" />
{{ $_ocAppBar_clearTrashbinButtonText }}
</oc-button>
</template>
<oc-grid v-if="displayBulkActions" gutter="small">
<div>
<oc-button
id="delete-selected-btn"
key="delete-selected-btn"
icon="delete"
@click="$_deleteResources_displayDialog()"
id="copy-selected-btn"
key="copy-selected-btn"
:disabled="!canCopy"
@click="triggerLocationPicker('copy')"
>
<translate>Delete</translate>
<oc-icon name="file_copy" aria-hidden="true" />
<translate>Copy</translate>
</oc-button>
</div>
<div>
<oc-button
id="move-selected-btn"
key="move-selected-btn"
icon="folder-move"
:disabled="!canMove"
@click.native="triggerLocationPicker('move')"
@click="triggerLocationPicker('move')"
>
<oc-icon name="folder-move" aria-hidden="true" />
<translate>Move</translate>
</oc-button>
</div>
<div>
<oc-button
id="copy-selected-btn"
key="copy-selected-btn"
icon="file_copy"
:disabled="!canCopy"
@click.native="triggerLocationPicker('copy')"
id="delete-selected-btn"
key="delete-selected-btn"
@click="$_deleteResources_displayDialog()"
>
<translate>Copy</translate>
<oc-icon name="delete" aria-hidden="true" />
<translate>Delete</translate>
</oc-button>
</div>
</oc-grid>
Expand Down
8 changes: 6 additions & 2 deletions apps/files/src/components/FilesLists/Indicators.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<template>
<span>
<div v-if="displayDefaultIndicators" :class="{ 'uk-margin-xsmall-right': customIndicators }">
<div
v-if="displayDefaultIndicators"
:class="{ 'uk-margin-xsmall-right': customIndicators }"
class="uk-flex"
>
<template v-if="areIndicatorsClickable">
<oc-button
v-for="(indicator, index) in defaultIndicators"
Expand All @@ -10,7 +14,7 @@
:aria-label="indicator.label"
:uk-tooltip="indicator.label"
variation="raw"
@click.native.stop="indicator.handler(item, indicator.id)"
@click.stop="indicator.handler(item, indicator.id)"
>
<oc-icon :name="indicator.icon" class="uk-text-middle" size="small" variation="system" />
</oc-button>
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/FilesLists/QuickActions.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div class="uk-flex">
<oc-button
v-for="action in filteredActions"
:id="`files-quick-action-${action.id}`"
Expand All @@ -8,7 +8,7 @@
:uk-tooltip="action.label"
variation="raw"
class="uk-margin-xsmall-right"
@click.native.stop="action.handler({ item, client: $client, store: $store })"
@click.stop="action.handler({ item, client: $client, store: $store })"
>
<oc-icon :name="action.icon" aria-hidden="true" size="small" class="uk-flex" />
</oc-button>
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/FilesLists/RowActionsDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<li v-for="action in actions" :key="action.ariaLabel(item)">
<oc-button
class="uk-width-1-1"
:icon="action.icon"
:aria-Label="action.ariaLabel(item)"
@click.native.stop="
@click.stop="
action.handler(item, action.handlerData)
actionClicked()
"
>
<oc-icon :name="action.icon" aria-hidden="true" />
{{ action.ariaLabel(item) }}
</oc-button>
</li>
Expand Down
Loading