diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config index 23ffa1e..a2a2543 100644 --- a/GPW_Smart/Web.config +++ b/GPW_Smart/Web.config @@ -411,7 +411,7 @@ - + @@ -421,6 +421,10 @@ + + + + diff --git a/GPW_Smart/WebUserControls/cmp_footer.ascx b/GPW_Smart/WebUserControls/cmp_footer.ascx index 663c342..226aca8 100644 --- a/GPW_Smart/WebUserControls/cmp_footer.ascx +++ b/GPW_Smart/WebUserControls/cmp_footer.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_footer" %> - + Timbra Progetti diff --git a/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs b/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs index e110098..b459caa 100644 --- a/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs @@ -1,50 +1,52 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace GPW_Smart.WebUserControls { - - - public partial class cmp_footer { - +namespace GPW_Smart.WebUserControls +{ + + + public partial class cmp_footer + { + /// - /// Controllo btnTimbra. + /// btnTimbra control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink btnTimbra; - + /// - /// Controllo btnProgetti. + /// btnProgetti control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink btnProgetti; - + /// - /// Controllo btnAdmin. + /// btnAdmin control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink btnAdmin; - + /// - /// Controllo Timer1. + /// Timer1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.Timer Timer1; } diff --git a/GPW_Smart/WebUserControls/cmp_info.ascx b/GPW_Smart/WebUserControls/cmp_info.ascx index d80c604..160f9d3 100644 --- a/GPW_Smart/WebUserControls/cmp_info.ascx +++ b/GPW_Smart/WebUserControls/cmp_info.ascx @@ -86,7 +86,7 @@ diff --git a/GPW_Smart/WebUserControls/cmp_menuTop.ascx b/GPW_Smart/WebUserControls/cmp_menuTop.ascx index cda85cc..9364df8 100644 --- a/GPW_Smart/WebUserControls/cmp_menuTop.ascx +++ b/GPW_Smart/WebUserControls/cmp_menuTop.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_menuTop" %> - + diff --git a/GPW_Smart/WebUserControls/cmp_menuTop.ascx.designer.cs b/GPW_Smart/WebUserControls/cmp_menuTop.ascx.designer.cs index 2fa65eb..df18791 100644 --- a/GPW_Smart/WebUserControls/cmp_menuTop.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/cmp_menuTop.ascx.designer.cs @@ -1,68 +1,70 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace GPW_Smart.WebUserControls { - - - public partial class cmp_menuTop { - +namespace GPW_Smart.WebUserControls +{ + + + public partial class cmp_menuTop + { + /// - /// Controllo lblSwData. + /// lblSwData control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblSwData; - + /// - /// Controllo ulLinks. + /// ulLinks control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulLinks; - + /// - /// Controllo divSearch. + /// divSearch control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch; - + /// - /// Controllo txtSearch. + /// txtSearch control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtSearch; - + /// - /// Controllo lbtSearch. + /// lbtSearch control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtSearch; - + /// - /// Controllo updProgress. + /// updProgress control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdateProgress updProgress; } diff --git a/GPW_Smart/WebUserControls/cmp_params.ascx b/GPW_Smart/WebUserControls/cmp_params.ascx index fd5a728..16e63e5 100644 --- a/GPW_Smart/WebUserControls/cmp_params.ascx +++ b/GPW_Smart/WebUserControls/cmp_params.ascx @@ -24,7 +24,7 @@ - + @@ -68,7 +68,7 @@ - Salva + Salva diff --git a/GPW_Smart/WebUserControls/cmp_rilTemp.ascx b/GPW_Smart/WebUserControls/cmp_rilTemp.ascx index 537e871..ac1af72 100644 --- a/GPW_Smart/WebUserControls/cmp_rilTemp.ascx +++ b/GPW_Smart/WebUserControls/cmp_rilTemp.ascx @@ -12,9 +12,9 @@ - Cancel + Cancel - Save + Save diff --git a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx index 401107a..a8c0876 100644 --- a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx +++ b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx @@ -35,14 +35,14 @@ - - + + - + - - + + @@ -75,11 +75,11 @@ - - + + - - + + @@ -113,11 +113,11 @@ - - + + - - + + diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx b/GPW_Smart/WebUserControls/mod_commAttivita.ascx index 2f16773..c758619 100644 --- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx +++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx @@ -1,13 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commAttivita.ascx.cs" Inherits="GPW.WebUserControls.mod_commAttivita" %> - + - Aggiungi + Aggiungi - + @@ -33,7 +33,7 @@ - + diff --git a/GPW_Smart/WebUserControls/mod_enrollByAuthKey.ascx b/GPW_Smart/WebUserControls/mod_enrollByAuthKey.ascx index e1b5251..f0071c5 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByAuthKey.ascx +++ b/GPW_Smart/WebUserControls/mod_enrollByAuthKey.ascx @@ -24,10 +24,10 @@ - + - + diff --git a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx index fa56d1a..6499273 100644 --- a/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx +++ b/GPW_Smart/WebUserControls/mod_enrollByEmail.ascx @@ -14,10 +14,10 @@ - + - + diff --git a/GPW_Smart/WebUserControls/mod_mancTimb.ascx b/GPW_Smart/WebUserControls/mod_mancTimb.ascx index b4e1c25..645ba1f 100644 --- a/GPW_Smart/WebUserControls/mod_mancTimb.ascx +++ b/GPW_Smart/WebUserControls/mod_mancTimb.ascx @@ -21,10 +21,10 @@ - Richiesta + Richiesta - Timbrature + Timbrature @@ -37,7 +37,7 @@ - OK + OK @@ -62,7 +62,7 @@ - NO + NO diff --git a/GPW_Smart/WebUserControls/mod_regNewDevice.ascx b/GPW_Smart/WebUserControls/mod_regNewDevice.ascx index 6501d89..edddafc 100644 --- a/GPW_Smart/WebUserControls/mod_regNewDevice.ascx +++ b/GPW_Smart/WebUserControls/mod_regNewDevice.ascx @@ -5,34 +5,31 @@ TagPrefix="uc2" %> <%@ Register Src="mod_enrollByEmail.ascx" TagName="mod_enrollByEmail" TagPrefix="uc3" %> - - - - - + + + + Registrazione Con AuthKey Personale - - - - + + + + - - - - Recupera AuthKey via e-mail - - - - + + + + Recupera AuthKey via e-mail + + + + - - - + \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/mod_resetUserAuthKey.ascx b/GPW_Smart/WebUserControls/mod_resetUserAuthKey.ascx index 5c79303..e031110 100644 --- a/GPW_Smart/WebUserControls/mod_resetUserAuthKey.ascx +++ b/GPW_Smart/WebUserControls/mod_resetUserAuthKey.ascx @@ -30,10 +30,10 @@ - Salva + Salva - Annulla + Annulla diff --git a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx index 1c5e2a2..6fbf9f3 100644 --- a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx +++ b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx @@ -14,10 +14,10 @@ - + - + diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx b/GPW_Smart/WebUserControls/mod_timbrature.ascx index cc06985..fd7ad65 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx @@ -1,10 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_timbrature.ascx.cs" Inherits="GPW.WebUserControls.mod_timbrature" %> - Entrata + Entrata - Uscita + Uscita diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs index 48dcc79..0ae3310 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs @@ -36,8 +36,8 @@ namespace GPW.WebUserControls { lbtEntrata.Enabled = showIn; lbtUscita.Enabled = showOut; - lbtEntrata.CssClass = showIn ? "btn btn-primary btn-block" : "btn btn-outline-primary disabled btn-block"; - lbtUscita.CssClass = showOut ? "btn btn-success btn-block" : "btn btn-outline-success disabled btn-block"; + lbtEntrata.CssClass = showIn ? "btn btn-primary w-100" : "btn btn-outline-primary disabled w-100"; + lbtUscita.CssClass = showOut ? "btn btn-success w-100" : "btn btn-outline-success disabled w-100"; } private void fixFont()