Merge branch 'develop'

2020-01-10 16:19:07 +01:00
parent 2428ad766d cea540406b
commit 2f50d32ccc
78 changed files with 150 additions and 104 deletions
@@ -1,17 +1,3 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="NKC_WF.Home" %>
-
-<%@ Register Src="~/WebUserControls/cmp_homeButtons.ascx" TagPrefix="uc1" TagName="cmp_homeButtons" %>
-
-<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
-
-  <div class="jumbotron">
-    <h1>Sauder NKC</h1>
-    <p class="lead"><%: traduci("NkcPresentationText") %></p>
-    <p><a href="http://nkc.steamware.net/" class="btn btn-primary btn-lg" target="_blank"><%: traduci("LearnMore") %> &raquo;</a></p>
-  </div>
-  <div class="row">
-    <div class="col">
-      <uc1:cmp_homeButtons runat="server" ID="cmp_homeButtons" />
-    </div>
-  </div>
+<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="NKC_WF.Home1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
 </asp:Content>
@@ -7,11 +7,11 @@ using System.Web.UI.WebControls;

 namespace NKC_WF
 {
-  public partial class Home : BasePage
+  public partial class Home1 : System.Web.UI.Page
  {
    protected void Page_Load(object sender, EventArgs e)
    {
-
+      Response.Redirect("site/Default");
    }
  }
 }
@@ -1,26 +1,17 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
+// <auto-generated>
 //     Codice generato da uno strumento.
 //
 //     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     il codice viene rigenerato.
+// </auto-generated>
 //------------------------------------------------------------------------------

 namespace NKC_WF
 {


-  public partial class Home
+  public partial class Home1
  {
-
-    /// <summary>
-    /// Controllo cmp_homeButtons.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::NKC_WF.WebUserControls.cmp_homeButtons cmp_homeButtons;
  }
 }
@@ -11,7 +11,7 @@ namespace NKC_WF
  {
    protected void Page_Load(object sender, EventArgs e)
    {
-      Response.Redirect("Default.aspx");
+      Response.Redirect("site/Default");
    }
  }
 }
@@ -233,12 +233,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Content Include="About.aspx" />
+    <Content Include="Home.aspx" />
+    <Content Include="site\About.aspx" />
    <Content Include="App_Readme\Elmah.txt" />
    <Content Include="App_Readme\README_SteamWare.txt" />
    <Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
    <Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
-    <Content Include="Contact.aspx" />
+    <Content Include="site\Contact.aspx" />
    <Content Include="Content\bootstrap-grid.css" />
    <Content Include="Content\bootstrap-grid.min.css" />
    <Content Include="Content\bootstrap-reboot.css" />
@@ -259,9 +260,9 @@
    <Content Include="Content\SheetColor.min.css">
      <DependentUpon>SheetColor.css</DependentUpon>
    </Content>
-    <Content Include="DevUtils.aspx" />
-    <Content Include="ErrorsLog.aspx" />
-    <Content Include="Home.aspx" />
+    <Content Include="site\DevUtils.aspx" />
+    <Content Include="site\ErrorsLog.aspx" />
+    <Content Include="site\Home.aspx" />
    <Content Include="Images\MT0006110.jpg" />
    <Content Include="Images\test.svg" />
    <Content Include="Images\test_quadrato.svg" />
@@ -271,23 +272,23 @@
    <Content Include="Images\Test11.svg" />
    <Content Include="Images\WIP.png" />
    <Content Include="Index.aspx" />
-    <Content Include="KitRequestImporter.aspx" />
-    <Content Include="Kitting.aspx" />
-    <Content Include="Login.aspx" />
-    <Content Include="MachineLoad.aspx" />
-    <Content Include="MachineOffline.aspx" />
-    <Content Include="MachineUnload.aspx" />
-    <Content Include="MachineUnloadSmart.aspx" />
-    <Content Include="OrderManager.aspx" />
-    <Content Include="Painting.aspx" />
-    <Content Include="PartValidation.aspx" />
-    <Content Include="Reordering.aspx" />
-    <Content Include="SecondScreen.aspx" />
+    <Content Include="site\KitRequestImporter.aspx" />
+    <Content Include="site\Kitting.aspx" />
+    <Content Include="site\Login.aspx" />
+    <Content Include="site\MachineLoad.aspx" />
+    <Content Include="site\MachineOffline.aspx" />
+    <Content Include="site\MachineUnload.aspx" />
+    <Content Include="site\MachineUnloadSmart.aspx" />
+    <Content Include="site\OrderManager.aspx" />
+    <Content Include="site\Painting.aspx" />
+    <Content Include="site\PartValidation.aspx" />
+    <Content Include="site\Reordering.aspx" />
+    <Content Include="site\SecondScreen.aspx" />
    <Content Include="site\TestAuth.aspx" />
-    <Content Include="StackManager.aspx" />
-    <Content Include="SyncData.aspx" />
-    <Content Include="Unauth.aspx" />
-    <Content Include="Utility.aspx" />
+    <Content Include="site\StackManager.aspx" />
+    <Content Include="site\SyncData.aspx" />
+    <Content Include="site\Unauth.aspx" />
+    <Content Include="site\Utility.aspx" />
    <Content Include="WebUserControls\cmp_barcode.ascx" />
    <Content Include="WebUserControls\cmp_batchDetail.ascx" />
    <Content Include="WebUserControls\cmp_batchList.ascx" />
@@ -328,7 +329,7 @@
    <Content Include="Content\Site.min.css">
      <DependentUpon>Site.css</DependentUpon>
    </Content>
-    <Content Include="Default.aspx" />
+    <Content Include="site\Default.aspx" />
    <Content Include="favicon.ico" />
    <Content Include="fonts\fontawesome-webfont.svg" />
    <Content Include="Global.asax" />
@@ -354,8 +355,8 @@
    <Content Include="Scripts\esm\popper.js.map" />
    <Content Include="Scripts\esm\popper-utils.min.js.map" />
    <Content Include="Scripts\esm\popper-utils.js.map" />
-    <Content Include="UpdateVoc.aspx" />
-    <Content Include="vocabolario.aspx" />
+    <Content Include="site\UpdateVoc.aspx" />
+    <Content Include="site\vocabolario.aspx" />
    <Content Include="WebUserControls\cmp_footer.ascx" />
    <Content Include="WebUserControls\cmp_homeButtons.ascx" />
    <Content Include="WebUserControls\cmp_menuTop.ascx" />
@@ -426,11 +427,18 @@
      <Link>VersGen.cs</Link>
    </Compile>
    <Compile Include="App_Start\BundleConfig.cs" />
-    <Compile Include="About.aspx.cs">
+    <Compile Include="Home.aspx.cs">
+      <DependentUpon>Home.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Home.aspx.designer.cs">
+      <DependentUpon>Home.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="site\About.aspx.cs">
      <DependentUpon>About.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="About.aspx.designer.cs">
+    <Compile Include="site\About.aspx.designer.cs">
      <DependentUpon>About.aspx</DependentUpon>
    </Compile>
    <Compile Include="App_Start\FilterConfig.cs" />
@@ -442,11 +450,11 @@
    <Compile Include="BaseUserControl.cs">
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Contact.aspx.cs">
+    <Compile Include="site\Contact.aspx.cs">
      <DependentUpon>Contact.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Contact.aspx.designer.cs">
+    <Compile Include="site\Contact.aspx.designer.cs">
      <DependentUpon>Contact.aspx</DependentUpon>
    </Compile>
    <Compile Include="Controllers\BatchProcController.cs" />
@@ -454,35 +462,35 @@
    <Compile Include="Controllers\getMUCssController.cs" />
    <Compile Include="Controllers\BunkController.cs" />
    <Compile Include="Controllers\MaterialController.cs" />
-    <Compile Include="Default.aspx.cs">
+    <Compile Include="site\Default.aspx.cs">
      <DependentUpon>Default.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
+    <Compile Include="site\Default.aspx.designer.cs">
      <DependentUpon>Default.aspx</DependentUpon>
    </Compile>
-    <Compile Include="DevUtils.aspx.cs">
+    <Compile Include="site\DevUtils.aspx.cs">
      <DependentUpon>DevUtils.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="DevUtils.aspx.designer.cs">
+    <Compile Include="site\DevUtils.aspx.designer.cs">
      <DependentUpon>DevUtils.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ErrorsLog.aspx.cs">
+    <Compile Include="site\ErrorsLog.aspx.cs">
      <DependentUpon>ErrorsLog.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="ErrorsLog.aspx.designer.cs">
+    <Compile Include="site\ErrorsLog.aspx.designer.cs">
      <DependentUpon>ErrorsLog.aspx</DependentUpon>
    </Compile>
    <Compile Include="Global.asax.cs">
      <DependentUpon>Global.asax</DependentUpon>
    </Compile>
-    <Compile Include="Home.aspx.cs">
+    <Compile Include="site\Home.aspx.cs">
      <DependentUpon>Home.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Home.aspx.designer.cs">
+    <Compile Include="site\Home.aspx.designer.cs">
      <DependentUpon>Home.aspx</DependentUpon>
    </Compile>
    <Compile Include="Index.aspx.cs">
@@ -492,89 +500,89 @@
    <Compile Include="Index.aspx.designer.cs">
      <DependentUpon>Index.aspx</DependentUpon>
    </Compile>
-    <Compile Include="KitRequestImporter.aspx.cs">
+    <Compile Include="site\KitRequestImporter.aspx.cs">
      <DependentUpon>KitRequestImporter.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="KitRequestImporter.aspx.designer.cs">
+    <Compile Include="site\KitRequestImporter.aspx.designer.cs">
      <DependentUpon>KitRequestImporter.aspx</DependentUpon>
    </Compile>
-    <Compile Include="Kitting.aspx.cs">
+    <Compile Include="site\Kitting.aspx.cs">
      <DependentUpon>Kitting.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Kitting.aspx.designer.cs">
+    <Compile Include="site\Kitting.aspx.designer.cs">
      <DependentUpon>Kitting.aspx</DependentUpon>
    </Compile>
-    <Compile Include="Login.aspx.cs">
+    <Compile Include="site\Login.aspx.cs">
      <DependentUpon>Login.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Login.aspx.designer.cs">
+    <Compile Include="site\Login.aspx.designer.cs">
      <DependentUpon>Login.aspx</DependentUpon>
    </Compile>
-    <Compile Include="MachineLoad.aspx.cs">
+    <Compile Include="site\MachineLoad.aspx.cs">
      <DependentUpon>MachineLoad.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="MachineLoad.aspx.designer.cs">
+    <Compile Include="site\MachineLoad.aspx.designer.cs">
      <DependentUpon>MachineLoad.aspx</DependentUpon>
    </Compile>
-    <Compile Include="MachineOffline.aspx.cs">
+    <Compile Include="site\MachineOffline.aspx.cs">
      <DependentUpon>MachineOffline.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="MachineOffline.aspx.designer.cs">
+    <Compile Include="site\MachineOffline.aspx.designer.cs">
      <DependentUpon>MachineOffline.aspx</DependentUpon>
    </Compile>
-    <Compile Include="MachineUnload.aspx.cs">
+    <Compile Include="site\MachineUnload.aspx.cs">
      <DependentUpon>MachineUnload.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="MachineUnload.aspx.designer.cs">
+    <Compile Include="site\MachineUnload.aspx.designer.cs">
      <DependentUpon>MachineUnload.aspx</DependentUpon>
    </Compile>
-    <Compile Include="MachineUnloadSmart.aspx.cs">
+    <Compile Include="site\MachineUnloadSmart.aspx.cs">
      <DependentUpon>MachineUnloadSmart.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="MachineUnloadSmart.aspx.designer.cs">
+    <Compile Include="site\MachineUnloadSmart.aspx.designer.cs">
      <DependentUpon>MachineUnloadSmart.aspx</DependentUpon>
    </Compile>
-    <Compile Include="OrderManager.aspx.cs">
+    <Compile Include="site\OrderManager.aspx.cs">
      <DependentUpon>OrderManager.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="OrderManager.aspx.designer.cs">
+    <Compile Include="site\OrderManager.aspx.designer.cs">
      <DependentUpon>OrderManager.aspx</DependentUpon>
    </Compile>
-    <Compile Include="Painting.aspx.cs">
+    <Compile Include="site\Painting.aspx.cs">
      <DependentUpon>Painting.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Painting.aspx.designer.cs">
+    <Compile Include="site\Painting.aspx.designer.cs">
      <DependentUpon>Painting.aspx</DependentUpon>
    </Compile>
-    <Compile Include="PartValidation.aspx.cs">
+    <Compile Include="site\PartValidation.aspx.cs">
      <DependentUpon>PartValidation.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="PartValidation.aspx.designer.cs">
+    <Compile Include="site\PartValidation.aspx.designer.cs">
      <DependentUpon>PartValidation.aspx</DependentUpon>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reordering.aspx.cs">
+    <Compile Include="site\Reordering.aspx.cs">
      <DependentUpon>Reordering.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Reordering.aspx.designer.cs">
+    <Compile Include="site\Reordering.aspx.designer.cs">
      <DependentUpon>Reordering.aspx</DependentUpon>
    </Compile>
-    <Compile Include="SecondScreen.aspx.cs">
+    <Compile Include="site\SecondScreen.aspx.cs">
      <DependentUpon>SecondScreen.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="SecondScreen.aspx.designer.cs">
+    <Compile Include="site\SecondScreen.aspx.designer.cs">
      <DependentUpon>SecondScreen.aspx</DependentUpon>
    </Compile>
    <Compile Include="Site.Master.cs">
@@ -598,46 +606,46 @@
    <Compile Include="site\TestAuth.aspx.designer.cs">
      <DependentUpon>TestAuth.aspx</DependentUpon>
    </Compile>
-    <Compile Include="StackManager.aspx.cs">
+    <Compile Include="site\StackManager.aspx.cs">
      <DependentUpon>StackManager.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="StackManager.aspx.designer.cs">
+    <Compile Include="site\StackManager.aspx.designer.cs">
      <DependentUpon>StackManager.aspx</DependentUpon>
    </Compile>
-    <Compile Include="SyncData.aspx.cs">
+    <Compile Include="site\SyncData.aspx.cs">
      <DependentUpon>SyncData.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="SyncData.aspx.designer.cs">
+    <Compile Include="site\SyncData.aspx.designer.cs">
      <DependentUpon>SyncData.aspx</DependentUpon>
    </Compile>
-    <Compile Include="Unauth.aspx.cs">
+    <Compile Include="site\Unauth.aspx.cs">
      <DependentUpon>Unauth.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Unauth.aspx.designer.cs">
+    <Compile Include="site\Unauth.aspx.designer.cs">
      <DependentUpon>Unauth.aspx</DependentUpon>
    </Compile>
-    <Compile Include="UpdateVoc.aspx.cs">
+    <Compile Include="site\UpdateVoc.aspx.cs">
      <DependentUpon>UpdateVoc.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="UpdateVoc.aspx.designer.cs">
+    <Compile Include="site\UpdateVoc.aspx.designer.cs">
      <DependentUpon>UpdateVoc.aspx</DependentUpon>
    </Compile>
-    <Compile Include="Utility.aspx.cs">
+    <Compile Include="site\Utility.aspx.cs">
      <DependentUpon>Utility.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="Utility.aspx.designer.cs">
+    <Compile Include="site\Utility.aspx.designer.cs">
      <DependentUpon>Utility.aspx</DependentUpon>
    </Compile>
-    <Compile Include="vocabolario.aspx.cs">
+    <Compile Include="site\vocabolario.aspx.cs">
      <DependentUpon>vocabolario.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="vocabolario.aspx.designer.cs">
+    <Compile Include="site\vocabolario.aspx.designer.cs">
      <DependentUpon>vocabolario.aspx</DependentUpon>
    </Compile>
    <Compile Include="WebUserControls\cmp_barcode.ascx.cs">
@@ -42,6 +42,7 @@
    <add key="CodModulo" value="NKC"/>
    <add key="copyRight" value="Egaltech &amp; Steamware "/>
    <add key="authSenzaDominio" value="true"/>
+    <add key="_safePages" value="Test#Home#Default"/>
    <!--area logger-->
    <add key="_logDir" value="~/logs/"/>
    <add key="enableDumpDiag" value="false"/>
@@ -0,0 +1,17 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="NKC_WF.Home" %>
+
+<%@ Register Src="~/WebUserControls/cmp_homeButtons.ascx" TagPrefix="uc1" TagName="cmp_homeButtons" %>
+
+<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
+
+  <div class="jumbotron">
+    <h1>Sauder NKC</h1>
+    <p class="lead"><%: traduci("NkcPresentationText") %></p>
+    <p><a href="http://nkc.steamware.net/" class="btn btn-primary btn-lg" target="_blank"><%: traduci("LearnMore") %> &raquo;</a></p>
+  </div>
+  <div class="row">
+    <div class="col">
+      <uc1:cmp_homeButtons runat="server" ID="cmp_homeButtons" />
+    </div>
+  </div>
+</asp:Content>
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace NKC_WF
+{
+  public partial class Home : BasePage
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+  }
+}
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace NKC_WF
+{
+
+
+  public partial class Home
+  {
+
+    /// <summary>
+    /// Controllo cmp_homeButtons.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::NKC_WF.WebUserControls.cmp_homeButtons cmp_homeButtons;
+  }
+}