Tolto master inutilizzata

This commit is contained in:
Samuele E. Locatelli
2019-01-31 10:47:04 +01:00
parent 65900c1f7d
commit 2a020b0818
4 changed files with 0 additions and 270 deletions
-8
View File
@@ -562,7 +562,6 @@
<DependentUpon>Web.config</DependentUpon>
</None>
<Content Include="WebMasterPages\Bootstrap.Master" />
<Content Include="WebMasterPages\BootstrapNoUpdPnl.Master" />
<Content Include="windowSize.ashx" />
</ItemGroup>
<ItemGroup>
@@ -745,13 +744,6 @@
<Compile Include="WebMasterPages\Bootstrap.Master.designer.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\BootstrapNoUpdPnl.Master.cs">
<DependentUpon>BootstrapNoUpdPnl.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebMasterPages\BootstrapNoUpdPnl.Master.designer.cs">
<DependentUpon>BootstrapNoUpdPnl.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_newODL.ascx.cs">
<DependentUpon>cmp_newODL.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1,77 +0,0 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="BootstrapNoUpdPnl.master.cs" Inherits="WebMasterPages.BootstrapNoUpdPnl" %>
<%@ Register Src="~/WebUserControls/mod_title.ascx" TagPrefix="uc1" TagName="mod_title" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head runat="server">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="MAPO TAB site" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>MPTAB: <%: Page.Title %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
</head>
<body>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<uc1:mod_title runat="server" id="mod_title" />
</ContentTemplate>
</asp:UpdatePanel>
<div class="table-warning">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
</div>
</asp:ContentPlaceHolder>
</div>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<footer class="navbar fixed-bottom navbar-light bg-light text-dark p-0 px-2 m-0" style="font-size: 1.2em; height: 1.5em;">
<asp:Timer ID="Timer1" runat="server" Interval="5000" OnTick="Timer1_Tick">
</asp:Timer>
<div class="d-flex justify-content-center text-center ml-auto">
<%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> | <%: videoSize %> | <%: DateTime.Now %>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</form>
<%--<script src="Scripts/bootstrap.min.js"></script>--%>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/bootstrap") %>
</asp:PlaceHolder>
</body>
</html>
@@ -1,62 +0,0 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebMasterPages
{
public partial class BootstrapNoUpdPnl : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
setTimer();
updateLabels();
}
}
/// <summary>
/// Versione corrente sw
/// </summary>
public Version currVersion
{
get
{
return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
}
}
/// <summary>
/// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
/// </summary>
private void setTimer()
{
Timer1.Interval = SteamWare.memLayer.ML.CRI("intUpdatePagina_ms");
}
protected void Timer1_Tick(object sender, EventArgs e)
{
updateLabels();
}
private void updateLabels()
{
}
/// <summary>
/// Dimensione schermata video attuale
/// </summary>
public string videoSize
{
get
{
string answ = "?x?";
if (Session["BrowserWidth"] != null)
{
answ = string.Format("{0} x {1}", Session["BrowserWidth"], Session["BrowserHeight"]);
}
return answ;
}
}
}
}
-123
View File
@@ -1,123 +0,0 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace WebMasterPages {
public partial class BootstrapNoUpdPnl {
/// <summary>
/// Controllo PlaceHolder1.
/// </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.PlaceHolder PlaceHolder1;
/// <summary>
/// Controllo BundleReference1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// Controllo HeadContent.
/// </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.ContentPlaceHolder HeadContent;
/// <summary>
/// Controllo form1.
/// </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.HtmlControls.HtmlForm form1;
/// <summary>
/// Controllo ScriptManager1.
/// </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.ScriptManager ScriptManager1;
/// <summary>
/// Controllo uppNavbar.
/// </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 uppNavbar;
/// <summary>
/// Controllo mod_title.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_title mod_title;
/// <summary>
/// Controllo MainContent.
/// </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.ContentPlaceHolder MainContent;
/// <summary>
/// Controllo uppFooter.
/// </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 uppFooter;
/// <summary>
/// Controllo Timer1.
/// </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.Timer Timer1;
/// <summary>
/// Controllo PlaceHolder2.
/// </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.PlaceHolder PlaceHolder2;
}
}