rimesso scanner barcode
This commit is contained in:
@@ -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;
|
||||
|
||||
+2
-2
@@ -49,7 +49,7 @@
|
||||
<add key="downloadPath" value="c:\Steamware\installers\MP\TAB" />
|
||||
<add key="doShrinkFolder" value="true" />
|
||||
<add key="CodModulo" value="MoonPro" />
|
||||
<add key="EmbedQRead" value="false" />
|
||||
<add key="EmbedQRead" value="true" />
|
||||
<!--impostazione cambio tempo calcolato tra minuti-ore-gg-->
|
||||
<add key="maxMinuti" value="60" />
|
||||
<add key="maxOre" value="1440" />
|
||||
@@ -80,7 +80,7 @@
|
||||
<add key="dominio" value="Donati" />
|
||||
<add key="user" value="Mobile" />
|
||||
<add key="cookieDayExpire" value="3650" />
|
||||
<add key="safePages" value="Test#regNewDevice#UserList" />
|
||||
<add key="safePages" value="Test#regNewDevice" />
|
||||
<!--conf commenti e ricalcoli-->
|
||||
<add key="idxTipoCommento" value="999" />
|
||||
<add key="commEnableEditDel" value="true" />
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<%: Scripts.Render("~/bundles/jquery") %>
|
||||
<%: Scripts.Render("~/bundles/jqueryui") %>
|
||||
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
|
||||
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
|
||||
</asp:PlaceHolder>
|
||||
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
|
||||
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_QRScanner.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_QRScanner" %>
|
||||
|
||||
<script src="~/Scripts/instascan.min.js"></script>
|
||||
|
||||
<div class="row mt-3">
|
||||
<div class="col-12">
|
||||
<h3 class="text-center">QR SCanner</h3>
|
||||
|
||||
Reference in New Issue
Block a user