Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix languages in magpos and edit mode style

Browse Source
This commit is contained in:
Nicola Carminati
2018-05-24 11:46:33 +02:00
parent 1c41bd8655
commit deda8bcdcc
6 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/tooling-equipment.less
+12 -2
View File
@@ -105,9 +105,13 @@
}
}
.box-right{
width: 1320px;
width: 1320px;
height: 100%;
background-color: @color-white4;
box-shadow: none;
&.selected{
box-shadow: inset 0px 0px 0px 2px rgba(23, 145, 255, 1.0);
}
button.deleteElement{
float: right;
width: 48px;
@@ -191,6 +195,12 @@
}
}
.tab-box-right{
border-bottom: 2px solid #f3f3f3;
&.avoid-clicks{
border-bottom: 2px solid rgba(23, 145, 255, 1.0);
}
}
.tooling-families-container .tab-box-right, .tooling-shanks-container .tab-box-right, .tooling-equipment-container .tab-box-right{
height: 81px;
@@ -290,7 +300,7 @@
left:0;
right: 0;
bottom: 0;
background: rgba(255,255,255,0.5);
background: rgba(255,255,255,0.7);
}
}
Step/wwwroot/assets/styles/style.css
+26 -1
View File
@@ -5047,6 +5047,25 @@ footer .container button.big:before {
width: 1320px;
height: 100%;
background-color: #f3f3f3;
box-shadow: none;
}
.tooling-equipment-container .tooling-equipment-box .body .box-right.selected,
.tooling-families-container .tooling-equipment-box .body .box-right.selected,
.tooling-shanks-container .tooling-equipment-box .body .box-right.selected,
.tooling-magpos-container .tooling-equipment-box .body .box-right.selected,
.tooling-equipment-container .tooling-families-box .body .box-right.selected,
.tooling-families-container .tooling-families-box .body .box-right.selected,
.tooling-shanks-container .tooling-families-box .body .box-right.selected,
.tooling-magpos-container .tooling-families-box .body .box-right.selected,
.tooling-equipment-container .tooling-shanks-box .body .box-right.selected,
.tooling-families-container .tooling-shanks-box .body .box-right.selected,
.tooling-shanks-container .tooling-shanks-box .body .box-right.selected,
.tooling-magpos-container .tooling-shanks-box .body .box-right.selected,
.tooling-equipment-container .tooling-magpos-box .body .box-right.selected,
.tooling-families-container .tooling-magpos-box .body .box-right.selected,
.tooling-shanks-container .tooling-magpos-box .body .box-right.selected,
.tooling-magpos-container .tooling-magpos-box .body .box-right.selected {
box-shadow: inset 0px 0px 0px 2px #1791ff;
}
.tooling-equipment-container .tooling-equipment-box .body .box-right button.deleteElement,
.tooling-families-container .tooling-equipment-box .body .box-right button.deleteElement,
@@ -6814,6 +6833,12 @@ footer .container button.big:before {
.tooling-magpos-container .text-body div + div {
margin-top: 11px;
}
.tab-box-right {
border-bottom: 2px solid #f3f3f3;
}
.tab-box-right.avoid-clicks {
border-bottom: 2px solid #1791ff;
}
.tooling-families-container .tab-box-right,
.tooling-shanks-container .tab-box-right,
.tooling-equipment-container .tab-box-right {
@@ -6959,7 +6984,7 @@ footer .container button.big:before {
left: 0;
right: 0;
bottom: 0;
background: rgba(255, 255, 255, 0.5);
background: rgba(255, 255, 255, 0.7);
}
.info-equipment-container {
height: 100%;
Step/wwwroot/src/components/tooling-equipment.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<div class="group-label-button" :class="{'avoid-clicks': disableList}">{{'tooling_equipment_label_add' | localize("Aggiungi utensile")}}<button class="btn" @click="addEquipment()"><i class="fa fa-plus"></i></button></div>
</div>
</div>
<div class="box-right" v-if="selectedTool">
<div class="box-right" v-if="selectedTool" :class="{'selected': disableList}" >
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">{{'tooling_parameters_tab' | localize("Parametri")}}</button>
<div class="tab-box-scroll scrollable">
Step/wwwroot/src/components/tooling-families.vue
+1 -1
View File
@@ -30,7 +30,7 @@
</div> -->
</div>
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool" :class="{'selected': disableList}" >
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
<div class="tab-box-scroll scrollable">
Step/wwwroot/src/components/tooling-magpos.vue
+8 -7
View File
@@ -20,16 +20,16 @@
</div>
</div>
<div class="list-vertical scrollable" :class="{'avoid-clicks': disableList}">
<equipment v-for="(m,k) in magpos.filter(m =>(($options.filters.localize('tooling_magpos','Manina')) + ' ' + m.positionId).toString().toLowerCase().indexOf(currentFilter) >=0)" :key="k" :code="'Magazzino' + ' ' + m.magazineId" :title="$options.filters.localize('tooling_magpos','Manina') + ' ' + m.positionId"
<equipment v-for="(m,k) in magpos.filter(m =>(($options.filters.localize('tooling_magpos','Manina')) + ' ' + m.positionId).toString().toLowerCase().indexOf(currentFilter) >=0)" :key="k" :code=" $options.filters.localize('tooling_magazine','Magazzino') + ' ' + m.magazineId" :title="$options.filters.localize('tooling_magpos','Manina') + ' ' + m.positionId"
:class="{selected: selectedTool && selectedTool.positionId == m.positionId && selectedTool.magazineId == m.magazineId }"
:img-source="'../assets/images/list-mag-pos.PNG'"
@click="selectTool(m)"></equipment>
</div>
</div>
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool" :class="{'selected': disableList}" >
<!-- <button class="btn"><i class="fa fa-trash"></i></button> -->
<div class="box-right-label-header">{{'tooling_magpos_boxright_header_modify' | localize("Modifica della Manina")}} {{selectedTool.id}} {{'tooling_magpos_boxright_header_modify_mag' | localize("nel Magazzino")}} {{selectedTool.magazineId}}</div>
<div class="box-right-label-header">{{'tooling_magpos_editlabel' | localize("Modifica della Manina %d nel magazzino %d",selectedTool.positionId,selectedTool.magazineId)}}</div>
<div class="list-skill-magpos scrollable">
<div class="list-skill-magpos-category" :class="{'avoid-clicks': !disableList}">
<div class="skill-magpos-category">{{'tooling_magpos_list_category_general' | localize("Generali")}}</div>
@@ -37,15 +37,16 @@
v-if="m.name != ''"
v-model="selectedTool[m.name]"
:read-only="m.readOnly"
:title="m.name | localize(m.name)" :type="m.type">
:title="'tooling_equipment_param_magpos_' + m.name | localize(m.name)"
:type="m.type">
<option v-for="s in m.selectValues" :key="s" :value="s">{{s}}</option>
</input-box>
</div>
</div>
<div class="tooling-magpos-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_magpos_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel('/tooling')">{{'tooling_magpos_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="modifyMagPos(selectedTool)">{{'tooling_magpos_button_save' | localize("Salva")}}</button>
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel('/tooling')">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="modifyMagPos(selectedTool)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
</div>
</div>
</div>
Step/wwwroot/src/components/tooling-shanks.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<!-- Decidere come gestire le diverse macchine -->
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool" :class="{'selected': disableList}" >
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">{{'tooling_parameters_tab' | localize("Parametri")}}</button>
<div class="tab-box-scroll scrollable">