[ACA-2473] action menus - reorder and capitalisation (#1135)

* reorder actions and typography

* capitalize labels

* added titlecase pipe name

* remove titlecase pipe

* actions titlecase strings

* update e2e

* fix text selector

* e2e exclude deleteaction checks
This commit is contained in:
Cilibiu Bogdan
2019-06-26 12:02:40 +03:00
committed by Adina Parpalita
parent 9e0e50d57d
commit 17ce7f1cbc
13 changed files with 131 additions and 130 deletions
+80 -80
View File
@@ -339,16 +339,11 @@
"visible": "app.selection.file.canUploadVersion"
}
},
{
"id": "app.create.separator.1",
"type": "separator",
"order": 300
},
{
"id": "app.toolbar.favorite",
"comment": "workaround for Recent Files and Search API issue",
"type": "custom",
"order": 400,
"order": 300,
"component": "app.toolbar.toggleFavorite",
"rules": {
"visible": "canToggleFavorite"
@@ -357,7 +352,7 @@
{
"id": "app.libraries.toolbar.toggleFavorite",
"type": "custom",
"order": 401,
"order": 301,
"component": "app.toolbar.toggleFavoriteLibrary",
"rules": {
"visible": "app.selection.library"
@@ -365,7 +360,7 @@
},
{
"id": "app.toolbar.favorite.add",
"order": 402,
"order": 302,
"title": "APP.ACTIONS.FAVORITE",
"icon": "star_border",
"actions": {
@@ -377,7 +372,7 @@
},
{
"id": "app.toolbar.favorite.remove",
"order": 403,
"order": 303,
"title": "APP.ACTIONS.REMOVE_FAVORITE",
"icon": "star",
"actions": {
@@ -387,6 +382,11 @@
"visible": "app.toolbar.favorite.canRemove"
}
},
{
"id": "app.create.separator.1",
"type": "separator",
"order": 400
},
{
"id": "app.toolbar.editFolder",
"order": 450,
@@ -404,21 +404,9 @@
"type": "separator",
"order": 500
},
{
"id": "app.toolbar.copy",
"order": 600,
"title": "APP.ACTIONS.COPY",
"icon": "content_copy",
"actions": {
"click": "COPY_NODES"
},
"rules": {
"visible": "canCopyNode"
}
},
{
"id": "app.toolbar.move",
"order": 700,
"order": 600,
"title": "APP.ACTIONS.MOVE",
"icon": "adf:move_file",
"actions": {
@@ -428,6 +416,18 @@
"visible": "app.selection.canDelete"
}
},
{
"id": "app.toolbar.copy",
"order": 700,
"title": "APP.ACTIONS.COPY",
"icon": "content_copy",
"actions": {
"click": "COPY_NODES"
},
"rules": {
"visible": "canCopyNode"
}
},
{
"id": "app.toolbar.delete",
"order": 800,
@@ -485,36 +485,10 @@
}
],
"contextMenu": [
{
"id": "app.context.toggleLock",
"order": 100,
"type": "custom",
"component": "app.toolbar.toggleEditOffline",
"rules": {
"visible": "canToggleEditOffline"
}
},
{
"id": "app.context.menu.uploadNodeVersion",
"title": "APP.ACTIONS.UPLOAD_VERSION",
"order": 200,
"icon": "playlist_add",
"actions": {
"click": "UPLOAD_FILE_VERSION"
},
"rules": {
"visible": "app.selection.file.canUploadVersion"
}
},
{
"id": "app.create.separator.1",
"type": "separator",
"order": 300
},
{
"id": "app.context.menu.share",
"type": "custom",
"order": 400,
"order": 100,
"component": "app.shared-link.toggleSharedLink",
"rules": {
"visible": "canToggleSharedLink"
@@ -522,7 +496,7 @@
},
{
"id": "app.context.menu.download",
"order": 500,
"order": 200,
"title": "APP.ACTIONS.DOWNLOAD",
"icon": "get_app",
"actions": {
@@ -534,7 +508,7 @@
},
{
"id": "app.context.menu.preview",
"order": 600,
"order": 300,
"title": "APP.ACTIONS.VIEW",
"icon": "visibility",
"actions": {
@@ -544,10 +518,48 @@
"visible": "canViewFile"
}
},
{
"id": "app.create.separator.1",
"type": "separator",
"order": 400
},
{
"id": "app.context.toggleLock",
"order": 500,
"type": "custom",
"component": "app.toolbar.toggleEditOffline",
"rules": {
"visible": "canToggleEditOffline"
}
},
{
"id": "app.context.menu.editFolder",
"order": 600,
"title": "APP.ACTIONS.EDIT",
"icon": "create",
"actions": {
"click": "EDIT_FOLDER"
},
"rules": {
"visible": "canEditFolder"
}
},
{
"id": "app.context.menu.uploadNodeVersion",
"title": "APP.ACTIONS.UPLOAD_VERSION",
"order": 700,
"icon": "playlist_add",
"actions": {
"click": "UPLOAD_FILE_VERSION"
},
"rules": {
"visible": "app.selection.file.canUploadVersion"
}
},
{
"id": "app.context.menu.favorite.add",
"title": "APP.ACTIONS.FAVORITE",
"order": 700,
"order": 800,
"icon": "star_border",
"actions": {
"click": "ADD_FAVORITE"
@@ -559,7 +571,7 @@
{
"id": "app.context.menu.favorite.remove",
"title": "APP.ACTIONS.REMOVE_FAVORITE",
"order": 701,
"order": 801,
"icon": "star",
"actions": {
"click": "REMOVE_FAVORITE"
@@ -572,7 +584,7 @@
"id": "app.context.menu.favorite",
"comment": "workaround for Recent Files and Search API issue",
"type": "custom",
"order": 702,
"order": 802,
"component": "app.toolbar.toggleFavorite",
"rules": {
"visible": "canToggleFavorite"
@@ -581,45 +593,21 @@
{
"id": "app.context.menu.libraries.toggleFavorite",
"type": "custom",
"order": 703,
"order": 803,
"component": "app.toolbar.toggleFavoriteLibrary",
"rules": {
"visible": "app.selection.library"
}
},
{
"id": "app.context.menu.editFolder",
"order": 800,
"title": "APP.ACTIONS.EDIT",
"icon": "create",
"actions": {
"click": "EDIT_FOLDER"
},
"rules": {
"visible": "canEditFolder"
}
},
{
"id": "app.create.separator.2",
"type": "separator",
"order": 900
},
{
"id": "app.context.menu.copy",
"title": "APP.ACTIONS.COPY",
"order": 1000,
"icon": "content_copy",
"actions": {
"click": "COPY_NODES"
},
"rules": {
"visible": "canCopyNode"
}
},
{
"id": "app.context.menu.move",
"title": "APP.ACTIONS.MOVE",
"order": 1100,
"order": 1000,
"icon": "adf:move_file",
"actions": {
"click": "MOVE_NODES"
@@ -628,6 +616,18 @@
"visible": "app.selection.canDelete"
}
},
{
"id": "app.context.menu.copy",
"title": "APP.ACTIONS.COPY",
"order": 1100,
"icon": "content_copy",
"actions": {
"click": "COPY_NODES"
},
"rules": {
"visible": "canCopyNode"
}
},
{
"id": "app.context.menu.delete",
"title": "APP.ACTIONS.DELETE",
+13 -13
View File
@@ -54,9 +54,9 @@
"LABEL": "New",
"TOOLTIP": "Add new files and folders, or create a new File Library",
"MENU_ITEMS": {
"CREATE_FOLDER": "Create folder",
"UPLOAD_FILE": "Upload file",
"UPLOAD_FOLDER": "Upload folder",
"CREATE_FOLDER": "Create Folder",
"UPLOAD_FILE": "Upload File",
"UPLOAD_FOLDER": "Upload Folder",
"CREATE_LIBRARY": "Create Library"
},
"TOOLTIPS": {
@@ -190,28 +190,28 @@
"COPY": "Copy",
"MOVE": "Move",
"DELETE": "Delete",
"DELETE_PERMANENT": "Permanently delete",
"MORE": "More actions",
"DELETE_PERMANENT": "Permanently Delete",
"MORE": "More Actions",
"UNDO": "Undo",
"PERMISSIONS": "Permissions",
"RESTORE": "Restore",
"FAVORITE": "Favorite",
"ADD_FAVORITE": "Add favorite",
"REMOVE_FAVORITE": "Remove favorite",
"ADD_FAVORITE": "Add Favorite",
"REMOVE_FAVORITE": "Remove Favorite",
"UNSHARE": "Unshare",
"DETAILS": "View details",
"DETAILS": "View Details",
"VERSIONS": "Manage Versions",
"UPLOAD_VERSION": "Upload new version",
"UPLOAD_VERSION": "Upload New Version",
"TOGGLE-SIDENAV": "Toggle side navigation bar",
"SHARE": "Share",
"SHARE_EDIT": "Shared link settings",
"SHARE_EDIT": "Shared Link Settings",
"PRINT": "Print",
"FULLSCREEN": "Activate full-screen mode",
"JOIN": "Join",
"CANCEL_JOIN": "Cancel join request",
"CANCEL_JOIN": "Cancel Join Request",
"LEAVE": "Leave library",
"EDIT_OFFLINE": "Edit offline",
"EDIT_OFFLINE_CANCEL": "Cancel editing"
"EDIT_OFFLINE": "Edit Offline",
"EDIT_OFFLINE_CANCEL": "Cancel Editing"
},
"DIALOGS": {
"CONFIRM_PURGE": {