From e001f96288973dfd429c69dc0897bb144ae208dc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 7 Apr 2014 12:38:01 +0200 Subject: [PATCH] Pagina tablet RT accetta tutti i parametri richiesti e li mostra, compresi css, update dataora... --- GMW-RT/App_Start/BundleConfig.cs | 3 ++ GMW-RT/Bootstrap.Master | 14 ++++--- GMW-RT/Bootstrap.Master.designer.cs | 9 ----- GMW-RT/Broad.cs | 19 +++++++++- GMW-RT/ChatHub.cs | 17 +++++++++ GMW-RT/MBC.aspx.cs | 14 +++++++ GMW-RT/PostLiquidi.aspx | 56 ++++++++++++++++++++++------ GMW-RT/PostLiquidi.aspx.designer.cs | 24 ++++++------ GMW-RT/Web.config | 36 +++++++++++------- GMW-RT/bin/GMW-RT.dll | Bin 11776 -> 12800 bytes GMW-RT/bin/SteamWare.dll | Bin 498688 -> 498688 bytes GMW-RT/index.html | 1 + GMW/bin/GMW-RT.dll | Bin 11776 -> 12800 bytes GMW/bin/GMW.dll | Bin 644608 -> 645120 bytes GMW/bin/GMW_data.dll | Bin 2353664 -> 2353664 bytes GMW/bin/SteamWare.dll | Bin 498688 -> 498688 bytes 16 files changed, 142 insertions(+), 51 deletions(-) diff --git a/GMW-RT/App_Start/BundleConfig.cs b/GMW-RT/App_Start/BundleConfig.cs index 084c6496..9adada76 100644 --- a/GMW-RT/App_Start/BundleConfig.cs +++ b/GMW-RT/App_Start/BundleConfig.cs @@ -38,6 +38,9 @@ namespace GMW_RT bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( "~/Scripts/jquery-ui-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/signalR").Include( + "~/Scripts/jquery.signalR-{version}.js")); + //bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( // "~/Scripts/jquery.unobtrusive*", // "~/Scripts/jquery.validate*")); diff --git a/GMW-RT/Bootstrap.Master b/GMW-RT/Bootstrap.Master index 23caf05d..0f1ad0ba 100644 --- a/GMW-RT/Bootstrap.Master +++ b/GMW-RT/Bootstrap.Master @@ -18,6 +18,7 @@ <%: System.Web.Optimization.Scripts.Render("~/bundles/modernizr") %> <%: System.Web.Optimization.Scripts.Render("~/bundles/jquery") %> <%: System.Web.Optimization.Scripts.Render("~/bundles/jqueryui") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/signalR") %> @@ -54,7 +55,9 @@ GMW RealTime panel - +