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

Continuo fix header menu + home

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-27 15:33:37 +01:00
parent 7bcd81e439
commit 73ba02ec79
14 changed files with 143 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/WebUserControls/mod_footer.ascx
+14 -17
View File
@@ -1,18 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
<asp:Panel runat="server" ID="pnlFooter" data-role="navbar" data-iconpos="top">
<ul>
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<li>
<asp:HyperLink runat="server" ID="btnTimbra" NavigateUrl='<%# Eval("NavigateUrl") %>' rel="external" Text='<%# Eval("Testo") %>'
data-role="button" data-icon='<%# Eval("icona") %>' />
</li>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTipo" TypeName="MapoDb.DS_applicazioneTableAdapters.LinkMenuJQMTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="-" Name="TipoLink" SessionField="TipoLink" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</ul>
</asp:Panel>
<footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black" style="font-size: 1.2em; height: 1.5em;">
<div class="d-flex justify-content-start pl-3 text-left">
<strong>MoonProTablet</strong> -
v.<%: currVersion.ToString() %>&nbsp;|&nbsp;<%: DateTime.Now %>
</div>
<div class="d-flex justify-content-center text-center">
<%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %>
</div>
<div class="d-flex justify-content-end pr-3 text-right">
Powered by&nbsp;
<img src="../images/logoTextSteamware.png" height="24" />&nbsp;&copy; 2007-<%: DateTime.Now.Year %>
</div>
</footer>
MP-Tablet/WebUserControls/mod_footer.ascx.cs
+21 -5
View File
@@ -2,11 +2,27 @@
namespace MoonProTablet.WebUserControls
{
public partial class mod_footer : System.Web.UI.UserControl
public partial class mod_footer : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
}
if (!Page.IsPostBack)
{
updateLabels();
}
}
/// <summary>
/// Versione corrente sw
/// </summary>
public Version currVersion
{
get
{
return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
}
}
private void updateLabels()
{
}
}
}
MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs
Generated
+8 -36
View File
@@ -1,43 +1,15 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls
{
namespace MoonProTablet.WebUserControls {
public partial class mod_footer {
/// <summary>
/// pnlFooter 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.Panel pnlFooter;
/// <summary>
/// repLI 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.Repeater repLI;
/// <summary>
/// ods 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.ObjectDataSource ods;
}
}
MP-Tablet/WebUserControls/mod_mappaStato.ascx
+14 -13
View File
@@ -6,31 +6,32 @@
<ItemTemplate>
<div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-3">
<asp:LinkButton ID="hlMacchina" runat="server" OnClick="hlMacchina_Click" CommandArgument='<%# Eval("IdxMacchina") %>'>
<div class="card text-white mapBlock rCorner">
<img class="card-img rCorner" src='<%# ImgUrl(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<div class="card-img-overlay p-0 pl-5 ml-4 rCorner">
<p class="labelTopDx text-right">
<div class="card text-white mapBlock rCAll">
<img class="card-img bg-dark rCTop" src='<%# ImgUrl(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
<div class="labelTopDx text-right px-2">
<asp:Label runat="server" ID="lblBadge" Text='<%# Eval("CodArticolo","art: {0}") %>' />
<asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","(ODL {0})") %>' />
</p>
</div>
</div>
<div class="card bg-black px-1 py-3 rCorner">
<div class="row justify-content-center">
<div class="col-12">
<h4 class="text-left"><asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h4>
<div class="card bg-black p-0 rCBot">
<div class='row justify-content-center mx-0'>
<div class="col-12 px-1">
<h4 class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h4>
</div>
<div class='col-12 <%# Eval("Semaforo") %>'>
<div class='col-12 px-1 <%# Eval("Semaforo") %>'>
<div class="row">
<div class="col-6">
<div class="col-6 pr-0">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b>
</div>
<div class="col-6">
<div class="col-6 pl-0 text-right">
<asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' />
</div>
</div>
</div>
<div class="col-12">
<div class="col-12 px-1 pb-1">
<div class="row">
<div class="col-8">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("PezziProd","prod: {0}") %>' ToolTip="pz prodotti" />
MP-Tablet/WebUserControls/mod_title.ascx
+21 -8
View File
@@ -9,27 +9,40 @@
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="#"><b style="font-size: 2em;">MoonProTablet</b></a>
</li>
<li class="nav-item btn btn-lg">
<%--<li class="nav-item active">
<a class="nav-link" href="."><b style="font-size: 1.2em;">MPTablet</b></a>
</li>--%>
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<li class='nav-item btn btn-lg py-0 <%# checkPage(Eval("NavigateUrl")) %>'>
<asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i> <%# Eval("Testo") %> </asp:HyperLink>
</li>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTipo" TypeName="MapoDb.DS_applicazioneTableAdapters.LinkMenuJQMTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="-" Name="TipoLink" SessionField="TipoLink" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<%--<li class="nav-item btn btn-lg">
<a class="nav-link" href="MappaStato"><i class="fa fa-globe fa-lg"></i> Mappa</a>
</li>
<li class="nav-item btn btn-lg">
<a class="nav-link" href="StoricoTC"><i class="fa fa-clock-o fa-lg"></i> Storico TC</a>
</li>
</li>--%>
</ul>
<div class="navbar-text my-0 py-0">
<div class="text-right">
<asp:Label runat="server" ID="lblSwData" />
<asp:Label runat="server" ID="lblSwData" />
</div>
<div class="text-right">
<asp:Label runat="server" ID="lblIpData" /> | <asp:Label runat="server" ID="lblVers" />
<asp:Label runat="server" ID="lblIpData" />
|
<asp:Label runat="server" ID="lblVers" />
</div>
</div>
</div>
</nav>
<!-- timer refresh intera pagina: 1 minuti, 0'000 ms -->
<asp:Timer ID="Timer1" runat="server" Interval="60000" OnTick="Timer1_Tick">
</asp:Timer>
MP-Tablet/WebUserControls/mod_title.ascx.cs
+24
View File
@@ -176,5 +176,29 @@ namespace MoonProTablet.WebUserControls
}
return answ;
}
/// <summary>
/// Verifica se la pagina corrente sia URL indicato --> mostra ACTIVE
/// </summary>
/// <param name="navUrl"></param>
/// <returns></returns>
public string checkPage(object navUrl)
{
string answ = "";
if (navUrl.ToString().Replace(".aspx", "").Replace("~/", "") == titolo.Replace(".aspx", ""))
{
answ = "active";
}
return answ;
}
/// <summary>
/// titolo pagina
/// </summary>
public string titolo
{
get
{
return devicesAuthProxy.getPage(Request.Url);
}
}
}
}
MP-Tablet/WebUserControls/mod_title.ascx.designer.cs
Generated
+18
View File
@@ -21,6 +21,24 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Image logoSW;
/// <summary>
/// Controllo repLI.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repLI;
/// <summary>
/// Controllo ods.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo lblSwData.
/// </summary>