diff --git a/DotfuscatorGpwAdm.xml b/DotfuscatorGpwAdm.xml index cf6cf0b..2dcc7e8 100644 --- a/DotfuscatorGpwAdm.xml +++ b/DotfuscatorGpwAdm.xml @@ -26,13 +26,6 @@ - - - - - - - diff --git a/GPW_Admin/Bundle.config b/GPW_Admin/Bundle.config index 0b2707d..f386970 100644 --- a/GPW_Admin/Bundle.config +++ b/GPW_Admin/Bundle.config @@ -1,15 +1,15 @@  - - - - - - - - + + + + + + + + - - - + + + \ No newline at end of file diff --git a/GPW_Admin/Content/Roboto.woff2 b/GPW_Admin/Content/Roboto.woff2 index de83f9c..ebe1795 100644 Binary files a/GPW_Admin/Content/Roboto.woff2 and b/GPW_Admin/Content/Roboto.woff2 differ diff --git a/GPW_Admin/Content/RobotoCondensed.woff2 b/GPW_Admin/Content/RobotoCondensed.woff2 index d7ab7af..bcbfde7 100644 Binary files a/GPW_Admin/Content/RobotoCondensed.woff2 and b/GPW_Admin/Content/RobotoCondensed.woff2 differ diff --git a/GPW_Admin/Content/RobotoCondensedExt.woff2 b/GPW_Admin/Content/RobotoCondensedExt.woff2 new file mode 100644 index 0000000..d7ab7af Binary files /dev/null and b/GPW_Admin/Content/RobotoCondensedExt.woff2 differ diff --git a/GPW_Admin/Content/RobotoExt.woff2 b/GPW_Admin/Content/RobotoExt.woff2 new file mode 100644 index 0000000..e2f7d27 Binary files /dev/null and b/GPW_Admin/Content/RobotoExt.woff2 differ diff --git a/GPW_Admin/Content/font.css b/GPW_Admin/Content/font.css index 77b5c23..37d2183 100644 --- a/GPW_Admin/Content/font.css +++ b/GPW_Admin/Content/font.css @@ -2,23 +2,33 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; + font-display: swap; src: url('OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; src: url('OpenSansCondensed.woff') format('woff'); } +/* latin */ @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; + font-display: swap; + /*src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');*/ src: url('Roboto.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } +/* latin */ @font-face { font-family: 'Roboto Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; + /*src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2');*/ src: url('RobotoCondensed.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } \ No newline at end of file diff --git a/GPW_Admin/Content/font.less b/GPW_Admin/Content/font.less index 59d1297..7b6b419 100644 --- a/GPW_Admin/Content/font.less +++ b/GPW_Admin/Content/font.less @@ -2,26 +2,36 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; + font-display: swap; src: url('OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; src: url('OpenSansCondensed.woff') format('woff'); } +/* latin */ @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; + font-display: swap; + /*src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');*/ src: url('Roboto.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } +/* latin */ @font-face { font-family: 'Roboto Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; + /*src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2');*/ src: url('RobotoCondensed.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } \ No newline at end of file diff --git a/GPW_Admin/Content/font.min.css b/GPW_Admin/Content/font.min.css index 8b10746..e242053 100644 --- a/GPW_Admin/Content/font.min.css +++ b/GPW_Admin/Content/font.min.css @@ -1 +1 @@ -@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');} \ No newline at end of file +@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-display:swap;src:url('Roboto.woff2') format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;font-display:swap;src:url('RobotoCondensed.woff2') format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;} \ No newline at end of file diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 23a1b76..3dee88a 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -557,6 +557,8 @@ + + diff --git a/GPW_Admin/GPW_Admin.csproj.user b/GPW_Admin/GPW_Admin.csproj.user index 0651eec..be26fb0 100644 --- a/GPW_Admin/GPW_Admin.csproj.user +++ b/GPW_Admin/GPW_Admin.csproj.user @@ -7,7 +7,7 @@ false ShowAllFiles IIS02 - Release|Any CPU + Debug|Any CPU diff --git a/GPW_Admin/Web.config b/GPW_Admin/Web.config index 0bf10c7..0ac5495 100644 --- a/GPW_Admin/Web.config +++ b/GPW_Admin/Web.config @@ -77,14 +77,14 @@ + + + + + + + + --> @@ -418,14 +418,14 @@ - - - - - - + + + + + + diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx b/GPW_Admin/WebUserControls/cmp_userCard.ascx index 79a3181..e439a9b 100644 --- a/GPW_Admin/WebUserControls/cmp_userCard.ascx +++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx @@ -1,29 +1,34 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_userCard.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_userCard" %> -
+
-
-
-
+
+
+
-
+
-
+
+ <%# Eval("Cognome") %> +
+
+ <%# Eval("Nome") %> +
+
+
+
- +
@@ -183,19 +183,25 @@
- -
-
- -
-
- +
+
+ +
+ + + +
- - +
+
+ +
+ + +
@@ -248,20 +254,6 @@ -
-
- - assunzione - -
-
-
-
- - cessazione - -
-
@@ -272,8 +264,8 @@ - - + + diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs index 0410636..81fb017 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs @@ -94,7 +94,7 @@ namespace GPW_Admin.WebUserControls grView.FooterRow.Visible = true; } // sollevo evento nuovo valore... - raiseAddNew(); + //raiseAddNew(); } /// diff --git a/GPW_Barcode/GPW_Barcode.csproj.user b/GPW_Barcode/GPW_Barcode.csproj.user index 90c91e2..1d042f5 100644 --- a/GPW_Barcode/GPW_Barcode.csproj.user +++ b/GPW_Barcode/GPW_Barcode.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0f25778..1867bc1 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Commesse/GPW_Commesse.csproj.user b/GPW_Commesse/GPW_Commesse.csproj.user index bbb288f..ed8f186 100644 --- a/GPW_Commesse/GPW_Commesse.csproj.user +++ b/GPW_Commesse/GPW_Commesse.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU ApiControllerEmptyScaffolder root/Controller 600 diff --git a/GPW_Smart/GPW_Smart.csproj.user b/GPW_Smart/GPW_Smart.csproj.user index b4a663f..253827e 100644 --- a/GPW_Smart/GPW_Smart.csproj.user +++ b/GPW_Smart/GPW_Smart.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU diff --git a/HOME/HOME.csproj.user b/HOME/HOME.csproj.user index d064648..5f46b5e 100644 --- a/HOME/HOME.csproj.user +++ b/HOME/HOME.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU