Menu top QUASI OK...

This commit is contained in:
Samuele E. Locatelli
2018-03-22 18:54:08 +01:00
parent 86f96a80c9
commit 7ebd92e4e5
6 changed files with 31 additions and 35 deletions
+1 -1
View File
@@ -49,7 +49,7 @@
<uc1:mod_testata runat="server" ID="mod_testata" />
</div>
<div class="headSpacer"></div>
<div class="container" role="main">
<div class="container-flow" role="main">
<asp:UpdatePanel ID="uppFeatured" runat="server">
<ContentTemplate>
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
+4 -8
View File
@@ -8,19 +8,15 @@
.navItem {
text-align: center;
}
.navba-dark .navbar-nav .active > .nav-link {
.navbar-dark .navbar-nav .show > .nav-link,
.navbar-dark .navbar-nav .active > .nav-link,
.navbar-dark .navbar-nav .nav-link.show,
.navbar-dark .navbar-nav .nav-link.active {
background: transparent;
color: #F90;
border: 1px solid #F90;
/*margin: -5px;*/
}
/*------------------------------------------------------------------
[ Subnavbar / .subnavbar ]
*/
.subnavbar {
margin-top: 5em;
margin-bottom: 0.5em;
}
/* @group Generale */
.fixedVal {
background-color: #cdcdcd;
+4 -9
View File
@@ -11,21 +11,16 @@
text-align: center;
}
.navba-dark .navbar-nav .active > .nav-link {
.navbar-dark .navbar-nav .show > .nav-link,
.navbar-dark .navbar-nav .active > .nav-link,
.navbar-dark .navbar-nav .nav-link.show,
.navbar-dark .navbar-nav .nav-link.active {
background: transparent;
color: #F90;
border: 1px solid #F90;
/*margin: -5px;*/
}
/*------------------------------------------------------------------
[ Subnavbar / .subnavbar ]
*/
.subnavbar {
margin-top: 5em;
margin-bottom: 0.5em;
}
/* @group Generale */
.fixedVal {
background-color: #cdcdcd;
+1 -1
View File
File diff suppressed because one or more lines are too long
+8 -7
View File
@@ -7,22 +7,21 @@
<%} %>
<nav class="navbar navbar-expand-md navbar-dark bg-dark text-light fixed-top py-1 m-0">
<nav class="navbar navbar-expand-md navbar-dark bg-dark text-light fixed-top py-1 m-0 justify-content-start flex-nowrap">
<asp:LinkButton runat="server" ID="lbnUpdate" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="navbar-brand pt-0"><i class="fa fa-home fa-2x"></i> <b style="font-size:2em;">XPS</b></asp:LinkButton>
<button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse">
<%--<div class="col-12">--%>
<ul class="navbar-nav mr-auto mt-2 mt-lg-0 navTitle">
<%--<ul class="nav navbar-nav navbar-right mr-auto">--%>
<ul class="navbar-nav mr-auto mt-1 mt-lg-0 navTitle">
<asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
<ItemTemplate>
<asp:Repeater ID="voci" runat="server" DataSource='<%# XPathSelect("voce") %>'>
<ItemTemplate>
<li class='<%# checkPag(XPath("@title")) %>'>
<a href='<%# XPath("@url").ToString().Replace("~/","")%>' class="nav-link">
<i class='<%# XPath("@description")%>'></i> <%# SteamWare.SteamwareStrings.limitString(XPath("@title").ToString(), 15)%>
<a href='<%# XPath("@url").ToString().Replace("~/","")%>' class="nav-link py-0 px-1 my-0 mx-2">
<i class='<%# XPath("@description")%>'></i>&nbsp;<%# SteamWare.SteamwareStrings.limitString(XPath("@title").ToString(), 15)%>
</a>
</li>
</ItemTemplate>
@@ -34,11 +33,12 @@
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
</ul>
<div class="form-inline my-2 my-lg-0">
<asp:TextBox ID="txtSearch" runat="server" CssClass="form-control input-sm search-query" placeholder="[S]earch" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" TextMode="Search" AccessKey="s" />
<asp:TextBox ID="txtSearch" runat="server" CssClass="form-control form-control-sm search-query" placeholder="[S]earch" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" TextMode="Search" AccessKey="s" />
</div>
</div>
</nav>
<div class="subnavbar row small py-0 bg-dark text-secondary">
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top mt-5 p-0 text-light">
<div class="navbar-collapse collapse row small py-0 px-2 text-secondary">
<div class="col-6">
<%: string.Format("{0} | {1}", SteamWare.dnsUtils.ReverseLookup(Request.UserHostAddress), Request.UserHostAddress) %>
</div>
@@ -46,3 +46,4 @@
<asp:HyperLink runat="server" ID="hlLang" NavigateUrl="~/chLang"> <i class="fa fa-flag-checkered"></i> <%: string.Format("{0} - [{1}]", SteamWare.devicesAuthProxy.stObj.CognomeNome, SteamWare.devicesAuthProxy.stObj.lingua) %></asp:HyperLink>
</div>
</div>
</nav>
+13 -9
View File
@@ -3,19 +3,23 @@
<%@ Register Src="WebUserControls/mod_main_help.ascx" TagName="mod_main_help" TagPrefix="uc2" %>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
<div class="row">
<div class="col-6" style="color: #ee8800; padding: 10px 30px; text-align: left;">
<img src="Images/LogoCli.png" alt="Cliente" class="img-fluid" height="120" width="480" />
<div class="container">
<div class="row">
<div class="col-6" style="color: #ee8800; padding: 10px 30px; text-align: left;">
<img src="Images/LogoCli.png" alt="Cliente" class="img-fluid" height="120" width="480" />
</div>
<div class="col-6" style="color: #ee8800; padding: 10px 30px;">
<img src="Images/LogoHomeDx.png" alt="" class="img-fluid pull-right" height="120" width="480" />
</div>
<div class="col-12" style="color: #ABABAB; text-align: center; margin: auto; padding: 0; float: none; clear: both; font-weight: bold; font-size: 3em;">
<%: traduci("XPS_Appl") %>
</div>
</div>
<div class="col-6" style="color: #ee8800; padding: 10px 30px;">
<img src="Images/LogoHomeDx.png" alt="" class="img-fluid pull-right" height="120" width="480" />
</div>
<div class="col-12" style="color: #ABABAB; text-align: center; margin: auto; padding: 0; float: none; clear: both; font-weight: bold; font-size: 3em;">
<%: traduci("XPS_Appl") %>
</div>
</div>
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container">
<uc2:mod_main_help ID="Mod_main_help1" runat="server" />
</div>
</asp:Content>