inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-2062][ACA-2066] Update Viewer actions (#861)

Browse Source 
* [ACA-2062] viewer - set icons order & set more menu separators

* [ACA-2062] add separator for viewer toolbar icons
This commit is contained in:
Suzana Dirla
2018-12-07 15:11:06 +02:00
committed by Denys Vuika
parent e1133eb5b2
commit b2244cb1c4
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/components/preview/preview.component.html
View File

@@ -21,7 +21,7 @@
<adf-viewer-open-with *ngIf="openWith.length"> <adf-viewer-open-with *ngIf="openWith.length">
<ng-container *ngFor="let action of openWith; trackBy: trackByActionId"> <ng-container *ngFor="let action of openWith; trackBy: trackByActionId">
<aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action> <app-toolbar-menu-item [actionRef]="action"></app-toolbar-menu-item>
</ng-container> </ng-container>
</adf-viewer-open-with> </adf-viewer-open-with>
@@ -33,7 +33,7 @@
<adf-viewer-more-actions *ngIf="viewerToolbarMoreActions.length"> <adf-viewer-more-actions *ngIf="viewerToolbarMoreActions.length">
<ng-container *ngFor="let action of viewerToolbarMoreActions; trackBy: trackByActionId"> <ng-container *ngFor="let action of viewerToolbarMoreActions; trackBy: trackByActionId">
<aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action> <app-toolbar-menu-item [actionRef]="action"></app-toolbar-menu-item>
</ng-container> </ng-container>
</adf-viewer-more-actions> </adf-viewer-more-actions>

8
src/app/components/preview/preview.component.scss
View File

@@ -4,7 +4,7 @@
} }
.hide-last-divider .adf-viewer-toolbar .mat-toolbar { .hide-last-divider .adf-viewer-toolbar .mat-toolbar {
adf-toolbar-divider:last-of-type { > adf-toolbar-divider:last-of-type {
display: none; display: none;
} }
@@ -16,3 +16,9 @@
#adf-viewer-moreactions { #adf-viewer-moreactions {
right: -40px; right: -40px;
} }
.adf-viewer-toolbar-actions {
display: flex;
flex-direction: row;
align-items: center;
}

23
src/assets/app.extensions.json
View File

@@ -842,7 +842,7 @@
"toolbarActions": [ "toolbarActions": [
{ {
"id": "app.viewer.download", "id": "app.viewer.download",
"order": 200, "order": 300,
"title": "APP.ACTIONS.DOWNLOAD", "title": "APP.ACTIONS.DOWNLOAD",
"icon": "get_app", "icon": "get_app",
"actions": { "actions": {
@@ -854,7 +854,7 @@
}, },
{ {
"id": "app.viewer.print", "id": "app.viewer.print",
"order": 300, "order": 400,
"title": "APP.ACTIONS.PRINT", "title": "APP.ACTIONS.PRINT",
"icon": "print", "icon": "print",
"actions": { "actions": {
@@ -866,7 +866,7 @@
}, },
{ {
"id": "app.viewer.share", "id": "app.viewer.share",
"order": 400, "order": 200,
"title": "APP.ACTIONS.SHARE", "title": "APP.ACTIONS.SHARE",
"icon": "share", "icon": "share",
"actions": { "actions": {
@@ -878,7 +878,7 @@
}, },
{ {
"id": "app.viewer.share.edit", "id": "app.viewer.share.edit",
"order": 401, "order": 201,
"title": "APP.ACTIONS.SHARE_EDIT", "title": "APP.ACTIONS.SHARE_EDIT",
"icon": "share", "icon": "share",
"actions": { "actions": {
@@ -899,6 +899,11 @@
"rules": { "rules": {
"visible": "app.toolbar.canViewFile" "visible": "app.toolbar.canViewFile"
} }
},
{
"id": "app.viewer.separator.1",
"type": "separator",
"order": 180
} }
], ],
"toolbarMoreMenu": [ "toolbarMoreMenu": [
@@ -936,6 +941,11 @@
"visible": "app.toolbar.favorite.canToggle" "visible": "app.toolbar.favorite.canToggle"
} }
}, },
{
"id": "app.viewer.more.separator.1",
"type": "separator",
"order": 280
},
{ {
"id": "app.viewer.copy", "id": "app.viewer.copy",
"order": 400, "order": 400,
@@ -972,6 +982,11 @@
"visible": "app.selection.canDelete" "visible": "app.selection.canDelete"
} }
}, },
{
"id": "app.viewer.more.separator.2",
"type": "separator",
"order": 680
},
{ {
"id": "app.viewer.versions", "id": "app.viewer.versions",
"order": 700, "order": 700,