Merge branch 'develop'

2012-10-08 18:49:55 +02:00
parent 6ab239d8d2 de4dce9f42
commit a250e5f38e
189 changed files with 26418 additions and 2147 deletions
@@ -13,3 +13,5 @@
 /ETS-WS/ETS-WS/logs/*.log

 *.suo
+
+/ETS_Data/obj/Release/*
@@ -52,22 +52,23 @@
    <ExcludeApp_Data>true</ExcludeApp_Data>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="AjaxControlToolkit, Version=4.1.60623.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AjaxControlToolkit.4.1.60623\lib\40\AjaxControlToolkit.dll</HintPath>
-    </Reference>
-    <Reference Include="AjaxMin, Version=4.67.4639.17277, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
+    <Reference Include="AjaxControlToolkit, Version=4.1.60919.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AjaxMin.4.67.4639.17289\lib\net40\AjaxMin.dll</HintPath>
+      <HintPath>..\packages\AjaxControlToolkit.4.1.60919\lib\40\AjaxControlToolkit.dll</HintPath>
+    </Reference>
+    <Reference Include="AjaxMin, Version=4.68.4663.23895, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\AjaxMin.4.68.4663.23906\lib\net40\AjaxMin.dll</HintPath>
    </Reference>
    <Reference Include="HtmlAgilityPack, Version=1.4.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\HtmlAgilityPack.dll</HintPath>
+      <HintPath>..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\HtmlAgilityPack.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog">
      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
    </Reference>
    <Reference Include="SanitizerProviders, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\SanitizerProviders.dll</HintPath>
+      <HintPath>..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\SanitizerProviders.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.DynamicData" />
    <Reference Include="System.Web.Entity" />
@@ -374,13 +375,15 @@
    <Content Include="Scripts\jquery-1.6.4-vsdoc.js" />
    <Content Include="Scripts\jquery-1.6.4.js" />
    <Content Include="Scripts\jquery-1.6.4.min.js" />
-    <Content Include="Scripts\jquery-1.8.1-vsdoc.js" />
-    <Content Include="Scripts\jquery-1.8.1.js" />
-    <Content Include="Scripts\jquery-1.8.1.min.js" />
+    <Content Include="Scripts\jquery-1.8.2-vsdoc.js" />
+    <Content Include="Scripts\jquery-1.8.2.js" />
+    <Content Include="Scripts\jquery-1.8.2.min.js" />
    <Content Include="Scripts\jquery-ui-1.8.23.js" />
    <Content Include="Scripts\jquery-ui-1.8.23.min.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="Scripts\jquery-ui-1.8.24.js" />
+    <Content Include="Scripts\jquery-ui-1.8.24.min.js" />
    <Content Include="Scripts\lmcbutton.js" />
    <Content Include="Scripts\lmcbutton.swf" />
    <Content Include="test.aspx" />
@@ -645,6 +648,9 @@
      <DependentUpon>Web.config</DependentUpon>
      <SubType>Designer</SubType>
    </Content>
+    <Content Include="Web.sitemap">
+      <SubType>Designer</SubType>
+    </Content>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\ETS_Data\ETS_Data.csproj">
@@ -4,59 +4,59 @@
  http://go.microsoft.com/fwlink/?LinkId=169433
  -->
 <configuration>
-    <system.web>
-        <compilation debug="true" targetFramework="4.0">
-            <assemblies>
-                <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-                <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-                <add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-            </assemblies>
-        </compilation>
-        <httpRuntime executionTimeout="240" maxRequestLength="32768" />
-        <pages>
-            <controls>
-                <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
-            </controls>
-        </pages>
-    </system.web>
-    <appSettings>
-        <!--config base applicazione-->
-        <add key="CodModulo" value="ETS-WS" />
-        <add key="_titoloPagina" value="ETS, gestione protocollo Web" />
-        <add key="titleApp" value="ETS-WS_titleApp" />
-        <add key="welcomeApp" value="ETS-WS_welcomeApp" />
-        <add key="appName" value="ETS-WS" />
-        <add key="SiteName" value="ETS" />
-        <add key="mainRev" value="0.8" />
-        <add key="minRev" value="74" />
-        <add key="copyRight" value="SteamWare, ETS © 2012" />
-        <add key="tempUplDir" value="~/TempUploads" />
-        <add key="archiveDir" value="~/ArchivioDocs" />
-        <!--area date-->
-        <add key="defDayFrom" value="-366"/>
-        <!--area controlli grid-->
-        <add key="srcPageSize" value="15"/>
-        <!--update pagina-->
-        <add key="intUpdatePagina_ms" value="120000" />
-        <!--config x WebServices autocompletamento-->
-        <add key="MinCharAutocomplete" value="2" />
-        <add key="MaxRowToDisplay" value="15" />
-        <!--gestione modalità update richiesta-->
-        <add key="instantUpdate" value="true" />
-        <!--area conf dataset classi esterne-->
-        <add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-        <add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
-    </appSettings>
-    <connectionStrings>
-        <add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
-        <add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
-    </connectionStrings>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.1.60623.0" newVersion="4.1.60623.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
+  <system.web>
+    <compilation debug="true" targetFramework="4.0">
+      <assemblies>
+        <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+      </assemblies>
+    </compilation>
+    <httpRuntime executionTimeout="240" maxRequestLength="32768" />
+    <pages>
+      <controls>
+        <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
+      </controls>
+    </pages>
+  </system.web>
+  <appSettings>
+    <!--config base applicazione-->
+    <add key="CodModulo" value="ETS-WS" />
+    <add key="_titoloPagina" value="ETS, gestione protocollo Web" />
+    <add key="titleApp" value="ETS-WS_titleApp" />
+    <add key="welcomeApp" value="ETS-WS_welcomeApp" />
+    <add key="appName" value="ETS-WS" />
+    <add key="SiteName" value="ETS" />
+    <add key="mainRev" value="0.8" />
+    <add key="minRev" value="78" />
+    <add key="copyRight" value="SteamWare, ETS © 2012" />
+    <add key="tempUplDir" value="~/TempUploads" />
+    <add key="archiveDir" value="~/ArchivioDocs" />
+    <!--area date-->
+    <add key="defDayFrom" value="-366" />
+    <!--area controlli grid-->
+    <add key="srcPageSize" value="15" />
+    <!--update pagina-->
+    <add key="intUpdatePagina_ms" value="120000" />
+    <!--config x WebServices autocompletamento-->
+    <add key="MinCharAutocomplete" value="2" />
+    <add key="MaxRowToDisplay" value="15" />
+    <!--gestione modalità update richiesta-->
+    <add key="instantUpdate" value="true" />
+    <!--area conf dataset classi esterne-->
+    <add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+    <add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+  </appSettings>
+  <connectionStrings>
+    <add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+    <add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
+  </connectionStrings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.60919.0" newVersion="4.1.60919.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" >
+    <siteMapNode url="Menu.aspx" title="Home"  description="ETS - WebScip">
+        <siteMapNode url="MyDocs.aspx" title="Upload"  description="Upload documenti ed editing" />
+        <siteMapNode url="GestioneDocumenti.aspx" title="Archivio"  description="Gestione Archivio Documenti" />
+        <siteMapNode url="Admin.aspx" title="Admin"  description="Area Admin">
+            <siteMapNode url="AnagFasi.aspx" title="Fasi"  description="Gestione Fasi" />
+            <siteMapNode url="AnagTags.aspx" title="Tags"  description="Gestione Tags" />
+
+        </siteMapNode>
+        <siteMapNode url="Help.aspx" title="Help"  description="Help Area" />
+    </siteMapNode>
+</siteMap>
@@ -85,12 +85,12 @@ namespace ETS_WS.WebUserControls
            {
                // pulizia char non ammessi...
                string commessa = utils.cleanPathName(tacCommesse.valore);
-                string fase = utils.cleanPathName(tacFasi.valore);
+                string fase = utils.cleanPathName(tacFasi.label);
                string fonte = utils.cleanPathName(tacFonti.label);
                DateTime dataDoc = DateTime.Now;
                try
                {
-                    dataDoc=Convert.ToDateTime(txtDataDoc.Text);
+                    dataDoc = Convert.ToDateTime(txtDataDoc.Text);
                }
                catch
                { }
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs"
-    Inherits="ETS_WS.WebUserControls.mod_testata" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_testata" %>
 <% if (false)
   { %>
 <link href="../css/BuildBlocks.css" rel="stylesheet" type="text/css" />
@@ -8,7 +7,7 @@
 <link href="../css/MasterPage.css" rel="stylesheet" type="text/css" />
 <link href="../css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
-<asp:HyperLink runat="server" ID="hlHome" NavigateUrl="~/Menu.aspx">
+<%--<asp:HyperLink runat="server" ID="hlHome" NavigateUrl="~/Menu.aspx">--%>
    <div class="divCenter areaTitolo">
        <div class="divSx fontPiccolo" style="padding: 20px 0px 2px 4px;">
            <asp:Label runat="server" ID="lblUser" />
@@ -23,4 +22,17 @@
            </b>
        </div>
    </div>
-</asp:HyperLink>
+<%--</asp:HyperLink>--%>
+<div class="divCenter">
+    <asp:Menu ID="Menu1" runat="server" DataSourceID="SiteMapDS" Orientation="Horizontal" RenderingMode="List" StaticDisplayLevels="2" Width="100%" BackColor="#B5C7DE" DynamicHorizontalOffset="2" 
+        Font-Size="1.5em" ForeColor="#284E98" StaticSubMenuIndent="10px">
+        <DynamicHoverStyle BackColor="#284E98" ForeColor="White" />
+        <DynamicMenuItemStyle HorizontalPadding="5px" VerticalPadding="2px" Width="200px" />
+        <DynamicMenuStyle BackColor="#B5C7DE" />
+        <DynamicSelectedStyle BackColor="#507CD1" />
+        <StaticHoverStyle BackColor="#284E98" ForeColor="White" />
+        <StaticMenuItemStyle VerticalPadding="2px" Width="200px" />
+        <StaticSelectedStyle BackColor="#507CD1" />
+    </asp:Menu>
+    <asp:SiteMapDataSource ID="SiteMapDS" runat="server" />
+</div>
@@ -12,15 +12,6 @@ namespace ETS_WS.WebUserControls {
    
    public partial class mod_testata {
        
-        /// <summary>
-        /// hlHome control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.HyperLink hlHome;
-        
        /// <summary>
        /// lblUser control.
        /// </summary>
@@ -56,5 +47,23 @@ namespace ETS_WS.WebUserControls {
        /// To modify move field declaration from designer file to code-behind file.
        /// </remarks>
        protected global::System.Web.UI.WebControls.Label lblTitolo;
+        
+        /// <summary>
+        /// Menu1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Menu Menu1;
+        
+        /// <summary>
+        /// SiteMapDS control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.SiteMapDataSource SiteMapDS;
    }
 }
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AjaxControlToolkit" version="4.1.60623" targetFramework="net40" />
-  <package id="AjaxMin" version="4.67.4639.17289" targetFramework="net40" />
-  <package id="jQuery" version="1.8.1" targetFramework="net40" />
-  <package id="jQuery.UI.Combined" version="1.8.23" targetFramework="net40" />
+  <package id="AjaxControlToolkit" version="4.1.60919" targetFramework="net40" />
+  <package id="AjaxMin" version="4.68.4663.23906" targetFramework="net40" />
+  <package id="jQuery" version="1.8.2" targetFramework="net40" />
+  <package id="jQuery.UI.Combined" version="1.8.24" targetFramework="net40" />
  <package id="NLog" version="2.0.0.2000" targetFramework="net40" />
  <package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
  <package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<configuration>
-  <system.web>
-    <pages>
-      <controls>
-        <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
-      </controls>
-    </pages>
-  </system.web>
-</configuration>
+<?xml version="1.0"?>
+<configuration>
+  <system.web>
+    <pages>
+      <controls>
+        <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
+      </controls>
+    </pages>
+  </system.web>
+</configuration>
@@ -0,0 +1,2 @@
+param($installPath, $toolsPath, $package, $project)
+   $project.Object.References | Where-Object { $_.Name -eq 'Microsoft.ScriptManager.MSAjax' } | ForEach-Object { $_.Remove() }  
--- a/Show More
+++ b/Show More