From a1dbd72bcef14a171b3b263db38188dd988f223d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Jan 2023 18:53:54 +0200 Subject: [PATCH] #8337 - Added export button in dataset and dmp editors 1. dataset-profile-editor.component.html: Updated how save button appears (save separated from arrow). 2. dataset-profile-editor.component.scss: Commented paddings from .template_action_btn. 3. dataset-wizard.component.html: Added export button | Updated how save button appears (save separated from arrow). 4. dataset-wizard.component.scss: Added class .dataset-export-btn. 5. dmp-editor.component.html: Added export button. 6. dmp-editor.component.scss: Added class .dmp-export-btn. 7. i18n/: Added in language files properties for disabled export button inside editors (DMP-EDITOR.ACTIONS.DISABLED-EXPORT, DATASET-EDITOR.ACTIONS.DISABLED-EXPORT). --- .../dataset-profile-editor.component.html | 17 +++++-- .../dataset-profile-editor.component.scss | 10 +++-- .../dataset-wizard.component.html | 44 ++++++++++++++++--- .../dataset-wizard.component.scss | 2 +- .../ui/dmp/editor/dmp-editor.component.html | 33 ++++++++++++++ .../ui/dmp/editor/dmp-editor.component.scss | 4 +- dmp-frontend/src/assets/i18n/de.json | 6 ++- dmp-frontend/src/assets/i18n/en.json | 6 ++- dmp-frontend/src/assets/i18n/es.json | 6 ++- dmp-frontend/src/assets/i18n/gr.json | 6 ++- dmp-frontend/src/assets/i18n/hr.json | 6 ++- dmp-frontend/src/assets/i18n/pl.json | 10 +++-- dmp-frontend/src/assets/i18n/pt.json | 6 ++- dmp-frontend/src/assets/i18n/sk.json | 6 ++- dmp-frontend/src/assets/i18n/sr.json | 6 ++- dmp-frontend/src/assets/i18n/tr.json | 6 ++- 16 files changed, 137 insertions(+), 37 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html index 9ea712673..c0288f59d 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html @@ -468,9 +468,20 @@
- diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index 6caaaed3b..6a9648d6e 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -133,17 +133,19 @@ $blue-color-light: #5cf7f2; border-radius: 30px; border: 1px solid #129D99; background: transparent; - padding-left: 2em; - padding-right: 2em; + //padding-left: 2em; + //padding-right: 2em; height: 2.5em; + min-width: 110px; + width: auto; box-shadow: 0px 3px 6px #1E202029; color: #129D99; flex: 0 0 auto; &.save-btn{ background-color: #f7dd72; border: 1px solid transparent; - padding-left: 2em; - padding-right: 2em; + //padding-left: 2em; + //padding-right: 2em; box-shadow: 0px 3px 6px #1E202029; color: #212121; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index 8aba4d08e..2181b16dd 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -27,15 +27,49 @@
-
- + + + + + +
+ + + +
+
- diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index e6509e5df..48fdc4538 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -208,7 +208,7 @@ align-items: center; } - .dataset-save-btn { + .dataset-save-btn, .dataset-export-btn { background: #ffffff 0% 0% no-repeat padding-box; border-radius: 30px; opacity: 1; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 4ff6b5729..ae70a647e 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -11,6 +11,38 @@
{{ formGroup.get('label').value }} ({{'DMP-EDITOR.CHANGES' | translate}})
+
+ + + + + + + +
+ + + +
@@ -23,6 +55,7 @@
+
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index 63259747e..ef7f7b0a9 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -157,8 +157,8 @@ a:hover { align-items: center; } -.save-btn { - background: #ffffff 0% 0% no-repeat padding-box; +.save-btn, .dmp-export-btn { + background: #ffffff 0% 0% no-repeat padding-box !important; border-radius: 30px; opacity: 1; width: 110px; diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index e168b5bfd..e47ca8c80 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -1069,7 +1069,8 @@ "LOCK": "DMP ist durch einen anderen Benutzer gesperrt", "PERMISSION": "Sie sind nicht berechtigt, diesen DMP zu bearbeiten", "INSERT-MANUALLY": "Insert it manually", - "CREATE-DATASET": "Create new one" + "CREATE-DATASET": "Create new one", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Fill with description", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Fill with description", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index da9ec99c6..e4d542f3f 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1069,7 +1069,8 @@ "LOCK": "DMP is locked by another user", "PERMISSION": "You have no permission to edit this DMP", "INSERT-MANUALLY": "Insert it manually", - "CREATE-DATASET": "Create new one" + "CREATE-DATASET": "Create new one", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Fill with description", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Fill with description", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index b1d5977f8..4be20f2db 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -1069,7 +1069,8 @@ "LOCK": "El PGD ha sido bloqueado por otro usuario", "PERMISSION": "No tiene permisos para editar este PGD", "INSERT-MANUALLY": "Insértelo de forma manual", - "CREATE-DATASET": "Crear uno nuevo" + "CREATE-DATASET": "Crear uno nuevo", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Rellenar con la descripción", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "Todos los cambios no grabados volverán a su estado inicial y será redireccionado al editor de PGD. ¿Desea continuar?", "DISCARD-EDITED-CONFIRM": "Sí, descartar los cambios y volver.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Rellenar con la descripción", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 2b59559a8..e34963205 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -1069,7 +1069,8 @@ "LOCK": "Κλειδωμένο Σχέδιο Διαχείρισης Δεδομένων", "PERMISSION": "Δεν έχετε άδεια να επεξεργαστείτε αυτό το Σχέδιο Διαχείρισης Δεδομένων", "INSERT-MANUALLY": "Εισάγετε το χειροκίνητα", - "CREATE-DATASET": "Δημιούργια νέου" + "CREATE-DATASET": "Δημιούργια νέου", + "DISABLED-EXPORT": "Παρακαλώ αποθηκεύστε τις αλλαγές σας για να εξάγετε αυτό το Σχέδιο Διαχείρισης Δεδομένων" }, "PLACEHOLDER": { "DESCRIPTION": "Συμπληρώστε με περιγραφή", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Παρακαλώ αποθηκεύστε τις αλλαγές σας για να εξάγετε αυτό το Σύνολο Δεδομένων" }, "PLACEHOLDER": { "DESCRIPTION": "Συμπληρώστε με περιγραφή", diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json index 36044686a..efaed6ee6 100644 --- a/dmp-frontend/src/assets/i18n/hr.json +++ b/dmp-frontend/src/assets/i18n/hr.json @@ -1069,7 +1069,8 @@ "LOCK": "Plan upravljanja podacima je zaključan od strane drugog korisnika", "PERMISSION": "Nemate ovlasti za uređivanje ovog Plana", "INSERT-MANUALLY": "Ručni unos", - "CREATE-DATASET": "Kreirajte novi" + "CREATE-DATASET": "Kreirajte novi", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Dodajte opis", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "Sve nespremljene promjene bit će odbačene, podaci će se vratiti u izvorno stanje i bit ćete preusmjereni natrag na sučelje za uređivanje Plana. Želite li nastaviti?", "DISCARD-EDITED-CONFIRM": "Da, odbaci promjene.", "DISCARD-EDITED-DENY": "Ne." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Unesite opis", diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json index 029a50957..6aa8aec2b 100644 --- a/dmp-frontend/src/assets/i18n/pl.json +++ b/dmp-frontend/src/assets/i18n/pl.json @@ -1069,8 +1069,9 @@ "LOCK": "DMP jest zablokowany przez innego użytkownika", "PERMISSION": "Nie masz uprawnień do edycji tego DMP", "INSERT-MANUALLY": "Wstaw ręcznie", - "CREATE-DATASET": "Utwórz nowy" - }, + "CREATE-DATASET": "Utwórz nowy", + "DISABLED-EXPORT": "Please save your changes to export this DMP" + }, "PLACEHOLDER": { "DESCRIPTION": "Dodaj opis", "ORGANIZATION": "Wybierz organizację", @@ -1278,8 +1279,9 @@ "DISCARD-EDITED-MESSAGE": "Wszystkie niezapisane zmiany zostaną przywrócone do stanu początkowego i nastąpi przekierowanie z powrotem do Edytora DMP. Czy chcesz kontynuować?", "DISCARD-EDITED-CONFIRM": "Tak, cofnij zmiany i wróć.", "DISCARD-EDITED-DENY": "Nie" - } - }, + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" + }, "PLACEHOLDER": { "DESCRIPTION": "Wpisz opis", "EXTERNAL-LINK": "Podaj zewnętrzny link URL" diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 7b1ce64c5..9bff4f4fe 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -1069,7 +1069,8 @@ "LOCK": "O PGD está bloqueado por outro utilizador", "PERMISSION": "Não tem permissão para editar este PGD", "INSERT-MANUALLY": "Inserir manualmente", - "CREATE-DATASET": "Criar um novo" + "CREATE-DATASET": "Criar um novo", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Preencha com a descrição", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "Todas as alterações irão ser descartadas e será redirecionado para o editor do PGD. Pretende continuar?", "DISCARD-EDITED-CONFIRM": "Sim, reverter as alterações e voltar atrás.", "DISCARD-EDITED-DENY": "Não" - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Preencher com descrição", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 160e22cb7..4e4998d69 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -1069,7 +1069,8 @@ "LOCK": "DMP je zamknutý iným používateľom DMP", "PERMISSION": "Na úpravu tohto DMP nemáte povolenie", "INSERT-MANUALLY": "Doplniť manuálne", - "CREATE-DATASET": "Vytvoriť nový" + "CREATE-DATASET": "Vytvoriť nový", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Doplniť opis", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Doplniť opis", diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index db8b3ddf8..25bc7afaf 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -1069,7 +1069,8 @@ "LOCK": "Plan upravljanja podacima je zaključao drugi korisnik", "PERMISSION": "Nemate dozvolu da uređujete ovaj Plan", "INSERT-MANUALLY": "Unesite ručno", - "CREATE-DATASET": "Kreirajte novi" + "CREATE-DATASET": "Kreirajte novi", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Dodajte opis", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Dopunite opisom", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 375b7c342..a6856a9b8 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -1069,7 +1069,8 @@ "LOCK": "VYP başka bir kullanıcı tarafından kilitlendi", "PERMISSION": "Bu VYP'nı düzenleme yetkiniz yok", "INSERT-MANUALLY": "Manuel olarak ekle", - "CREATE-DATASET": "Yeni bir tane oluştur" + "CREATE-DATASET": "Yeni bir tane oluştur", + "DISABLED-EXPORT": "Please save your changes to export this DMP" }, "PLACEHOLDER": { "DESCRIPTION": "Açıklamaları Doldur", @@ -1278,7 +1279,8 @@ "DISCARD-EDITED-MESSAGE": "All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-CONFIRM": "Yes, revert changes and go back.", "DISCARD-EDITED-DENY": "No." - } + }, + "DISABLED-EXPORT": "Please save your changes to export this Dataset" }, "PLACEHOLDER": { "DESCRIPTION": "Açıklamayla Doldur",