diff --git a/MP-TAB/App_Start/BundleConfig.cs b/MP-TAB/App_Start/BundleConfig.cs index 822442a4..e7d03cf0 100644 --- a/MP-TAB/App_Start/BundleConfig.cs +++ b/MP-TAB/App_Start/BundleConfig.cs @@ -40,14 +40,8 @@ namespace MoonProTablet bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include( "~/Scripts/bootstrap.bundle.js")); - //bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include( - // "~/Scripts/jquery-ui-i18n.min.js")); - - // aggiungo bundle dinamico x less --> css - //bundles.Add(new DynamicFolderBundle("less", "*.less")); - - // aggiungo bundle dinamico x coffee --> jscript - //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); + //bundles.Add(new ScriptBundle("~/bundles/instascan").Include( + // "~/Scripts/instascan.min.js")); // abilito boundle "forzato"! BundleTable.EnableOptimizations = true; diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index de1a6161..ebb0b9ff 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -49,7 +49,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master index 4fa5bc4e..028a1afe 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master +++ b/MP-TAB/WebMasterPages/Bootstrap.Master @@ -21,6 +21,7 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/BrowserWindowSize") %> + diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx b/MP-TAB/WebUserControls/mod_QRScanner.ascx index c5b3012c..02998b59 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx @@ -1,7 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_QRScanner.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_QRScanner" %> - -

QR SCanner