From e8a9dc4d99e786b78e59f98c4f10a69ecfa94d1f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Oct 2021 09:20:18 +0200 Subject: [PATCH] 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; }