Egalware/ScheMe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMPLETATO FIX GRAFICO!!! in produzione!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-09-06 17:04:34 +02:00
parent afeb118130
commit efa8eadd63
9 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ScheMe-SP/WebUserControls/mod_top.ascx
+31 -17
View File
@@ -4,33 +4,47 @@
<div class="navbar navbar-top headerRow" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topNavbar" aria-expanded="false" aria-controls="navbar">
<%--<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topNavbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="fa fa-bars fa-3x"></span>
</button>
</button>--%>
<a class="navbar-brand uppercase btn btn-default" href="Default" style="margin: 0 0.5em 0 0; padding: 0.25em;">
<div style="float: left;">
<i class="fa fa-user-md fa-2x" aria-hidden="true"></i>
<i class="fa fa-user-md fa-lg" aria-hidden="true"></i>
<div class="visible-xs smallest">
<%: fullVers %>
</div>
</div>
<div style="float: left; padding-left:0.2em;">
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b><br />
<span class="smaller text-right">
<asp:Label ID="lblVers" CssClass="small" Height="0.8em" runat="server" Font-Bold="false" />
</span>
<div style="float: left; padding-left: 0.2em;" class="hidden-xs">
<div><%: SteamWare.memLayer.ML.CRS("CodModulo") %></div>
<div class="smallest text-center">
<%: fullVers %>
</div>
</div>
</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="topNavbar">
<ul class="nav navbar-nav">
<li>
<div class="tStrong headerHighlight uppercase" style="font-size: 1.3em; vertical-align: central; margin: auto;">
<i class="fa fa-user" aria-hidden="true"></i>&nbsp;<%: pazienteSel %>
<div class="row">
<div class="col-xs-7 col-sm-8">
<span class="flLeft tStrong headerHighlight uppercase"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;<%: pazienteSel %></span>
</div>
<div class="col-xs-1 text-right visible-xs-inline">
<asp:HyperLink runat="server" ID="hlUserAdmin_xs" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="">
<i class="fa fa-lock fa-lg" aria-hidden="true"></i>
</asp:HyperLink>
</div>
<div class="col-xs-1 text-right visible-xs-inline">
<span class="flRight visible-xs-inline">
<a href="https://www.steamware.net" target="_blank">
<asp:Image ID="logoSW_xs" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" /></a>
</span>
</div>
<div class="col-xs-8 col-sm-8 small"><%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %></div>
</div>
<div class="smaller"><%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %></div>
</li>
</ul>
</div>
<div class="collapse navbar-collapse" id="topNavbar">
<%--<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
@@ -40,8 +54,8 @@
<ul class="nav navbar-nav navbar-right">
<li class="text-right">
<div>
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" />
<%--<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="btn btn-default">--%>
<a href="https://www.steamware.net" target="_blank">
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" /></a>
<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="">
<i class="fa fa-lock fa-lg" aria-hidden="true"></i>
</asp:HyperLink>
ScheMe-SP/WebUserControls/mod_top.ascx.cs
+13 -5
View File
@@ -43,11 +43,8 @@ namespace ScheMe.WebUserControls
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
// salvo pagina corrente
devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url);
// update valori
Version versione = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
lblVers.Text = string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision);
lblVers.ToolTip = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.MinorRevision.ToString();
devicesAuthProxy.pagCorrente = titolo;
hlUserAdmin.Visible = userIsAdmin;
}
// SOLO se la pagina NON E' "safe"...
@@ -79,6 +76,17 @@ namespace ScheMe.WebUserControls
}
}
/// <summary>
/// Versione completamente formattata
/// </summary>
public string fullVers
{
get
{
Version versione = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
return string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision);
}
}
/// <summary>
/// verifica che la pagina sia tra quelle autorizzate x l'utente
/// </summary>
/// <returns></returns>
ScheMe-SP/WebUserControls/mod_top.ascx.designer.cs
Generated
+11 -2
View File
@@ -22,13 +22,22 @@ namespace ScheMe.WebUserControls {
protected global::System.Web.UI.Timer Timer1;
/// <summary>
/// Controllo lblVers.
/// Controllo hlUserAdmin_xs.
/// </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.Label lblVers;
protected global::System.Web.UI.WebControls.HyperLink hlUserAdmin_xs;
/// <summary>
/// Controllo logoSW_xs.
/// </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.Image logoSW_xs;
/// <summary>
/// Controllo logoSW.