From 097c9d7a277f8c5415c2bcb689dbeefd72d8aa1f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 Sep 2023 18:54:47 +0200 Subject: [PATCH 1/5] TAB: - fix grafico pagine (layout main) - fix header/footer --- MP-TAB/Allarmi.aspx | 2 +- MP-TAB/Commenti.aspx | 2 +- MP-TAB/Controlli.aspx | 2 +- MP-TAB/DettaglioMacchina.aspx | 2 +- MP-TAB/Dichiarazioni.aspx | 2 +- MP-TAB/Fermate.aspx | 2 +- MP-TAB/IOB-info.aspx | 2 +- MP-TAB/MappaStato.aspx | 2 +- MP-TAB/MappaStato.aspx.designer.cs | 36 ++++++------ MP-TAB/ODL.aspx | 2 +- MP-TAB/PianoProd.aspx | 2 +- MP-TAB/Scarti.aspx | 2 +- MP-TAB/SendParameters.aspx | 2 +- MP-TAB/SheetTech.aspx | 2 +- MP-TAB/Turni.aspx | 2 +- MP-TAB/WebMasterPages/Bootstrap.Master | 4 +- MP-TAB/WebUserControls/mod_footer.ascx | 19 ++++--- MP-TAB/WebUserControls/mod_slideMenu.ascx | 14 +---- MP-TAB/WebUserControls/mod_title.ascx | 56 +++++++++---------- .../mod_title.ascx.designer.cs | 18 +++--- MP-TAB/fixODL.aspx | 2 +- 21 files changed, 88 insertions(+), 89 deletions(-) diff --git a/MP-TAB/Allarmi.aspx b/MP-TAB/Allarmi.aspx index b03dcf1a..27f8f70c 100644 --- a/MP-TAB/Allarmi.aspx +++ b/MP-TAB/Allarmi.aspx @@ -9,7 +9,7 @@ -
+
diff --git a/MP-TAB/Commenti.aspx b/MP-TAB/Commenti.aspx index d1be1844..cceaa386 100644 --- a/MP-TAB/Commenti.aspx +++ b/MP-TAB/Commenti.aspx @@ -8,7 +8,7 @@ <%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %> -
+
diff --git a/MP-TAB/Controlli.aspx b/MP-TAB/Controlli.aspx index b6075bc0..bed83f7c 100644 --- a/MP-TAB/Controlli.aspx +++ b/MP-TAB/Controlli.aspx @@ -8,7 +8,7 @@ -
+
diff --git a/MP-TAB/DettaglioMacchina.aspx b/MP-TAB/DettaglioMacchina.aspx index d3c7f858..8456fb52 100644 --- a/MP-TAB/DettaglioMacchina.aspx +++ b/MP-TAB/DettaglioMacchina.aspx @@ -10,7 +10,7 @@ <%@ Register Src="~/WebUserControls/cmp_goPrint.ascx" TagPrefix="uc1" TagName="cmp_goPrint" %> -
+
diff --git a/MP-TAB/Dichiarazioni.aspx b/MP-TAB/Dichiarazioni.aspx index 7afeeabd..787b6fed 100644 --- a/MP-TAB/Dichiarazioni.aspx +++ b/MP-TAB/Dichiarazioni.aspx @@ -8,7 +8,7 @@ -
+
diff --git a/MP-TAB/Fermate.aspx b/MP-TAB/Fermate.aspx index bcf398ff..52064af8 100644 --- a/MP-TAB/Fermate.aspx +++ b/MP-TAB/Fermate.aspx @@ -7,7 +7,7 @@ -
+
diff --git a/MP-TAB/IOB-info.aspx b/MP-TAB/IOB-info.aspx index 9b13c4ea..329561dd 100644 --- a/MP-TAB/IOB-info.aspx +++ b/MP-TAB/IOB-info.aspx @@ -6,7 +6,7 @@ -
+
diff --git a/MP-TAB/MappaStato.aspx b/MP-TAB/MappaStato.aspx index 732e8919..3a8314f6 100644 --- a/MP-TAB/MappaStato.aspx +++ b/MP-TAB/MappaStato.aspx @@ -4,7 +4,7 @@ <%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %> -
+
diff --git a/MP-TAB/MappaStato.aspx.designer.cs b/MP-TAB/MappaStato.aspx.designer.cs index 459d4b9a..6be69b67 100644 --- a/MP-TAB/MappaStato.aspx.designer.cs +++ b/MP-TAB/MappaStato.aspx.designer.cs @@ -1,32 +1,34 @@ //------------------------------------------------------------------------------ -// -// 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 MoonProTablet { - - - public partial class MappaStato { - +namespace MoonProTablet +{ + + + public partial class MappaStato + { + /// - /// Controllo mod_checkHttps. + /// mod_checkHttps 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::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps; - + /// - /// Controllo mod_mappaStato1. + /// mod_mappaStato1 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::MoonProTablet.WebUserControls.mod_mappaStato mod_mappaStato1; } diff --git a/MP-TAB/ODL.aspx b/MP-TAB/ODL.aspx index c7cd0acf..5bc4fcfb 100644 --- a/MP-TAB/ODL.aspx +++ b/MP-TAB/ODL.aspx @@ -7,7 +7,7 @@ <%@ Register Src="~/WebUserControls/cmp_SlaveMachine.ascx" TagPrefix="uc1" TagName="cmp_SlaveMachine" %> -
+
diff --git a/MP-TAB/PianoProd.aspx b/MP-TAB/PianoProd.aspx index 21071581..820ec422 100644 --- a/MP-TAB/PianoProd.aspx +++ b/MP-TAB/PianoProd.aspx @@ -13,7 +13,7 @@ display: none; } -
+
diff --git a/MP-TAB/Scarti.aspx b/MP-TAB/Scarti.aspx index eb5a8170..f7e4577a 100644 --- a/MP-TAB/Scarti.aspx +++ b/MP-TAB/Scarti.aspx @@ -9,7 +9,7 @@ -
+
diff --git a/MP-TAB/SendParameters.aspx b/MP-TAB/SendParameters.aspx index 0684ff64..4c954ea5 100644 --- a/MP-TAB/SendParameters.aspx +++ b/MP-TAB/SendParameters.aspx @@ -8,7 +8,7 @@ -
+
diff --git a/MP-TAB/SheetTech.aspx b/MP-TAB/SheetTech.aspx index b1cd001f..28614ae7 100644 --- a/MP-TAB/SheetTech.aspx +++ b/MP-TAB/SheetTech.aspx @@ -8,7 +8,7 @@ -
+
diff --git a/MP-TAB/Turni.aspx b/MP-TAB/Turni.aspx index 0d83a9dc..6c4f734d 100644 --- a/MP-TAB/Turni.aspx +++ b/MP-TAB/Turni.aspx @@ -7,7 +7,7 @@ <%@ Register Src="~/WebUserControls/mod_dettTurni.ascx" TagPrefix="uc1" TagName="mod_dettTurni" %> -
+
diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master index 2fed80db..4927ccb8 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master +++ b/MP-TAB/WebMasterPages/Bootstrap.Master @@ -51,8 +51,8 @@ -
-
+
+

hello world!

diff --git a/MP-TAB/WebUserControls/mod_footer.ascx b/MP-TAB/WebUserControls/mod_footer.ascx index 476cc601..e5a4aade 100644 --- a/MP-TAB/WebUserControls/mod_footer.ascx +++ b/MP-TAB/WebUserControls/mod_footer.ascx @@ -1,11 +1,16 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
-
- <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] | <%: DateTime.Now %> +
+
+ MapoTAB v.<%: currVersion.ToString() %> +
+
+ <%: DateTime.Now %> +
+
+ + EgalWare © <%: DateTime.Now.Year %> +
-
- - EgalWare © <%: DateTime.Now.Year %> -
-
\ No newline at end of file + diff --git a/MP-TAB/WebUserControls/mod_slideMenu.ascx b/MP-TAB/WebUserControls/mod_slideMenu.ascx index aab8e9b1..244466bf 100644 --- a/MP-TAB/WebUserControls/mod_slideMenu.ascx +++ b/MP-TAB/WebUserControls/mod_slideMenu.ascx @@ -1,16 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_slideMenu.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_slideMenu" %> - -
-
- -
-
-
<%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %>
-
-
+
diff --git a/MP-TAB/WebUserControls/mod_title.ascx b/MP-TAB/WebUserControls/mod_title.ascx index 0601fa1c..3c7e9243 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx +++ b/MP-TAB/WebUserControls/mod_title.ascx @@ -1,34 +1,34 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %> <%@ Register Src="~/WebUserControls/mod_slideMenu.ascx" TagPrefix="uc1" TagName="mod_slideMenu" %> - -
 
- +
 
diff --git a/MP-TAB/WebUserControls/mod_title.ascx.designer.cs b/MP-TAB/WebUserControls/mod_title.ascx.designer.cs index 8d7e1290..961c2068 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_title.ascx.designer.cs @@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls public partial class mod_title { - /// - /// logo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Image logo; - /// /// mod_slideMenu control. /// @@ -31,5 +22,14 @@ namespace MoonProTablet.WebUserControls /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_slideMenu mod_slideMenu; + + /// + /// logo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image logo; } } diff --git a/MP-TAB/fixODL.aspx b/MP-TAB/fixODL.aspx index ec78f3ac..b25ae380 100644 --- a/MP-TAB/fixODL.aspx +++ b/MP-TAB/fixODL.aspx @@ -5,7 +5,7 @@ <%@ Register Src="~/WebUserControls/cmp_selPODL.ascx" TagPrefix="uc1" TagName="cmp_selPODL" %> -
+
From e88639e08e0bbd76824a10e408be43665157a7a0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 Sep 2023 19:09:27 +0200 Subject: [PATCH 2/5] Refresh sidebar offcanvas --- MP-TAB/WebUserControls/mod_slideMenu.ascx | 78 ++--------------------- MP-TAB/WebUserControls/mod_title.ascx | 6 +- 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/MP-TAB/WebUserControls/mod_slideMenu.ascx b/MP-TAB/WebUserControls/mod_slideMenu.ascx index 244466bf..e4a39dcd 100644 --- a/MP-TAB/WebUserControls/mod_slideMenu.ascx +++ b/MP-TAB/WebUserControls/mod_slideMenu.ascx @@ -4,14 +4,14 @@
-
+
- +
-
EgalWare
+ EgalWare
Main Menu @@ -40,78 +40,8 @@
-
+
- - -<%--
-
- - -
-
- -
-
<%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %>
-
-
-
--%> diff --git a/MP-TAB/WebUserControls/mod_title.ascx b/MP-TAB/WebUserControls/mod_title.ascx index 3c7e9243..2af15d58 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx +++ b/MP-TAB/WebUserControls/mod_title.ascx @@ -3,10 +3,10 @@