diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index a3073a49..8b45ebf8 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -197,6 +197,7 @@ Nome Nome Id figlio + Multitool Id Ut. Abilitato Ut. Attivo Ut. Inibito @@ -305,6 +306,16 @@ Riscontro Utensili ausiliari + + Richiesta di conferma + Ok + Annulla + Sei sicuro di voler cancellare l'utensile? + Sei sicuro di voler cancellare il tagliente? + Sei sicuro di voler cancellare il codolo? + Sei sicuro di voler cancellare il multitool? + Sei sicuro di voler scaricare l'utensile dal codolo? + Sei sicuro di voler scaricare l'utensile dal multitool? diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index aa594154..05812bbd 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -196,6 +196,7 @@ Name Name Child Id + Multitool Id Tool Enambled Tool Active Tool Inhibited @@ -305,6 +306,17 @@ Stop Auxiliary tools + + Confirm Operation + Ok + Cancel + Are you sure to delete this tool? + Are you sure to delete this cutting-edge? + Are you sure to delete this shank? + Are you sure to delete this multitool? + Are you sure to unload this tool from his shank? + Are you sure to unload this tool from his multitool? + diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 86e6fded..cd04daa6 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -225,6 +225,10 @@ sans-serif; -webkit-backdrop-filter: blur(10px); background-color: @color-backdrop; z-index: 900; + + &.internal{ + height: calc(~'100vh - 80px'); + } } .@{modal}.modal-confirm-delete { diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 2552ec04..4fa9ecf2 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -197,6 +197,9 @@ background-color: rgba(217, 217, 217, 0.5); z-index: 900; } +.backdrop.internal { + height: calc(100vh - 80px); +} .modal.modal-confirm-delete { height: 300px; width: 500px; diff --git a/Step/wwwroot/src/components/tooling-shanks.ts b/Step/wwwroot/src/components/tooling-shanks.ts index 984248e9..70abe9c8 100644 --- a/Step/wwwroot/src/components/tooling-shanks.ts +++ b/Step/wwwroot/src/components/tooling-shanks.ts @@ -228,7 +228,7 @@ export default class toolingShanks extends Vue { } public removeToolsToShank(shank) { ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), - this.$options.filters.localize("modal_confirm_delete_tool", "Confermi la cancellazione del tool?"), + this.$options.filters.localize("modal_confirm_delete_tool_inshank", "Confermi la rimozione del tool dal codolo?"), () => { let model = this.selectedEquipment; new ToolingService().removeToolToShank(shank, model).then(response => { diff --git a/Step/wwwroot/src/modules/base-components/modal-confirm.vue b/Step/wwwroot/src/modules/base-components/modal-confirm.vue index f8ea45e6..eb28ea4d 100644 --- a/Step/wwwroot/src/modules/base-components/modal-confirm.vue +++ b/Step/wwwroot/src/modules/base-components/modal-confirm.vue @@ -5,8 +5,8 @@ diff --git a/Step/wwwroot/src/modules/base-components/modal-container.vue b/Step/wwwroot/src/modules/base-components/modal-container.vue index 8ac04b6c..c628ca7a 100644 --- a/Step/wwwroot/src/modules/base-components/modal-container.vue +++ b/Step/wwwroot/src/modules/base-components/modal-container.vue @@ -1,6 +1,6 @@