diff --git a/ETS-WS/ETS-WS.sln b/ETS-WS/ETS-WS.sln index 563c6d6..712bd0a 100644 --- a/ETS-WS/ETS-WS.sln +++ b/ETS-WS/ETS-WS.sln @@ -9,7 +9,6 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Test218|Any CPU = Test218|Any CPU WinLab|Any CPU = WinLab|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -17,18 +16,14 @@ Global {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Release|Any CPU.Build.0 = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Test218|Any CPU.ActiveCfg = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Test218|Any CPU.Build.0 = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.Build.0 = Release|Any CPU + {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.Build.0 = WinLab|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Release|Any CPU.Build.0 = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.Test218|Any CPU.ActiveCfg = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.Test218|Any CPU.Build.0 = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.Build.0 = Release|Any CPU + {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.Build.0 = WinLab|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index e77c1df..fa6ba47 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/Default.aspx b/ETS-WS/ETS-WS/Default.aspx index e8409d4..085a5ba 100644 --- a/ETS-WS/ETS-WS/Default.aspx +++ b/ETS-WS/ETS-WS/Default.aspx @@ -9,7 +9,6 @@
-
diff --git a/ETS-WS/ETS-WS/Default.aspx.cs b/ETS-WS/ETS-WS/Default.aspx.cs index 486c6ae..eaefee8 100644 --- a/ETS-WS/ETS-WS/Default.aspx.cs +++ b/ETS-WS/ETS-WS/Default.aspx.cs @@ -21,7 +21,7 @@ namespace ETS_WS utils.obj.setSessionVal("UserTempPath", string.Format("{0}/{1}", utils.obj.confReadString("tempUplDir"), utils.obj.currUser_FS)); } // rimando a gestione documenti - Response.Redirect("~/GestioneDocumenti.aspx"); + Response.Redirect("~/Menu.aspx"); } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index e9de8f5..7d7caf8 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -32,26 +32,39 @@ prompt 4 + + bin\ + TRACE + true + pdbonly + AnyCPU + bin\ETS-WS.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\AjaxControlToolkit.dll ..\packages\AjaxMin.4.59.4576.13504\lib\net20\AjaxMin.dll - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\HtmlAgilityPack.dll ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\SanitizerProviders.dll - - ..\packages\SCS.MenuExtender.2.0.1\lib\net40\SCS.MenuExtender.dll - @@ -69,6 +82,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always @@ -84,16 +151,18 @@ + - - - - + + + + + @@ -141,24 +210,20 @@ - Always - - - - - + + + + + Designer - - Web.config - Web.config @@ -167,6 +232,7 @@ + @@ -195,6 +261,20 @@ GestioneDocumenti.aspx + + Help.aspx + ASPXCodeBehind + + + Help.aspx + + + Menu.aspx + ASPXCodeBehind + + + Menu.aspx + ricerca.aspx @@ -259,6 +339,13 @@ mod_inputDati.ascx + + mod_menu.ascx + ASPXCodeBehind + + + mod_menu.ascx + mod_menuBottomFullpage.ascx ASPXCodeBehind @@ -297,10 +384,8 @@ - - - + @@ -311,6 +396,13 @@ Designer + + Web.config + + + Web.config + Designer + diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx b/ETS-WS/ETS-WS/GestioneDocumenti.aspx index fdca2f3..8254aa0 100644 --- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx +++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx @@ -7,14 +7,15 @@ <%@ Register Src="WebUserControls/mod_gestioneDati.ascx" TagName="mod_gestioneDati" TagPrefix="uc2" %> <%@ Register Src="WebUserControls/mod_fileUpload.ascx" TagName="mod_fileUpload" TagPrefix="uc3" %> - -
- -
+ +
+ + +
- +
-
+
diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 79ea9d3..faaf233 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + - + - - + + - + + - - + + diff --git a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master index 0570ade..e12b0f5 100644 --- a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master +++ b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master @@ -10,8 +10,13 @@ GMW - - + + + <%--Area jQuery & co--%> + <%-- +