From 96dca2060a2deda709ef97b2285c1b771b0dd1d2 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Thu, 24 May 2018 16:33:53 +0200
Subject: [PATCH 1/2] Fix Languages in Tool-Modal-Window

---
 Step.Utils/languages/IT.xml                          | 11 +++++++++++
 Step.Utils/languages/en.xml                          | 12 ++++++++++++
 Step/wwwroot/src/components/tooling-shanks.ts        |  2 +-
 .../src/modules/base-components/modal-confirm.vue    |  4 ++--
 4 files changed, 26 insertions(+), 3 deletions(-)

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 @@
   <tooling_equipment_param_familyName>Nome</tooling_equipment_param_familyName>
   <tooling_equipment_param_name>Nome</tooling_equipment_param_name>
   <tooling_equipment_param_childId>Id figlio</tooling_equipment_param_childId>
+  <tooling_equipment_param_multitoolId>Multitool Id</tooling_equipment_param_multitoolId>
   <tooling_equipment_param_isEnabled>Ut. Abilitato</tooling_equipment_param_isEnabled>
   <tooling_equipment_param_isActive>Ut. Attivo</tooling_equipment_param_isActive>
   <tooling_equipment_param_isInhibited>Ut. Inibito</tooling_equipment_param_isInhibited>
@@ -305,6 +306,16 @@
   <tooling_equipment_list_select_stop>Riscontro</tooling_equipment_list_select_stop>
   <tooling_equipment_list_select_auxiliaryTools>Utensili ausiliari</tooling_equipment_list_select_auxiliaryTools>
 
+  <!-- Tool Manager - Message-Box --> 
+  <modal_confirm_delete>Richiesta di conferma</modal_confirm_delete> 
+  <modal_ok_button>Ok</modal_ok_button> 
+  <modal_cancel_button>Annulla</modal_cancel_button> 
+  <modal_confirm_delete_tool>Sei sicuro di voler cancellare l'utensile?</modal_confirm_delete_tool> 
+  <modal_confirm_delete_edge>Sei sicuro di voler cancellare il tagliente?</modal_confirm_delete_edge> 
+  <modal_confirm_delete_shank>Sei sicuro di voler cancellare il codolo?</modal_confirm_delete_shank>
+  <siemens_modal_confirm_delete_shank>Sei sicuro di voler cancellare il multitool?</siemens_modal_confirm_delete_shank>
+  <modal_confirm_delete_tool_inshank>Sei sicuro di voler scaricare l'utensile dal codolo?</modal_confirm_delete_tool_inshank>
+  <siemens_modal_confirm_delete_tool_inshank>Sei sicuro di voler scaricare l'utensile dal multitool?</siemens_modal_confirm_delete_tool_inshank>
   
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
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 @@
   <tooling_equipment_param_familyName>Name</tooling_equipment_param_familyName>
   <tooling_equipment_param_name>Name</tooling_equipment_param_name>
   <tooling_equipment_param_childId>Child Id</tooling_equipment_param_childId>
+  <tooling_equipment_param_multitoolId>Multitool Id</tooling_equipment_param_multitoolId>
   <tooling_equipment_param_isEnabled>Tool Enambled</tooling_equipment_param_isEnabled>
   <tooling_equipment_param_isActive>Tool Active</tooling_equipment_param_isActive>
   <tooling_equipment_param_isInhibited>Tool Inhibited</tooling_equipment_param_isInhibited>
@@ -305,6 +306,17 @@
   <tooling_equipment_list_select_stop>Stop</tooling_equipment_list_select_stop>
   <tooling_equipment_list_select_auxiliaryTools>Auxiliary tools</tooling_equipment_list_select_auxiliaryTools>
 
+  <!-- Tool Manager - Message-Box --> 
+  <modal_confirm_delete>Confirm Operation</modal_confirm_delete> 
+  <modal_ok_button>Ok</modal_ok_button> 
+  <modal_cancel_button>Cancel</modal_cancel_button> 
+  <modal_confirm_delete_tool>Are you sure to delete this tool?</modal_confirm_delete_tool> 
+  <modal_confirm_delete_edge>Are you sure to delete this cutting-edge?</modal_confirm_delete_edge> 
+  <modal_confirm_delete_shank>Are you sure to delete this shank?</modal_confirm_delete_shank>
+  <siemens_modal_confirm_delete_shank>Are you sure to delete this  multitool?</siemens_modal_confirm_delete_shank>
+  <modal_confirm_delete_tool_inshank>Are you sure to unload this tool from his shank?</modal_confirm_delete_tool_inshank>
+  <siemens_modal_confirm_delete_tool_inshank>Are you sure to unload this tool from his multitool?</siemens_modal_confirm_delete_tool_inshank>
+
 
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
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 @@
     </section>
     <footer class="modal-confirm-delete-footer">
         <div class="pull-right">
-            <button class="btn" @click="Cancel()">{{'modal_ok_button' | localize("No")}}</button>
-            <button class="btn" @click="Ok()">{{'modal_cancel_button' | localize("Conferma")}}</button>
+            <button class="btn" @click="Cancel()">{{'modal_cancel_button' | localize("Conferma")}}</button>
+            <button class="btn btn-success" @click="Ok()">{{'modal_ok_button' | localize("No")}}</button>
         </div>
     </footer>
     </modal>

From 9d90b35cde8452316ef863df340850344690a3b3 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Thu, 24 May 2018 16:54:40 +0200
Subject: [PATCH 2/2] Fix modal ui style

---
 Step/wwwroot/assets/styles/base/modals.less                  | 4 ++++
 Step/wwwroot/assets/styles/style.css                         | 3 +++
 Step/wwwroot/src/modules/base-components/modal-container.vue | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

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 57c7a335..68d1b7ca 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/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 @@
 <template>
 <transition v-if="isVisible" name="modal">
-<div class="backdrop">
+<div class="backdrop" :class="{'internal':!informHmi}">
   <component v-bind:is="currentView">
   </component>
 </div>