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

Fix master e display generale ADM

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-13 15:10:34 +02:00
parent 4e70c202de
commit 90871efa94
5 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Admin/MP-Admin.csproj
+19
View File
@@ -203,6 +203,12 @@
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\fonts.css">
<DependentUpon>fonts.less</DependentUpon>
</Content>
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\themes\base\accordion.css" />
<Content Include="Content\themes\base\all.css" />
<Content Include="Content\themes\base\autocomplete.css" />
@@ -267,6 +273,19 @@
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="Bundle.config" />
<Content Include="Content\fonts.less" />
<Content Include="fonts\OpenSans.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="fonts\OpenSansCondensed.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="fonts\Roboto.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="fonts\RobotoCondensed.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Properties\PublishProfiles\OVH-Demo.pubxml" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<Content Include="Resources\ChangeLog.html">
MP-Admin/WebMasterPages/MoonPro.master
+16 -25
View File
@@ -22,35 +22,26 @@
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
</asp:ScriptManager>
<uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
<div class="container-fluid">
<div class="container-fluid mt-5">
<div class="row py-2">
<div class="col-2">
<asp:UpdatePanel ID="UpdatePanel2" runat="server" UpdateMode="Always" RenderMode="Inline">
<ContentTemplate>
<uc2:mod_menuSx ID="Mod_menuSx1" runat="server" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-10">
<div class="col-12">
<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<div class="boxShadowDark">
<table class="tableContenuto" cellpadding="0" cellspacing="0">
<tr class="topContrDx">
<td style="width: 25%;" valign="baseline">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-8 text-left">
<uc3:mod_pageTitleAndSearch ID="Mod_pageTitleAndSearch1" runat="server" />
</td>
<td style="width: 75%; text-align: left;">
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" />
</td>
</tr>
<tr>
<td colspan="2" class="contrRiq">
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</td>
</tr>
</table>
</div>
<div class="col-4 text-right">
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" Visible="false" />
</div>
</div>
</div>
<div class="card-body">
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
MP-Admin/WebMasterPages/MoonPro.master.designer.cs
Generated
-18
View File
@@ -38,24 +38,6 @@ public partial class MoonPro {
/// </remarks>
protected global::MoonPro_site.WebUserControls.mod_menuTop Mod_menuTop1;
/// <summary>
/// Controllo UpdatePanel2.
/// </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.UpdatePanel UpdatePanel2;
/// <summary>
/// Controllo Mod_menuSx1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::mod_menuSx Mod_menuSx1;
/// <summary>
/// Controllo UpdatePanel1.
/// </summary>
MP-Admin/WebUserControls/mod_menuTop.ascx
+25 -16
View File
@@ -1,28 +1,42 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="MoonPro_site.WebUserControls.mod_menuTop"
CodeBehind="mod_menuTop.ascx.cs" %>
CodeBehind="mod_menuTop.ascx.cs" %>
<%-- Gestione resize --%>
<asp:HiddenField runat="server" ID="HiddenHeight" OnValueChanged="HiddenHeight_ValueChanged" />
<asp:HiddenField runat="server" ID="HiddenWidth" OnValueChanged="HiddenWidth_ValueChanged" />
<nav class="navbar navbar-expand fixed-top navbar-dark bg-black text-light titleBlock p-0">
<div style="width: 100%;">
<div class="row topTitle p-1">
<div class="row topTitle p-1">
<div class="col-3 text-left">
<asp:LinkButton ID="btnUpdate" runat="server" CssClass="dxButtonClass" OnClick="btnUpdate_Click"></asp:LinkButton>
&nbsp; <span>
<asp:Label runat="server" ID="lastUpdate" CssClass="dateTimeSmall"><% =scriviOra() %></asp:Label>
</span>
<asp:LinkButton ID="btnLogOut" runat="server" CssClass="dxButtonClass" Visible="False"
<div class="d-flex justify-content-start pl-3 text-left">
<asp:LinkButton ID="btnUpdate" runat="server" CssClass="btn btn-sm btn-outline-info" OnClick="btnUpdate_Click"></asp:LinkButton>
<asp:LinkButton ID="btnLogOut" runat="server" CssClass="dxButtonClass" Visible="False"
OnClick="btnLogOut_Click"></asp:LinkButton>
<span class="mx-2 dateTimeSmall">
<%: DateTime.Now.ToString("yyyy.MM.dd") %><br />
<%: DateTime.Now.ToString("HH.mm.ss") %>
<asp:Label runat="server" ID="lastUpdate" CssClass="dateTimeSmall"></asp:Label>
</span>
<asp:UpdateProgress ID="updtPage" runat="server" DisplayAfter="10" DynamicLayout="true">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top">
<i class="fa fa-cog fa-spin"></i> <i class="fa fa-cog fa-spin"></i> <i class="fa fa-cog fa-spin"></i>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</div>
<div class="col-6 text-center text-uppercase">
MoonPro Admin
<div class="col-6 text-center text-uppercase">
<asp:HyperLink runat="server" is="hlHome" CssClass="btn btn-outline-info" NavigateUrl="~/menu"><i class="fa fa-home" aria-hidden="true"></i> MoonPro Admin</asp:HyperLink>
</div>
<div class="col-3 text-right text-uppercase">
<asp:HyperLink runat="server" ID="hlGuida" NavigateUrl="~/help/index.html" Target="_blank" Style="text-decoration: none; color: White; font-size: small;">
<asp:Image ID="imgHelp" ImageUrl="~/images/Help.png" runat="server" ToolTip="Guida" Height="32px" />
<asp:Image ID="imgHelp" ImageUrl="~/images/Help.png" runat="server" ToolTip="Guida" Height="32px" />
</asp:HyperLink>
&nbsp;
<asp:Image ID="logoSW" ImageUrl="~/images/logoSteamware.png" runat="server" Height="32px" />
@@ -30,10 +44,5 @@
</div>
</div>
</nav>
<div class="mb-4">&nbsp;</div>
<div class="mb-3">&nbsp;</div>
MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs
Generated
+11 -2
View File
@@ -39,6 +39,15 @@ namespace MoonPro_site.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnUpdate;
/// <summary>
/// Controllo btnLogOut.
/// </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.LinkButton btnLogOut;
/// <summary>
/// Controllo lastUpdate.
/// </summary>
@@ -49,13 +58,13 @@ namespace MoonPro_site.WebUserControls {
protected global::System.Web.UI.WebControls.Label lastUpdate;
/// <summary>
/// Controllo btnLogOut.
/// Controllo updtPage.
/// </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.LinkButton btnLogOut;
protected global::System.Web.UI.UpdateProgress updtPage;
/// <summary>
/// Controllo hlGuida.