Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TAB:

Browse Source 
- fix grafico pagine (layout main)
- fix header/footer
This commit is contained in:
Samuele Locatelli
2023-09-21 18:54:47 +02:00
parent 09fa828634
commit 097c9d7a27
21 changed files with 88 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/Allarmi.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/Commenti.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Controlli.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/DettaglioMacchina.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<%@ Register Src="~/WebUserControls/cmp_goPrint.ascx" TagPrefix="uc1" TagName="cmp_goPrint" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Dichiarazioni.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/Fermate.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/IOB-info.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/MappaStato.aspx
+1 -1
View File
@@ -4,7 +4,7 @@
<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid mt-0 mb-3 px-3 px-md-4" role="main">
<div class="container-fluid px-2 py-3" role="main">
<uc1:mod_checkHttps runat="server" ID="mod_checkHttps" />
<uc1:mod_mappaStato ID="mod_mappaStato1" runat="server" />
</div>
MP-TAB/MappaStato.aspx.designer.cs
Generated
+19 -17
View File
@@ -1,32 +1,34 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// 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.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet {
public partial class MappaStato {
namespace MoonProTablet
{
public partial class MappaStato
{
/// <summary>
/// Controllo mod_checkHttps.
/// mod_checkHttps control.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps;
/// <summary>
/// Controllo mod_mappaStato1.
/// mod_mappaStato1 control.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_mappaStato mod_mappaStato1;
}
MP-TAB/ODL.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<%@ Register Src="~/WebUserControls/cmp_SlaveMachine.ascx" TagPrefix="uc1" TagName="cmp_SlaveMachine" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/PianoProd.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
display: none;
}
</style>
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Scarti.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/SendParameters.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina runat="server" ID="mod_dettMacchina" />
MP-TAB/SheetTech.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row mb-5">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina runat="server" ID="mod_dettMacchina" />
MP-TAB/Turni.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<%@ Register Src="~/WebUserControls/mod_dettTurni.ascx" TagPrefix="uc1" TagName="mod_dettTurni" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/WebMasterPages/Bootstrap.Master
+2 -2
View File
@@ -51,8 +51,8 @@
<uc1:mod_title runat="server" ID="mod_title" />
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark pt-0 mt-0">
<div class="col-12 px-0">
<div class="row bodyDark">
<div class="col-12">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
MP-TAB/WebUserControls/mod_footer.ascx
+12 -7
View File
@@ -1,11 +1,16 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
<footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black " style="font-size: 1em; height: 1.5em;">
<div class="d-flex justify-content-start pl-1 text-start align-self-center small">
<strong><%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %></strong> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] | <%: DateTime.Now %>
<div class="d-flex justify-content-between w-100">
<div class="px-1 pl-1 text-start align-self-center small">
<strong>MapoTAB</strong> <sub>v.<%: currVersion.ToString() %></sub>
</div>
<div class="px-1 text-center align-self-center small" style="font-size:0.7rem;">
<%: DateTime.Now %>
</div>
<div class="px-1 text-end align-self-center small">
<img src="./images/logoSteamware.png" height="20" />
EgalWare&nbsp;<span class="small">&copy; <%: DateTime.Now.Year %></span>
</div>
</div>
<div class="d-flex justify-content-end pr-1 text-end align-self-center small">
<img src="./images/logoSteamware.png" height="20" />
EgalWare&nbsp;&copy; <%: DateTime.Now.Year %>
</div>
</footer>
</footer>
MP-TAB/WebUserControls/mod_slideMenu.ascx
+3 -11
View File
@@ -1,16 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_slideMenu.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_slideMenu" %>
<div class="d-flex justify-content-between">
<div class="px-1">
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
<span class="fa fa-bars fa-lg"></span>
</button>
</div>
<div class="px-1">
<div class="py-2 ml-auto small"><%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %></div>
</div>
</div>
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
<span class="fa fa-bars fa-lg"></span>
</button>
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
<div class="offcanvas-header">
<div class="d-flex flex-row">
MP-TAB/WebUserControls/mod_title.ascx
+28 -28
View File
@@ -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" %>
<nav class="navbar navbar-expand fixed-top navbar-dark bg-black text-light titleBlock">
<a class="navbar-brand p-0 align-text-bottom" href=".">
<div class="d-flex flex-row">
<div class="p-0" style="width: 1.5em;">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<b>MoonProTAB</b>
<nav class="navbar fixed-top navbar-dark bg-black text-light titleBlock py-1">
<div class="row w-100">
<div class="col-3">
<uc1:mod_slideMenu runat="server" ID="mod_slideMenu" />
</div>
<div class="col-6">
<a class="text-light align-text-bottom" href=".">
<div class="d-flex justify-content-center fs-5">
<div class="px-1" style="width: 2em;">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" CssClass="img-fluid" />
</div>
<div class="px-1">
<b>MapoTAB</b>
</div>
<div class="px-1">
<i class="fa fa-lg fa-home"></i>
</div>
</div>
</a>
</div>
<div class="col-3 text-end">
<div class="text-end small">
<b><%: CognomeNome %></b>
<div class="small">
[<%: MatrOpr %>]
</div>
</div>
</div>
</div>
<div class="p-0 pl-1">
<i class="fa fa-lg fa-home"></i>
</div>
</div>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<div class="navbar-text ml-auto my-0 py-0">
<div class="text-end">
opr: <b><%: CognomeNome %></b> [<%: MatrOpr %>]
</div>
<div class="text-end">
</div>
</div>
</div>
</nav>
<div class="mb-4">&nbsp;</div>
<uc1:mod_slideMenu runat="server" ID="mod_slideMenu" />
<div class="mb-3">&nbsp;</div>
MP-TAB/WebUserControls/mod_title.ascx.designer.cs
Generated
+9 -9
View File
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class mod_title
{
/// <summary>
/// logo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logo;
/// <summary>
/// mod_slideMenu control.
/// </summary>
@@ -31,5 +22,14 @@ namespace MoonProTablet.WebUserControls
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_slideMenu mod_slideMenu;
/// <summary>
/// logo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logo;
}
}
MP-TAB/fixODL.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<%@ Register Src="~/WebUserControls/cmp_selPODL.ascx" TagPrefix="uc1" TagName="cmp_selPODL" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />