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

PAgina mappa stsato QUASI definitiva...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-26 19:06:54 +01:00
parent 81db6120bf
commit e4c4946f3a
7 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/Content/baseStyle.css
+3 -3
View File
@@ -21,10 +21,10 @@ body .ui-overlay-c {
font-family: 'Open Sans Condensed', sans-serif;
color: #FFF;
background-image: linear-gradient(#111, #000);
box-shadow: 0 14px 18px 0 rgba(0, 0, 0, 0.2), 0 16px 30px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 15px 30px 0 rgba(150, 150, 150, 0.2), 0 10px 20px 0 rgba(200, 200, 200, 0.39);
}
.labelTopDx {
padding: 2px 10px;
padding: 0.1em 0.4em;
width: auto;
min-height: 0;
top: 0;
@@ -33,7 +33,7 @@ body .ui-overlay-c {
/* Custom styling. */
color: #c0c0c0;
background: #990099;
background: rgba(153, 0, 153, 0.85);
background: rgba(153, 0, 153, 0.8);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
MP-Tablet/Content/baseStyle.less
+4 -3
View File
@@ -23,11 +23,12 @@ body {
font-family: 'Open Sans Condensed', sans-serif;
color: #FFF;
background-image: linear-gradient(#111, #000);
box-shadow: 0 14px 18px 0 rgba(0, 0, 0, 0.2), 0 16px 30px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 15px 30px 0 rgba(150, 150, 150, 0.2), 0 10px 20px 0 rgba(200, 200, 200, 0.39);
}
.labelTopDx {
padding: 2px 10px;
padding: 0.1em 0.4em;
width: auto;
min-height: 0;
top: 0;
@@ -35,7 +36,7 @@ body {
bottom: auto; /* Custom styling. */
color: #c0c0c0;
background: #990099;
background: rgba(153,0,153,.85);
background: rgba(153,0,153,.80);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
MP-Tablet/Content/baseStyle.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Tablet/WebMasterPages/Bootstrap.Master
+3 -3
View File
@@ -58,7 +58,7 @@
</asp:UpdatePanel>
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="bodyDark" style="background-color: #333;">
<div class="bodyDark">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
@@ -71,7 +71,7 @@
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0" style="font-size: 1.2em; height: 1.5em;">
<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;">
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<div class="d-flex justify-content-start pl-3 text-left">
@@ -81,7 +81,7 @@
<%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %>
</div>
<div class="d-flex justify-content-end pr-3 text-right">
Powered by&nbsp;<strong>Steamware</strong>&nbsp;s.r.l. - &copy; 2007-<%: DateTime.Now.Year %></div>
Powered by&nbsp;<img src="../images/logoTextSteamware.png" height="24" />&nbsp;&copy; 2007-<%: DateTime.Now.Year %></div>
</footer>
</ContentTemplate>
</asp:UpdatePanel>
MP-Tablet/WebUserControls/mod_mappaStato.ascx
+4 -4
View File
@@ -6,15 +6,15 @@
<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 bg-dark text-white mapBlock">
<div class="card text-white mapBlock rounded">
<img class="card-img" src='<%# ImgUrl(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<div class="card-img-overlay p-0">
<p class="card-text labelTopDx text-right">
<div class="card-img-overlay p-0 pl-5 ml-3">
<p class="labelTopDx text-right">
<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 class="card bg-dark">
<div class="card bg-black px-1 py-3">
<h5 class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h5>
<span class='<%# Eval("Semaforo") %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
MP-Tablet/WebUserControls/mod_title.ascx
+7 -7
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light my-0 py-0">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light my-0 py-0 bg-black">
<a class="navbar-brand p-0 align-text-bottom" href="#">
<asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
</a>
@@ -12,14 +12,14 @@
<li class="nav-item active">
<a class="nav-link" href="#"><b style="font-size: 2em;">MoonProTablet</b></a>
</li>
<%--<li class="nav-item">
<a class="nav-link" href="#">Features</a>
<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 class="nav-item">
<a class="nav-link" href="#">Pricing</a>
</li>--%>
</ul>
<div class="navbar-text">
<div class="navbar-text my-0 py-0">
<div class="text-right">
<asp:Label runat="server" ID="lblSwData" />
</div>
MP-Tablet/WebUserControls/mod_title.ascx.cs
+10
View File
@@ -166,5 +166,15 @@ namespace MoonProTablet.WebUserControls
return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/TAB/{0}/manifest.xml", memLayer.ML.CRS("appVers"));
}
}
public string isActive(object pageName)
{
string answ = "";
if (true)
{
answ = "active";
}
return answ;
}
}
}