From 493a6de8bd22f1605d4efdc9a3e66737ef48eb34 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 1 Sep 2020 17:54:36 +0200 Subject: [PATCH] Confirm button for assets and references. --- backend/i18n/frontend_en.json | 4 ++++ backend/i18n/frontend_nl.json | 4 ++++ backend/i18n/source/frontend_en.json | 4 ++++ .../shared/references/reference-item.component.html | 5 ++++- .../app/shared/components/assets/asset.component.html | 10 ++++++++-- .../app/shared/components/assets/asset.component.scss | 4 ---- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index 397f956c84..d0cd7e5d77 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -81,6 +81,8 @@ "assets.protected": "Protected", "assets.refreshTooltip": "Refresh Assets (CTRL + SHIFT + R)", "assets.reloaded": "Assets reloaded.", + "assets.removeConfirmText": "Do you really want to remove the asset?", + "assets.removeConfirmTitle": "Remove asset", "assets.renameFolder": "Rename Folder", "assets.replaceConfirmText": "Do you really want to replace the asset with a newer version", "assets.replaceConfirmTitle": "Replace asset?", @@ -367,6 +369,8 @@ "contents.referencesSelectSchema": "Select {schema}", "contents.refreshTooltip": "Refresh Contents (CTRL + SHIFT + R)", "contents.reloaded": "Contents reloaded.", + "contents.removeConfirmText": "Do you really want to remove the content?", + "contents.removeConfirmTitle": "Remove content", "contents.saveAndPublish": "Save and Publish", "contents.scheduledAt": "at", "contents.scheduledAtLabel": "at", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 8f9c44f4f8..4b2a142534 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -81,6 +81,8 @@ "assets.protected": "Beschermd", "assets.refreshTooltip": "Assets vernieuwen (CTRL + SHIFT + R)", "assets.reloaded": "Bestanden herladen.", + "assets.removeConfirmText": "Do you really want to remove the asset?", + "assets.removeConfirmTitle": "Remove asset", "assets.renameFolder": "Naam map wijzigen", "assets.replaceConfirmText": "Wilt je de asset echt vervangen door een nieuwere versie", "assets.replaceConfirmTitle": "Asset vervangen?", @@ -367,6 +369,8 @@ "contents.referencesSelectSchema": "Selecteer {scheme}", "contents.refreshTooltip": "Ververs inhoud (CTRL + SHIFT + R)", "contents.reloaded": "Inhoud opnieuw geladen.", + "contents.removeConfirmText": "Do you really want to remove the content?", + "contents.removeConfirmTitle": "Remove content", "contents.saveAndPublish": "Opslaan en publiceren", "contents.scheduledAt": "bij", "contents.scheduledAtLabel": "bij", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index 397f956c84..d0cd7e5d77 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -81,6 +81,8 @@ "assets.protected": "Protected", "assets.refreshTooltip": "Refresh Assets (CTRL + SHIFT + R)", "assets.reloaded": "Assets reloaded.", + "assets.removeConfirmText": "Do you really want to remove the asset?", + "assets.removeConfirmTitle": "Remove asset", "assets.renameFolder": "Rename Folder", "assets.replaceConfirmText": "Do you really want to replace the asset with a newer version", "assets.replaceConfirmTitle": "Replace asset?", @@ -367,6 +369,8 @@ "contents.referencesSelectSchema": "Select {schema}", "contents.refreshTooltip": "Refresh Contents (CTRL + SHIFT + R)", "contents.reloaded": "Contents reloaded.", + "contents.removeConfirmText": "Do you really want to remove the content?", + "contents.removeConfirmTitle": "Remove content", "contents.saveAndPublish": "Save and Publish", "contents.scheduledAt": "at", "contents.scheduledAtLabel": "at", diff --git a/frontend/app/features/content/shared/references/reference-item.component.html b/frontend/app/features/content/shared/references/reference-item.component.html index f45f53caa0..83a1667e87 100644 --- a/frontend/app/features/content/shared/references/reference-item.component.html +++ b/frontend/app/features/content/shared/references/reference-item.component.html @@ -26,7 +26,10 @@ - diff --git a/frontend/app/shared/components/assets/asset.component.html b/frontend/app/shared/components/assets/asset.component.html index 9ef6fad2ac..5d8cd75ab9 100644 --- a/frontend/app/shared/components/assets/asset.component.html +++ b/frontend/app/shared/components/assets/asset.component.html @@ -37,7 +37,10 @@ - + @@ -131,7 +134,10 @@ - diff --git a/frontend/app/shared/components/assets/asset.component.scss b/frontend/app/shared/components/assets/asset.component.scss index 09980d4300..eed0da5522 100644 --- a/frontend/app/shared/components/assets/asset.component.scss +++ b/frontend/app/shared/components/assets/asset.component.scss @@ -288,10 +288,6 @@ img { cursor: pointer; } -.icon-close { - font-size: .6rem; -} - .tag { background: $color-border; border: 0;