Merge remote-tracking branch 'teamdev/develop' into develop

Thermo.Active/wwwroot/assets/styles/base/footer.less

@@ -126,7 +126,10 @@ footer {
           background-image: url(../icons/png/SCADA-big.png);
           background-size: cover;
         }
-
+        button.ricetta{
+          background-image: url(../icons/png/gestione-programmi-BIG.png);
+          background-size: cover;
+        }
         button.jobeditor{
           background-image: url(../icons/png/editor-BIG.png);
           background-size: cover;
@@ -135,6 +138,14 @@ footer {
           background-image: url(../icons/png/users-BIG.png);
           background-size: cover;
         }
+        button.progrprerisc{
+          background-image: url(../icons/png/programmazione.png);
+          background-size: cover;
+        }
+        button.clock{
+          background-image: url(../icons/png/dashboard.png);
+          background-size: cover;
+        }
 
         button:active{
           box-shadow: 0px 0px 1px 1px #FFF;

Thermo.Active/wwwroot/assets/styles/style.css

@@ -6760,6 +6760,10 @@ footer .container button.scada {
   background-image: url(../icons/png/SCADA-big.png);
   background-size: cover;
 }
+footer .container button.ricetta {
+  background-image: url(../icons/png/gestione-programmi-BIG.png);
+  background-size: cover;
+}
 footer .container button.jobeditor {
   background-image: url(../icons/png/editor-BIG.png);
   background-size: cover;
@@ -6768,6 +6772,14 @@ footer .container button.users {
   background-image: url(../icons/png/users-BIG.png);
   background-size: cover;
 }
+footer .container button.progrprerisc {
+  background-image: url(../icons/png/programmazione.png);
+  background-size: cover;
+}
+footer .container button.clock {
+  background-image: url(../icons/png/dashboard.png);
+  background-size: cover;
+}
 footer .container button:active {
   box-shadow: 0px 0px 1px 1px #FFF;
 }

Thermo.Active/wwwroot/src/modules/app-footer.vue

@@ -109,7 +109,7 @@
         <button @click="openProgram('/progrprerisc')" :title="'footer_tooltip_progr_prerisc' | localize('Programmazione Preriscaldo')"
               :disabled="!isAreaEnabled('progrprerisc')" v-if="isAreaVisible('progrprerisc')" class="oval progrprerisc" :class="{ big:isInPath('progrprerisc') && !state.isMainViewLiftedUp}"></button> 
         
-		<button @click="openProgram('/clock')" :title="'footer_tooltip_clock' | localize('Clock')"
+		<button @click="openProgram('/clock')" :title="'footer_tooltip_dashboard' | localize('Dashboard')"
               :disabled="!isAreaEnabled('clock')" v-if="isAreaVisible('clock')" class="oval clock" :class="{ big:isInPath('clock') && !state.isMainViewLiftedUp}"></button>
       
       <!-- <div v-if="isAreaVisible('utilities') && getUtilities().length > 0" class="divider"><i class="fa fa-circle"></i></div>