From 3f8310b09ca66e70e028b5166274fb7afafb13be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:20:07 +0200 Subject: [PATCH 01/15] fix css content --- GPW_Admin/Content/Site.css | 6 ++---- GPW_Admin/Content/Site.less | 6 ++---- GPW_Admin/Content/Style.css | 1 + GPW_Admin/Content/font.css | 24 ++++++++++++++++++++++++ GPW_Admin/Content/font.less | 24 ++++++++++++------------ GPW_Admin/Content/font.min.css | 1 + 6 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 GPW_Admin/Content/font.css create mode 100644 GPW_Admin/Content/font.min.css diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index 84bc566..4768ba7 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -1,15 +1,13 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - /*padding-top: 50px; - padding-bottom: 20px;*/ font: 'Roboto', sans-serif; + /*font: 'Open Sans', sans-serif;*/ } /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - /*padding-left: 15px; - padding-right: 15px;*/ font: 'Roboto', sans-serif; + /*font: 'Open Sans', sans-serif;*/ } .textCondens { font-family: 'Roboto Condensed', sans-serif; diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index 0080181..7bc8b23 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -1,16 +1,14 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - /*padding-top: 50px; - padding-bottom: 20px;*/ font: 'Roboto', sans-serif; + /*font: 'Open Sans', sans-serif;*/ } /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - /*padding-left: 15px; - padding-right: 15px;*/ font: 'Roboto', sans-serif; + /*font: 'Open Sans', sans-serif;*/ } .textCondens { diff --git a/GPW_Admin/Content/Style.css b/GPW_Admin/Content/Style.css index 19078b1..310c558 100644 --- a/GPW_Admin/Content/Style.css +++ b/GPW_Admin/Content/Style.css @@ -3,6 +3,7 @@ @import url('ExtraComp.css'); @import url('BtnReport.css'); @import url('JQClock.css'); +@import url('../font.css'); * { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; diff --git a/GPW_Admin/Content/font.css b/GPW_Admin/Content/font.css new file mode 100644 index 0000000..77b5c23 --- /dev/null +++ b/GPW_Admin/Content/font.css @@ -0,0 +1,24 @@ +@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 diff --git a/GPW_Admin/Content/font.less b/GPW_Admin/Content/font.less index cc6208e..59d1297 100644 --- a/GPW_Admin/Content/font.less +++ b/GPW_Admin/Content/font.less @@ -1,4 +1,4 @@ -/*@font-face { +@font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; @@ -10,18 +10,18 @@ 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'); + 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 diff --git a/GPW_Admin/Content/font.min.css b/GPW_Admin/Content/font.min.css new file mode 100644 index 0000000..8b10746 --- /dev/null +++ b/GPW_Admin/Content/font.min.css @@ -0,0 +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 From e8a9dc4d99e786b78e59f98c4f10a69ecfa94d1f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:20:18 +0200 Subject: [PATCH 02/15] refresh master admin --- GPW_Admin/WebMasterPages/AjaxSearch.master | 1 + .../AjaxSearch.master.designer.cs | 150 +++++++------ GPW_Admin/WebMasterPages/AjaxSimple.master | 73 +++---- .../WebMasterPages/AjaxSimpleFull.Master | 122 +++++------ .../AjaxSimpleFull.Master.designer.cs | 109 +++++----- GPW_Admin/WebMasterPages/AjaxTitle.master | 201 +++++++++--------- .../AjaxTitle.master.designer.cs | 142 +++++++------ GPW_Admin/WebMasterPages/BMP.Master | 5 +- .../WebMasterPages/BMP.Master.designer.cs | 67 +++--- GPW_Admin/WebMasterPages/MasterAjax.master | 126 +++++------ .../MasterAjax.master.designer.cs | 126 ++++++----- 11 files changed, 586 insertions(+), 536 deletions(-) diff --git a/GPW_Admin/WebMasterPages/AjaxSearch.master b/GPW_Admin/WebMasterPages/AjaxSearch.master index a12ddf1..df74574 100644 --- a/GPW_Admin/WebMasterPages/AjaxSearch.master +++ b/GPW_Admin/WebMasterPages/AjaxSearch.master @@ -20,6 +20,7 @@ + diff --git a/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs b/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs index e203300..9895712 100644 --- a/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs +++ b/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs @@ -1,157 +1,167 @@ //------------------------------------------------------------------------------ -// -// 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. +// //------------------------------------------------------------------------------ -public partial class AjaxSearch { - +public partial class AjaxSearch +{ + /// - /// Controllo Head1. + /// Head1 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.HtmlHead Head1; - + /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - + /// - /// Controllo BundleReference1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - + /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 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.PlaceHolder PlaceHolder1; - + /// - /// Controllo form1. + /// form1 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.HtmlForm form1; - + /// - /// Controllo sm. + /// sm 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.ScriptManager sm; - + /// - /// Controllo upTop. + /// upTop 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.UpdatePanel upTop; - + /// - /// Controllo Mod_menuTop1. + /// Mod_menuTop1 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::mod_menuTop Mod_menuTop1; - + /// - /// Controllo upSx. + /// upSx 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.UpdatePanel upSx; - + /// - /// Controllo Mod_menuSx1. + /// Mod_menuSx1 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::mod_menuSx Mod_menuSx1; - + /// - /// Controllo upPagina. + /// upPagina 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.UpdatePanel upPagina; - + /// - /// Controllo Mod_pageTitleAndSearch1. + /// Mod_pageTitleAndSearch1 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::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; - + /// - /// Controllo Mod_ricercaGenerica1. + /// Mod_ricercaGenerica1 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::mod_ricercaGenerica Mod_ricercaGenerica1; - + /// - /// Controllo mod_pageSize1. + /// mod_pageSize1 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::GPW_Admin.WebUserControls.mod_pageSize mod_pageSize1; - + /// - /// Controllo cph1. + /// cph1 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.ContentPlaceHolder cph1; - + /// - /// Controllo Mod_menuBottom1. + /// Mod_menuBottom1 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::mod_menuBottom Mod_menuBottom1; } diff --git a/GPW_Admin/WebMasterPages/AjaxSimple.master b/GPW_Admin/WebMasterPages/AjaxSimple.master index f897ac5..2e90b88 100644 --- a/GPW_Admin/WebMasterPages/AjaxSimple.master +++ b/GPW_Admin/WebMasterPages/AjaxSimple.master @@ -6,45 +6,46 @@ - - - <%: Page.Title %> - GPW - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + <%: Page.Title %> - GPW + + <%: Scripts.Render("~/bundles/modernizr") %> + - - + + + - - - + + + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + <%--DA VERIFICARE QUESTI in inclusione...--%> + + -
- - -
- - - - - - - -
-
- - -
-
- -
-
-
+
+ + +
+ + + + + + + +
+
+ + +
+
+ +
+
+
- + \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master index a1e3f0f..b8f565c 100644 --- a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master @@ -6,75 +6,75 @@ - - - GPW-ADM - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + GPW-ADM + + <%: Scripts.Render("~/bundles/modernizr") %> + - - + + + - - - + + + - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + + <%--DA VERIFICARE QUESTI in inclusione...--%> + + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + + -
- - -
+ + + +
-
- - - - - - -
-
- - - - - -
-
- +
+ + + + + + +
+
+ + + + + +
+
+ - + \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master.designer.cs b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master.designer.cs index 7fa847a..a1edfb2 100644 --- a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master.designer.cs +++ b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master.designer.cs @@ -1,104 +1,115 @@ //------------------------------------------------------------------------------ -// -// 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_Admin.WebMasterPages { - - - public partial class AjaxSimpleFull { - +namespace GPW_Admin.WebMasterPages +{ + + + public partial class AjaxSimpleFull + { + /// - /// Controllo Head1. + /// Head1 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.HtmlHead Head1; - + /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - + /// - /// Controllo BundleReference1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - + /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 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.PlaceHolder PlaceHolder1; - + /// - /// Controllo form1. + /// form1 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.HtmlForm form1; - + /// - /// Controllo sm. + /// sm 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.ScriptManager sm; - + /// - /// Controllo upMain. + /// upMain 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.UpdatePanel upMain; - + /// - /// Controllo cph1. + /// cph1 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.ContentPlaceHolder cph1; - + /// - /// Controllo upBott. + /// upBott 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.UpdatePanel upBott; - + /// - /// Controllo mod_menuBottomFullpage1. + /// mod_menuBottomFullpage1 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::GPW_Admin.WebUserControls.mod_menuBottomFullpage mod_menuBottomFullpage1; } diff --git a/GPW_Admin/WebMasterPages/AjaxTitle.master b/GPW_Admin/WebMasterPages/AjaxTitle.master index aefa21f..5ae8676 100644 --- a/GPW_Admin/WebMasterPages/AjaxTitle.master +++ b/GPW_Admin/WebMasterPages/AjaxTitle.master @@ -7,117 +7,116 @@ <%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %> <%@ Register Src="~/WebUserControls/mod_pageSize.ascx" TagName="mod_pageSize" TagPrefix="uc6" %> - - - - GPW-ADM - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + GPW-ADM + + <%: Scripts.Render("~/bundles/modernizr") %> + - - + + + - - - + + + - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + + <%--DA VERIFICARE QUESTI in inclusione...--%> + + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + + -
- - -
- - - - - - - - - - - -
-
- - - - - -
-
- - - - - - -
- - -
- - - - - - - - -
- - -
- -
-
- - -
-
- - -
-
- -
-
-
+
+ + +
+ + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+
+
- + \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/AjaxTitle.master.designer.cs b/GPW_Admin/WebMasterPages/AjaxTitle.master.designer.cs index 639fc0e..ac8e3eb 100644 --- a/GPW_Admin/WebMasterPages/AjaxTitle.master.designer.cs +++ b/GPW_Admin/WebMasterPages/AjaxTitle.master.designer.cs @@ -1,148 +1,158 @@ //------------------------------------------------------------------------------ -// -// 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. +// //------------------------------------------------------------------------------ -public partial class AjaxTitle { - +public partial class AjaxTitle +{ + /// - /// Controllo Head1. + /// Head1 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.HtmlHead Head1; - + /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - + /// - /// Controllo BundleReference1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - + /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 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.PlaceHolder PlaceHolder1; - + /// - /// Controllo form1. + /// form1 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.HtmlForm form1; - + /// - /// Controllo sm. + /// sm 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.ScriptManager sm; - + /// - /// Controllo upTop. + /// upTop 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.UpdatePanel upTop; - + /// - /// Controllo Mod_menuTop1. + /// Mod_menuTop1 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::mod_menuTop Mod_menuTop1; - + /// - /// Controllo upSx. + /// upSx 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.UpdatePanel upSx; - + /// - /// Controllo Mod_menuSx1. + /// Mod_menuSx1 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::mod_menuSx Mod_menuSx1; - + /// - /// Controllo upMain. + /// upMain 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.UpdatePanel upMain; - + /// - /// Controllo Mod_pageTitleAndSearch1. + /// Mod_pageTitleAndSearch1 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::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; - + /// - /// Controllo mod_pageSize1. + /// mod_pageSize1 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::GPW_Admin.WebUserControls.mod_pageSize mod_pageSize1; - + /// - /// Controllo cph1. + /// cph1 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.ContentPlaceHolder cph1; - + /// - /// Controllo Mod_menuBottom1. + /// Mod_menuBottom1 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::mod_menuBottom Mod_menuBottom1; } diff --git a/GPW_Admin/WebMasterPages/BMP.Master b/GPW_Admin/WebMasterPages/BMP.Master index f81974c..6deed63 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master +++ b/GPW_Admin/WebMasterPages/BMP.Master @@ -14,8 +14,6 @@ - - GPW <%: Page.Title %> @@ -23,6 +21,7 @@ + @@ -66,7 +65,7 @@
-
+
diff --git a/GPW_Admin/WebMasterPages/BMP.Master.designer.cs b/GPW_Admin/WebMasterPages/BMP.Master.designer.cs index f01d61c..36876a9 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master.designer.cs +++ b/GPW_Admin/WebMasterPages/BMP.Master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Admin.WebMasterPages @@ -15,74 +15,83 @@ namespace GPW_Admin.WebMasterPages { /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// Controllo BundleReference1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 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.PlaceHolder PlaceHolder1; /// - /// Controllo sm. + /// sm 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.ScriptManager sm; /// - /// Controllo cmp_menuTop. + /// cmp_menuTop 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::GPW_Admin.WebUserControls.cmp_menuTop cmp_menuTop; /// - /// Controllo uplBody. + /// uplBody 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.UpdatePanel uplBody; /// - /// Controllo cph1. + /// cph1 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.ContentPlaceHolder cph1; /// - /// Controllo cmp_footer. + /// cmp_footer 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::GPW_Admin.WebUserControls.cmp_footer cmp_footer; } diff --git a/GPW_Admin/WebMasterPages/MasterAjax.master b/GPW_Admin/WebMasterPages/MasterAjax.master index 126e9bd..5e6ac79 100644 --- a/GPW_Admin/WebMasterPages/MasterAjax.master +++ b/GPW_Admin/WebMasterPages/MasterAjax.master @@ -9,73 +9,73 @@ - - - GPW - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + GPW + + <%: Scripts.Render("~/bundles/modernizr") %> + - - + + + - - - + + + - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - - - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + + <%--DA VERIFICARE QUESTI in inclusione...--%> + + -
- -
- - - - - - - - - - - -
-
- - - - - -
-
- - - - - - -
- - - - - - -
-
- -
-
-
+
+ +
+ + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + + + + + +
+
+ +
+
+
- + \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/MasterAjax.master.designer.cs b/GPW_Admin/WebMasterPages/MasterAjax.master.designer.cs index 814ff78..86fb183 100644 --- a/GPW_Admin/WebMasterPages/MasterAjax.master.designer.cs +++ b/GPW_Admin/WebMasterPages/MasterAjax.master.designer.cs @@ -1,130 +1,140 @@ //------------------------------------------------------------------------------ -// -// 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. +// //------------------------------------------------------------------------------ -public partial class MasterAjax { - +public partial class MasterAjax +{ + /// - /// Controllo Head1. + /// Head1 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.HtmlHead Head1; - + /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - + /// - /// Controllo BundleReference1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - + /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 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.PlaceHolder PlaceHolder1; - + /// - /// Controllo form1. + /// form1 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.HtmlForm form1; - + /// - /// Controllo sm. + /// sm 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.ScriptManager sm; - + /// - /// Controllo upTop. + /// upTop 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.UpdatePanel upTop; - + /// - /// Controllo Mod_menuTop1. + /// Mod_menuTop1 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::mod_menuTop Mod_menuTop1; - + /// - /// Controllo upSx. + /// upSx 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.UpdatePanel upSx; - + /// - /// Controllo Mod_menuSx1. + /// Mod_menuSx1 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::mod_menuSx Mod_menuSx1; - + /// - /// Controllo updPanelPagina. + /// updPanelPagina 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.UpdatePanel updPanelPagina; - + /// - /// Controllo cph1. + /// cph1 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.ContentPlaceHolder cph1; - + /// - /// Controllo Mod_menuBottom1. + /// Mod_menuBottom1 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::mod_menuBottom Mod_menuBottom1; } From 251c73ca36d456952a678164f228ebf61334f17e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:20:43 +0200 Subject: [PATCH 03/15] refresh bundle css --- GPW_Admin/Bundle.config | 6 +++-- GPW_Admin/Test2.aspx | 5 ++-- GPW_Admin/Test2.aspx.designer.cs | 43 +++++++++++++++++++------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/GPW_Admin/Bundle.config b/GPW_Admin/Bundle.config index b9d5bc6..0b2707d 100644 --- a/GPW_Admin/Bundle.config +++ b/GPW_Admin/Bundle.config @@ -1,10 +1,12 @@  + + + + - - diff --git a/GPW_Admin/Test2.aspx b/GPW_Admin/Test2.aspx index 123230d..9887833 100644 --- a/GPW_Admin/Test2.aspx +++ b/GPW_Admin/Test2.aspx @@ -11,7 +11,8 @@ - + + @@ -185,4 +186,4 @@
- + \ No newline at end of file diff --git a/GPW_Admin/Test2.aspx.designer.cs b/GPW_Admin/Test2.aspx.designer.cs index d1215ec..893afaa 100644 --- a/GPW_Admin/Test2.aspx.designer.cs +++ b/GPW_Admin/Test2.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Admin @@ -15,38 +15,47 @@ namespace GPW_Admin { /// - /// Controllo BundleReference2. + /// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// Controllo BundleReference1. + /// BundleReference1 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// Controllo PlaceHolder1. + /// BundleReference3 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// PlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; /// - /// Controllo form1. + /// form1 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.HtmlForm form1; } From d211ea76f317c6e463e8298b94c8d92528ba0cdc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:21:28 +0200 Subject: [PATCH 04/15] Fix controllo lic x progetti --- .../WebUserControls/mod_adminProgetti.ascx | 4 +- .../WebUserControls/mod_adminProgetti.ascx.cs | 38 +------- .../mod_adminProgetti.ascx.designer.cs | 88 +++++++++---------- 3 files changed, 50 insertions(+), 80 deletions(-) diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx index 563c6f4..0bee790 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx @@ -51,8 +51,8 @@ - - + + diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs index b6232ed..7aaf45c 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs @@ -66,18 +66,8 @@ namespace GPW_Admin.WebUserControls #endregion Public Properties } - public partial class mod_adminProgetti : System.Web.UI.UserControl + public partial class mod_adminProgetti : BaseUserControl { - #region Public Events - - public event EventHandler eh_nuovoValore; - - public event EventHandler eh_resetSelezione; - - public event EventHandler eh_selValore; - - #endregion Public Events - #region Protected Properties /// @@ -121,17 +111,6 @@ namespace GPW_Admin.WebUserControls /// public string _paginaCorrente { get; set; } - /// - /// controllo stato licenze! - /// - public bool chkLicOk - { - get - { - return (licenzeGPW.utentiAttivi <= licenzeGPW.licenzeAttive); - } - } - /// /// determina se siano da visualizzare i progetti già chiusi /// @@ -304,10 +283,7 @@ namespace GPW_Admin.WebUserControls grView.FooterRow.Visible = true; } // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseAddNew(); } /// @@ -459,10 +435,7 @@ namespace GPW_Admin.WebUserControls { memLayer.ML.setSessionVal("idxProgetto_sel", grView.SelectedDataKey["idxProgetto"]); mod_dettaglioProgetto1.Visible = true; - if (eh_selValore != null) - { - eh_selValore(this, new EventArgs()); - } + raiseEvent(); } /// @@ -730,10 +703,7 @@ namespace GPW_Admin.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); mod_dettaglioProgetto1.Visible = false; - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } + raiseReset(); } /// diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs index 5b68e72..7f77d21 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Admin.WebUserControls @@ -15,119 +15,119 @@ namespace GPW_Admin.WebUserControls { /// - /// Controllo cmp_periodoAnalisi. + /// cmp_periodoAnalisi 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::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi; /// - /// Controllo lbtResetFilt. + /// lbtResetFilt 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 lbtResetFilt; /// - /// Controllo filtroCli. + /// filtroCli 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::mod_filtro filtroCli; /// - /// Controllo filtroGrp. + /// filtroGrp 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::mod_filtro filtroGrp; /// - /// Controllo chkShowOnlyStarred. + /// chkShowOnlyStarred 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.CheckBox chkShowOnlyStarred; /// - /// Controllo chkShowVuoti. + /// chkShowVuoti 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.CheckBox chkShowVuoti; /// - /// Controllo chkShowChiusi. + /// chkShowChiusi 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.CheckBox chkShowChiusi; /// - /// Controllo grView. + /// grView 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.GridView grView; /// - /// Controllo ods. + /// ods 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.ObjectDataSource ods; /// - /// Controllo lblNumRec. + /// lblNumRec 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 lblNumRec; /// - /// Controllo odsClienti. + /// odsClienti 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.ObjectDataSource odsClienti; /// - /// Controllo odsGruppi. + /// odsGruppi 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.ObjectDataSource odsGruppi; /// - /// Controllo mod_dettaglioProgetto1. + /// mod_dettaglioProgetto1 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::GPW_Admin.WebUserControls.mod_dettaglioProgetto mod_dettaglioProgetto1; } From 65e8d963ef1bf81f4792549f927903bd24b7d999 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:21:37 +0200 Subject: [PATCH 05/15] fix controllo licenze x clienti --- .../WebUserControls/mod_adminClienti.ascx | 94 +++++++++---------- .../WebUserControls/mod_adminClienti.ascx.cs | 45 +-------- .../mod_adminClienti.ascx.designer.cs | 40 ++++---- 3 files changed, 67 insertions(+), 112 deletions(-) diff --git a/GPW_Admin/WebUserControls/mod_adminClienti.ascx b/GPW_Admin/WebUserControls/mod_adminClienti.ascx index 4fda3d0..b906a9b 100644 --- a/GPW_Admin/WebUserControls/mod_adminClienti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminClienti.ascx @@ -24,8 +24,8 @@ - - + <%----%> + @@ -53,60 +53,54 @@ - - - - - - - - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
- +
+
+ +
+
+ +
+
+ +
+
+ +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/GPW_Admin/WebUserControls/mod_adminClienti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminClienti.ascx.cs index 60df85c..a06da8d 100644 --- a/GPW_Admin/WebUserControls/mod_adminClienti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminClienti.ascx.cs @@ -10,31 +10,8 @@ using GPW_data; namespace GPW_Admin.WebUserControls { - public partial class mod_adminClienti : System.Web.UI.UserControl + public partial class mod_adminClienti : BaseUserControl { - #region Public Events - - public event EventHandler eh_nuovoValore; - - public event EventHandler eh_resetSelezione; - - #endregion Public Events - - #region Public Properties - - /// - /// controllo stato licenze! - /// - public bool chkLicOk - { - get - { - return (licenzeGPW.checkLicenze); - } - } - - #endregion Public Properties - #region Private Methods private void Cmp_toggle_ehToggle(object sender, EventArgs e) @@ -62,10 +39,7 @@ namespace GPW_Admin.WebUserControls grView.FooterRow.Visible = true; } // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseAddNew(); } /// @@ -282,20 +256,7 @@ namespace GPW_Admin.WebUserControls { grView.SelectedIndex = -1; grView.DataBind(); - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - - /// - /// effettua traduzione del lemma - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); + raiseReset(); } #endregion Public Methods diff --git a/GPW_Admin/WebUserControls/mod_adminClienti.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminClienti.ascx.designer.cs index f2b2de2..0df39de 100644 --- a/GPW_Admin/WebUserControls/mod_adminClienti.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_adminClienti.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Admin.WebUserControls @@ -15,47 +15,47 @@ namespace GPW_Admin.WebUserControls { /// - /// Controllo cmp_toggle. + /// cmp_toggle 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::GPW_Admin.WebUserControls.cmp_toggle cmp_toggle; /// - /// Controllo hfShowAll. + /// hfShowAll 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.HiddenField hfShowAll; /// - /// Controllo grView. + /// grView 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.GridView grView; /// - /// Controllo ods. + /// ods 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.ObjectDataSource ods; /// - /// Controllo lblNumRec. + /// lblNumRec 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 lblNumRec; } From 462b0ba683c956883760a6a0bf1e0c0b865079b8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:21:52 +0200 Subject: [PATCH 06/15] refresh bundle --- .../WebUserControls/mod_autocomplete.ascx | 24 ++++++------ .../mod_autocomplete.ascx.designer.cs | 37 ++++++++++++------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/GPW_Admin/WebUserControls/mod_autocomplete.ascx b/GPW_Admin/WebUserControls/mod_autocomplete.ascx index 14de10e..3abf410 100644 --- a/GPW_Admin/WebUserControls/mod_autocomplete.ascx +++ b/GPW_Admin/WebUserControls/mod_autocomplete.ascx @@ -1,8 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_autocomplete" %> <%if (false) - { %> - - + { %> + + + <%} %>