diff --git a/GPW_Barcode/App_Start/BundleConfig.cs b/GPW_Barcode/App_Start/BundleConfig.cs index d2cb3af..a16dcd7 100644 --- a/GPW_Barcode/App_Start/BundleConfig.cs +++ b/GPW_Barcode/App_Start/BundleConfig.cs @@ -36,17 +36,11 @@ namespace GPW_Barcode bundles.Add(new ScriptBundle("~/bundles/jquery").Include( "~/Scripts/jquery-{version}.js")); - - //bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include( - // "~/Scripts/jquery.mobile-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( "~/Scripts/jquery-ui-{version}.js")); - - //bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( - // "~/Scripts/jSteamware*")); - - + //// aggiungo bundle dinamico x less --> css //bundles.Add(new DynamicFolderBundle("less", "*.less")); diff --git a/GPW_Barcode/Barcode.aspx b/GPW_Barcode/Barcode.aspx index 1c31b7e..c7dd2e0 100644 --- a/GPW_Barcode/Barcode.aspx +++ b/GPW_Barcode/Barcode.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFullBCode.Master" AutoEventWireup="true" CodeBehind="Barcode.aspx.cs" Inherits="GPW.A2.Barcode" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFullBCode.Master" AutoEventWireup="true" CodeBehind="Barcode.aspx.cs" Inherits="GPW_Barcode.Barcode" %> <%@ Register src="~/WebUserControls/mod_bCodeTimb.ascx" tagname="mod_bCodeTimb" tagprefix="uc1" %> diff --git a/GPW_Barcode/Barcode.aspx.cs b/GPW_Barcode/Barcode.aspx.cs index 0c0db83..71a669f 100644 --- a/GPW_Barcode/Barcode.aspx.cs +++ b/GPW_Barcode/Barcode.aspx.cs @@ -6,7 +6,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using GPW_data; -namespace GPW.A2 +namespace GPW_Barcode { public partial class Barcode : System.Web.UI.Page { diff --git a/GPW_Barcode/Barcode.aspx.designer.cs b/GPW_Barcode/Barcode.aspx.designer.cs index 15cf9ac..d57e428 100644 --- a/GPW_Barcode/Barcode.aspx.designer.cs +++ b/GPW_Barcode/Barcode.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace GPW.A2 { +namespace GPW_Barcode { public partial class Barcode { diff --git a/GPW_Barcode/Bundle.config b/GPW_Barcode/Bundle.config index b314ee9..15f926c 100644 --- a/GPW_Barcode/Bundle.config +++ b/GPW_Barcode/Bundle.config @@ -36,9 +36,4 @@ --> - - - - - \ No newline at end of file diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 9920fa7..c1e645e 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -350,28 +350,6 @@ - - - - - - - - - - - - - - - - - - - - - - Site.less @@ -432,10 +410,6 @@ - - - - @@ -446,6 +420,7 @@ + @@ -468,7 +443,6 @@ - diff --git a/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master b/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master index 8e5c037..b6eb182 100644 --- a/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master +++ b/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master @@ -24,7 +24,6 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> - <%--<%: Scripts.Render("~/bundles/jSteamware") %>--%> @@ -32,26 +31,6 @@ - <%----%>
diff --git a/GPW_Barcode/logs/PlaceHolder.file b/GPW_Barcode/logs/PlaceHolder.file new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/GPW_Barcode/logs/PlaceHolder.file @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 23ea694..db2b08d 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ