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

Completato fix master SENZA cod esterno

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-11-10 10:28:27 +01:00
parent 7c2ccbb6d7
commit 7ce828b7cf
6 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/WebMasterPages/MAPO_refresh30.master
+15 -19
View File
@@ -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">