Completato fix master SENZA cod esterno
This commit is contained in:
Samuele E. Locatelli
@@ -7,6 +7,7 @@ namespace MP_SITE
|
||||
// Per altre informazioni sulla creazione di bundle, vedere https://go.microsoft.com/fwlink/?LinkID=303951
|
||||
public static void RegisterBundles(BundleCollection bundles)
|
||||
{
|
||||
// codice JS!
|
||||
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
|
||||
"~/Scripts/WebForms/WebForms.js",
|
||||
"~/Scripts/WebForms/WebUIValidation.js",
|
||||
@@ -24,8 +25,6 @@ namespace MP_SITE
|
||||
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
|
||||
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
|
||||
|
||||
// Utilizzare la versione di sviluppo di Modernizr per eseguire attività di sviluppo ed esercizi. Successivamente, quando si è
|
||||
// pronti per passare alla produzione, usare lo strumento di compilazione disponibile all'indirizzo https://modernizr.com per selezionare solo i test necessari
|
||||
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
|
||||
"~/Scripts/modernizr-*"));
|
||||
|
||||
@@ -35,32 +34,16 @@ namespace MP_SITE
|
||||
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
|
||||
"~/Scripts/jquery-ui-{version}.js"));
|
||||
|
||||
//bundles.Add(new ScriptBundle("~/bundles/Global").Include(
|
||||
// "~/Scripts/jquery-{version}.js",
|
||||
// "~/Scripts/jquery-ui.js"));
|
||||
|
||||
//bundles.Add(new ScriptBundle("~/bundles/GlobalHead").Include(
|
||||
// "~/Scripts/modernizr*"));
|
||||
|
||||
//bundles.Add(new StyleBundle("~/Content/Global").Include(
|
||||
// "~/Content/bootstrap.css",
|
||||
// "~/Content/Style.css"));
|
||||
|
||||
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
|
||||
"~/Scripts/bootstrap.js"));
|
||||
|
||||
bundles.Add(new StyleBundle("~/Content/css").Include(
|
||||
"~/Content/bootstrap.css",
|
||||
"~/Content/Style.css"));
|
||||
|
||||
|
||||
bundles.Add(new ScriptBundle("~/bundles/vis").Include(
|
||||
"~/vis/vis.js"));
|
||||
|
||||
|
||||
//bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
|
||||
// "~/Scripts/jquery.unobtrusive*",
|
||||
// "~/Scripts/jquery.validate*"));
|
||||
//// CSS!
|
||||
//bundles.Add(new StyleBundle("~/Content/css").Include(
|
||||
// "~/Content/bootstrap.css",
|
||||
// "~/Content/Style.css"));
|
||||
|
||||
// abilito boundle "forzato"!
|
||||
BundleTable.EnableOptimizations = true;
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<bundles version="1.0">
|
||||
<styleBundle path="~/Content/css">
|
||||
<include path="~/Content/bootstrap.css" />
|
||||
<include path="~/Content/bootstrap.min.css" />
|
||||
<include path="~/Content/font-awesome.min.css" />
|
||||
<include path="~/Content/fonts.min.css" />
|
||||
<include path="~/Content/typeahead.min.css" />
|
||||
<include path="~/Content/dichMan.min.css" />
|
||||
<include path="~/Content/bloccoMacc.min.css" />
|
||||
<include path="~/Content/flashing.min.css" />
|
||||
<include path="~/Content/baseStyle.min.css" />
|
||||
<include path="~/Content/Style.min.css" />
|
||||
<include path="~/Content/vis.min.css" />
|
||||
</styleBundle>
|
||||
<styleBundle path="~/Content/themes/base/css">
|
||||
<!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
|
||||
|
||||
+23
-23
@@ -1,10 +1,10 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// <generato automaticamente>
|
||||
// Codice generato da uno strumento.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
|
||||
// il codice viene rigenerato.
|
||||
// </generato automaticamente>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -12,56 +12,56 @@
|
||||
public partial class MAPO_empty_refresh30_full {
|
||||
|
||||
/// <summary>
|
||||
/// form1 control.
|
||||
/// Controllo form1.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// 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>
|
||||
/// sm control.
|
||||
/// Controllo sm.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// 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 sm;
|
||||
|
||||
/// <summary>
|
||||
/// updPanelPagina control.
|
||||
/// Controllo updPanelPagina.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// 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 updPanelPagina;
|
||||
|
||||
/// <summary>
|
||||
/// Timer1 control.
|
||||
/// Controllo Timer1.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// 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>
|
||||
/// ContentPlaceHolder1 control.
|
||||
/// Controllo ContentPlaceHolder1.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// 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 ContentPlaceHolder1;
|
||||
|
||||
/// <summary>
|
||||
/// Mod_menuBottom1 control.
|
||||
/// Controllo Mod_menuBottom1.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::mod_menuBottom Mod_menuBottom1;
|
||||
}
|
||||
|
||||
@@ -5,23 +5,24 @@
|
||||
<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc2" %>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>MoonPro - MOnitor ONline della PROduzione</title>
|
||||
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
|
||||
<link href="~/Content/vis.min.css" rel="stylesheet" />
|
||||
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<head runat="server">
|
||||
<title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
|
||||
<%--vecchie libs esterne da deprecare--%>
|
||||
<%--<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />--%>
|
||||
<%--<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>--%>
|
||||
|
||||
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
|
||||
<asp:PlaceHolder runat="server">
|
||||
<%: Scripts.Render("~/bundles/modernizr") %>
|
||||
<%: Scripts.Render("~/bundles/jquery") %>
|
||||
<%: Scripts.Render("~/bundles/bootstrap") %>
|
||||
<%: Scripts.Render("~/bundles/bootstrap") %>
|
||||
<%: Scripts.Render("~/bundles/vis") %>
|
||||
<%: Styles.Render("~/Content/css") %>
|
||||
<%--<%: Scripts.Render("~/Content/css") %>--%>
|
||||
</asp:PlaceHolder>
|
||||
<%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
|
||||
<%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
|
||||
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
|
||||
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
|
||||
</head>
|
||||
|
||||
@@ -6,27 +6,23 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>MoonPro - MOnitor ONline della PROduzione</title>
|
||||
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
|
||||
<link href="~/Content/vis.min.css" rel="stylesheet" />
|
||||
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
|
||||
<script src="scripts/vis.min.js" type="text/javascript"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<%--<script type="text/jscript" src="../vis/vis.js"></script>
|
||||
<link href="../vis/vis.css" rel="stylesheet" />--%>
|
||||
|
||||
<asp:PlaceHolder runat="server">
|
||||
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
|
||||
<%: Styles.Render("~/Content/Global") %>--%>
|
||||
<%--<%: Scripts.Render("~/bundles/bootstrap") %>
|
||||
<%: Scripts.Render("~/bundles/jquery") %>--%>
|
||||
<%-- <%: Scripts.Render("~/bundles/vis") %>--%>
|
||||
<title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
|
||||
|
||||
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
|
||||
<asp:PlaceHolder runat="server">
|
||||
<%: Scripts.Render("~/bundles/modernizr") %>
|
||||
<%: Scripts.Render("~/bundles/jquery") %>
|
||||
<%: Scripts.Render("~/bundles/bootstrap") %>
|
||||
<%: Scripts.Render("~/bundles/vis") %>
|
||||
<%--<%: Scripts.Render("~/Content/css") %>--%>
|
||||
</asp:PlaceHolder>
|
||||
<%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
|
||||
<%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
|
||||
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
|
||||
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
|
||||
</head>
|
||||
<body class="body">
|
||||
<body class="body">
|
||||
<%--<%: Scripts.Render("~/bundle/Global") %>--%>
|
||||
<form id="form1" runat="server">
|
||||
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
|
||||
|
||||
@@ -11,6 +11,24 @@
|
||||
|
||||
public partial class MAPO_refresh30 {
|
||||
|
||||
/// <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 form1.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user