diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index d8b461f..810b780 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -163,7 +163,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/XPS/Web.config b/XPS/Web.config index 61b86d2..f88a2f4 100644 --- a/XPS/Web.config +++ b/XPS/Web.config @@ -1,32 +1,37 @@ - + -
-
+
+
- + +
+
+
+
+ - + - - - - - - + + + + + + - + - - - + + + @@ -55,7 +60,7 @@ Compression method is not suported by StorageMethod="Session" --> - + - + - - - - - - - - - + + + + + + + + + - + - + - + - - - + + + - + - + + + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - + - + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - - + + + - + - + - + + + + + - - + + + + + + - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/XPS/WebMasterPages/AjaxSearch.master b/XPS/WebMasterPages/AjaxSearch.master index ec3965d..854c912 100644 --- a/XPS/WebMasterPages/AjaxSearch.master +++ b/XPS/WebMasterPages/AjaxSearch.master @@ -15,52 +15,54 @@
- - - - - - - - - - - - -
-
- - - - - -
-
-
- - - - - - - - - - -
- - - -
- - -
-
-
-
-
- -
+ + + <%-- + --%> + + + + + + + + + + +
+
+ + + + + +
+
+
+ + + + + + + + + + +
+ + + +
+ + +
+
+
+
+
+ +
diff --git a/XPS/WebMasterPages/AjaxSearch.master.designer.cs b/XPS/WebMasterPages/AjaxSearch.master.designer.cs index 3cb21dd..0705ace 100644 --- a/XPS/WebMasterPages/AjaxSearch.master.designer.cs +++ b/XPS/WebMasterPages/AjaxSearch.master.designer.cs @@ -36,7 +36,7 @@ public partial class AjaxSearch { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// UpdatePanel1 control. diff --git a/XPS/WebMasterPages/AjaxSimple.master b/XPS/WebMasterPages/AjaxSimple.master index d0ebb28..43c80c1 100644 --- a/XPS/WebMasterPages/AjaxSimple.master +++ b/XPS/WebMasterPages/AjaxSimple.master @@ -12,25 +12,27 @@
- - -
- - - - - - - -
-
- - -
-
- -
-
+ + + <%-- + --%> +
+ + + + + + + +
+
+ + +
+
+ +
+
diff --git a/XPS/WebMasterPages/AjaxSimple.master.designer.cs b/XPS/WebMasterPages/AjaxSimple.master.designer.cs index 6be0291..2081124 100644 --- a/XPS/WebMasterPages/AjaxSimple.master.designer.cs +++ b/XPS/WebMasterPages/AjaxSimple.master.designer.cs @@ -27,7 +27,7 @@ public partial class AjaxSimple { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// ContentPlaceHolder1 control. diff --git a/XPS/WebMasterPages/AjaxSimpleUpload.master b/XPS/WebMasterPages/AjaxSimpleUpload.master index a554fb2..bac2c12 100644 --- a/XPS/WebMasterPages/AjaxSimpleUpload.master +++ b/XPS/WebMasterPages/AjaxSimpleUpload.master @@ -11,8 +11,10 @@
- - + + + <%-- + --%>
diff --git a/XPS/WebMasterPages/AjaxSimpleUpload.master.designer.cs b/XPS/WebMasterPages/AjaxSimpleUpload.master.designer.cs index 699486a..b09aaa0 100644 --- a/XPS/WebMasterPages/AjaxSimpleUpload.master.designer.cs +++ b/XPS/WebMasterPages/AjaxSimpleUpload.master.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -37,7 +36,7 @@ public partial class AjaxSimpleUpload { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// ContentPlaceHolder1 control. diff --git a/XPS/WebMasterPages/AjaxTitle.master b/XPS/WebMasterPages/AjaxTitle.master index bab4c2a..96634f0 100644 --- a/XPS/WebMasterPages/AjaxTitle.master +++ b/XPS/WebMasterPages/AjaxTitle.master @@ -15,52 +15,53 @@ - - -
- - - - - - - - - -
-
- - - - - -
-
-
- - - - - - - - - - -
- - -   -
- - -
-
-
-
-
- -
+ + + <%-- + --%> + + + + + + + + + + +
+
+ + + + + +
+
+
+ + + + + + + + + + +
+ +   +
+ + +
+
+
+
+
+ +
diff --git a/XPS/WebMasterPages/AjaxTitle.master.designer.cs b/XPS/WebMasterPages/AjaxTitle.master.designer.cs index a9e4bda..b643bb4 100644 --- a/XPS/WebMasterPages/AjaxTitle.master.designer.cs +++ b/XPS/WebMasterPages/AjaxTitle.master.designer.cs @@ -27,7 +27,7 @@ public partial class AjaxTitle { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// UpdatePanel1 control. diff --git a/XPS/WebMasterPages/MasterAjax.master b/XPS/WebMasterPages/MasterAjax.master index 9366342..04eefba 100644 --- a/XPS/WebMasterPages/MasterAjax.master +++ b/XPS/WebMasterPages/MasterAjax.master @@ -13,38 +13,40 @@
- - - - - - - - - - - - -
-
- - - - - -
-
-
- - - - - - -
-
- -
+ + + <%-- + --%> + + + + + + + + + + +
+
+ + + + + +
+
+
+ + + + + + +
+
+ +
diff --git a/XPS/WebMasterPages/MasterAjax.master.designer.cs b/XPS/WebMasterPages/MasterAjax.master.designer.cs index 4f1bd4c..dd33f24 100644 --- a/XPS/WebMasterPages/MasterAjax.master.designer.cs +++ b/XPS/WebMasterPages/MasterAjax.master.designer.cs @@ -36,7 +36,7 @@ public partial class MasterAjax { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// UpdatePanel1 control. diff --git a/XPS/WebUserControls/mod_menuTop.ascx.cs b/XPS/WebUserControls/mod_menuTop.ascx.cs index 7d6f987..80f06c1 100644 --- a/XPS/WebUserControls/mod_menuTop.ascx.cs +++ b/XPS/WebUserControls/mod_menuTop.ascx.cs @@ -73,23 +73,6 @@ namespace XPS.WebUserControls doFullDataUpdate(); memLayer.ML.emptySessionVal("doUpdateNow"); } -#if false - btnLogOut.Visible = user_std.UtSn.isForcedUser; - if (SteamWare.memLayer.ML.isInSessionObject("doUpdateNow")) - { - doFullDataUpdate(); - SteamWare.memLayer.ML.emptySessionVal("doUpdateNow"); - } - // se l'utente c'è... - if (devicesAuthProxy.stObj.isAuth && !Page.IsPostBack) - { - updateTreeMenu(); - } - if (!Page.IsPostBack) - { - _titleString = SteamWare.memLayer.ML.StringSessionObj("_titleString"); - } -#endif } /// /// verifica che la pagina sia tra quelle autorizzate x l'utente @@ -206,9 +189,6 @@ namespace XPS.WebUserControls protected void btnLogOut_Click(object sender, EventArgs e) { Session.Abandon(); -#if false - Response.Redirect("forceUser.aspx"); -#endif ResetUser(); } protected void btnUpdate_Click(object sender, EventArgs e) diff --git a/XPS/WebUserControls/mod_menuTopCompact.ascx b/XPS/WebUserControls/mod_menuTopCompact.ascx index a35fed2..ccddd92 100644 --- a/XPS/WebUserControls/mod_menuTopCompact.ascx +++ b/XPS/WebUserControls/mod_menuTopCompact.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="XPS.WebUserControls.mod_menuTopCompact" %> -
+
\ No newline at end of file diff --git a/XPS/WebUserControls/mod_menuTopCompact.ascx.designer.cs b/XPS/WebUserControls/mod_menuTopCompact.ascx.designer.cs index c9fd3e1..0a38688 100644 --- a/XPS/WebUserControls/mod_menuTopCompact.ascx.designer.cs +++ b/XPS/WebUserControls/mod_menuTopCompact.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/XPS/XPS.csproj b/XPS/XPS.csproj index b192dac..821be95 100644 --- a/XPS/XPS.csproj +++ b/XPS/XPS.csproj @@ -46,6 +46,7 @@ enabled + ..\packages\WebGrease.1.5.2\lib true @@ -72,12 +73,29 @@ false - - False - ..\packages\AjaxControlToolkit.4.1.60919\lib\35\AjaxControlToolkit.dll + + ..\packages\AjaxControlToolkit.16.1.1.0\lib\net40\AjaxControlToolkit.dll + True - - ..\packages\AjaxMin.4.78.4724.23869\lib\net35\AjaxMin.dll + + ..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll + True + + + ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll + True + + + ..\packages\AspNet.ScriptManager.jQuery.3.1.1\lib\net45\AspNet.ScriptManager.jQuery.dll + True + + + ..\packages\AspNet.ScriptManager.jQuery.UI.Combined.1.12.1\lib\net45\AspNet.ScriptManager.jQuery.UI.Combined.dll + True + + + ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll + True False @@ -91,8 +109,25 @@ ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll True - - ..\packages\AjaxControlToolkit.4.1.60919\lib\35\SanitizerProviders\SanitizerProviders.dll + + ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll + True + + + ..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll + True + + + ..\packages\Microsoft.AspNet.ScriptManager.WebForms.5.0.0\lib\net45\Microsoft.ScriptManager.WebForms.dll + True + + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll + True @@ -103,20 +138,70 @@ + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + True + + + ..\packages\WebGrease.1.5.2\lib\WebGrease.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,11 +326,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -283,6 +392,13 @@ barcode.aspx + + Bootstrap.Master + ASPXCodeBehind + + + Bootstrap.Master + chLang.aspx ASPXCodeBehind @@ -728,6 +844,13 @@ mod_selettore_ajax.ascx + + mod_testata.ascx + ASPXCodeBehind + + + mod_testata.ascx + mod_titlePortable.ascx ASPXCodeBehind @@ -854,6 +977,7 @@ +