From bf56030185977d903e29735a593f4490028a42d1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Jan 2020 16:18:01 +0100 Subject: [PATCH 1/5] Spostsamento prime 3 pagine dentro subdir SITE --- NKC_WF/{ => site}/About.aspx | 0 NKC_WF/{ => site}/About.aspx.cs | 0 NKC_WF/{ => site}/About.aspx.designer.cs | 0 NKC_WF/{ => site}/Contact.aspx | 0 NKC_WF/{ => site}/Contact.aspx.cs | 0 NKC_WF/{ => site}/Contact.aspx.designer.cs | 0 NKC_WF/{ => site}/Default.aspx | 0 NKC_WF/{ => site}/Default.aspx.cs | 0 NKC_WF/{ => site}/Default.aspx.designer.cs | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename NKC_WF/{ => site}/About.aspx (100%) rename NKC_WF/{ => site}/About.aspx.cs (100%) rename NKC_WF/{ => site}/About.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Contact.aspx (100%) rename NKC_WF/{ => site}/Contact.aspx.cs (100%) rename NKC_WF/{ => site}/Contact.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Default.aspx (100%) rename NKC_WF/{ => site}/Default.aspx.cs (100%) rename NKC_WF/{ => site}/Default.aspx.designer.cs (100%) diff --git a/NKC_WF/About.aspx b/NKC_WF/site/About.aspx similarity index 100% rename from NKC_WF/About.aspx rename to NKC_WF/site/About.aspx diff --git a/NKC_WF/About.aspx.cs b/NKC_WF/site/About.aspx.cs similarity index 100% rename from NKC_WF/About.aspx.cs rename to NKC_WF/site/About.aspx.cs diff --git a/NKC_WF/About.aspx.designer.cs b/NKC_WF/site/About.aspx.designer.cs similarity index 100% rename from NKC_WF/About.aspx.designer.cs rename to NKC_WF/site/About.aspx.designer.cs diff --git a/NKC_WF/Contact.aspx b/NKC_WF/site/Contact.aspx similarity index 100% rename from NKC_WF/Contact.aspx rename to NKC_WF/site/Contact.aspx diff --git a/NKC_WF/Contact.aspx.cs b/NKC_WF/site/Contact.aspx.cs similarity index 100% rename from NKC_WF/Contact.aspx.cs rename to NKC_WF/site/Contact.aspx.cs diff --git a/NKC_WF/Contact.aspx.designer.cs b/NKC_WF/site/Contact.aspx.designer.cs similarity index 100% rename from NKC_WF/Contact.aspx.designer.cs rename to NKC_WF/site/Contact.aspx.designer.cs diff --git a/NKC_WF/Default.aspx b/NKC_WF/site/Default.aspx similarity index 100% rename from NKC_WF/Default.aspx rename to NKC_WF/site/Default.aspx diff --git a/NKC_WF/Default.aspx.cs b/NKC_WF/site/Default.aspx.cs similarity index 100% rename from NKC_WF/Default.aspx.cs rename to NKC_WF/site/Default.aspx.cs diff --git a/NKC_WF/Default.aspx.designer.cs b/NKC_WF/site/Default.aspx.designer.cs similarity index 100% rename from NKC_WF/Default.aspx.designer.cs rename to NKC_WF/site/Default.aspx.designer.cs From 8dd42c3328d85ef131c10fff7340cb4611d11e88 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Jan 2020 16:18:21 +0100 Subject: [PATCH 2/5] Continua spostamento pagine in subdir --- NKC_WF/{ => site}/DevUtils.aspx | 0 NKC_WF/{ => site}/DevUtils.aspx.cs | 0 NKC_WF/{ => site}/DevUtils.aspx.designer.cs | 0 NKC_WF/{ => site}/ErrorsLog.aspx | 0 NKC_WF/{ => site}/ErrorsLog.aspx.cs | 0 NKC_WF/{ => site}/ErrorsLog.aspx.designer.cs | 0 NKC_WF/site/Home.aspx | 17 ++++++++++++ NKC_WF/site/Home.aspx.cs | 17 ++++++++++++ NKC_WF/site/Home.aspx.designer.cs | 26 +++++++++++++++++++ NKC_WF/{ => site}/KitRequestImporter.aspx | 0 NKC_WF/{ => site}/KitRequestImporter.aspx.cs | 0 .../KitRequestImporter.aspx.designer.cs | 0 12 files changed, 60 insertions(+) rename NKC_WF/{ => site}/DevUtils.aspx (100%) rename NKC_WF/{ => site}/DevUtils.aspx.cs (100%) rename NKC_WF/{ => site}/DevUtils.aspx.designer.cs (100%) rename NKC_WF/{ => site}/ErrorsLog.aspx (100%) rename NKC_WF/{ => site}/ErrorsLog.aspx.cs (100%) rename NKC_WF/{ => site}/ErrorsLog.aspx.designer.cs (100%) create mode 100644 NKC_WF/site/Home.aspx create mode 100644 NKC_WF/site/Home.aspx.cs create mode 100644 NKC_WF/site/Home.aspx.designer.cs rename NKC_WF/{ => site}/KitRequestImporter.aspx (100%) rename NKC_WF/{ => site}/KitRequestImporter.aspx.cs (100%) rename NKC_WF/{ => site}/KitRequestImporter.aspx.designer.cs (100%) diff --git a/NKC_WF/DevUtils.aspx b/NKC_WF/site/DevUtils.aspx similarity index 100% rename from NKC_WF/DevUtils.aspx rename to NKC_WF/site/DevUtils.aspx diff --git a/NKC_WF/DevUtils.aspx.cs b/NKC_WF/site/DevUtils.aspx.cs similarity index 100% rename from NKC_WF/DevUtils.aspx.cs rename to NKC_WF/site/DevUtils.aspx.cs diff --git a/NKC_WF/DevUtils.aspx.designer.cs b/NKC_WF/site/DevUtils.aspx.designer.cs similarity index 100% rename from NKC_WF/DevUtils.aspx.designer.cs rename to NKC_WF/site/DevUtils.aspx.designer.cs diff --git a/NKC_WF/ErrorsLog.aspx b/NKC_WF/site/ErrorsLog.aspx similarity index 100% rename from NKC_WF/ErrorsLog.aspx rename to NKC_WF/site/ErrorsLog.aspx diff --git a/NKC_WF/ErrorsLog.aspx.cs b/NKC_WF/site/ErrorsLog.aspx.cs similarity index 100% rename from NKC_WF/ErrorsLog.aspx.cs rename to NKC_WF/site/ErrorsLog.aspx.cs diff --git a/NKC_WF/ErrorsLog.aspx.designer.cs b/NKC_WF/site/ErrorsLog.aspx.designer.cs similarity index 100% rename from NKC_WF/ErrorsLog.aspx.designer.cs rename to NKC_WF/site/ErrorsLog.aspx.designer.cs diff --git a/NKC_WF/site/Home.aspx b/NKC_WF/site/Home.aspx new file mode 100644 index 0000000..739ab9c --- /dev/null +++ b/NKC_WF/site/Home.aspx @@ -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" %> + + + +
+

Sauder NKC

+

<%: traduci("NkcPresentationText") %>

+

<%: traduci("LearnMore") %> »

+
+
+
+ +
+
+
diff --git a/NKC_WF/site/Home.aspx.cs b/NKC_WF/site/Home.aspx.cs new file mode 100644 index 0000000..1b28680 --- /dev/null +++ b/NKC_WF/site/Home.aspx.cs @@ -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) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/Home.aspx.designer.cs b/NKC_WF/site/Home.aspx.designer.cs new file mode 100644 index 0000000..bc12280 --- /dev/null +++ b/NKC_WF/site/Home.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF +{ + + + public partial class Home + { + + /// + /// Controllo cmp_homeButtons. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_homeButtons cmp_homeButtons; + } +} diff --git a/NKC_WF/KitRequestImporter.aspx b/NKC_WF/site/KitRequestImporter.aspx similarity index 100% rename from NKC_WF/KitRequestImporter.aspx rename to NKC_WF/site/KitRequestImporter.aspx diff --git a/NKC_WF/KitRequestImporter.aspx.cs b/NKC_WF/site/KitRequestImporter.aspx.cs similarity index 100% rename from NKC_WF/KitRequestImporter.aspx.cs rename to NKC_WF/site/KitRequestImporter.aspx.cs diff --git a/NKC_WF/KitRequestImporter.aspx.designer.cs b/NKC_WF/site/KitRequestImporter.aspx.designer.cs similarity index 100% rename from NKC_WF/KitRequestImporter.aspx.designer.cs rename to NKC_WF/site/KitRequestImporter.aspx.designer.cs From 23ed13cf8f8ca162b3e8a5e8b0585c886865dafa Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Jan 2020 16:18:36 +0100 Subject: [PATCH 3/5] Completato spostamento pagine subdir --- NKC_WF/{ => site}/Kitting.aspx | 0 NKC_WF/{ => site}/Kitting.aspx.cs | 0 NKC_WF/{ => site}/Kitting.aspx.designer.cs | 0 NKC_WF/{ => site}/Login.aspx | 0 NKC_WF/{ => site}/Login.aspx.cs | 0 NKC_WF/{ => site}/Login.aspx.designer.cs | 0 NKC_WF/{ => site}/MachineLoad.aspx | 0 NKC_WF/{ => site}/MachineLoad.aspx.cs | 0 NKC_WF/{ => site}/MachineLoad.aspx.designer.cs | 0 NKC_WF/{ => site}/MachineOffline.aspx | 0 NKC_WF/{ => site}/MachineOffline.aspx.cs | 0 NKC_WF/{ => site}/MachineOffline.aspx.designer.cs | 0 NKC_WF/{ => site}/MachineUnload.aspx | 0 NKC_WF/{ => site}/MachineUnload.aspx.cs | 0 NKC_WF/{ => site}/MachineUnload.aspx.designer.cs | 0 NKC_WF/{ => site}/MachineUnloadSmart.aspx | 0 NKC_WF/{ => site}/MachineUnloadSmart.aspx.cs | 0 NKC_WF/{ => site}/MachineUnloadSmart.aspx.designer.cs | 0 NKC_WF/{ => site}/OrderManager.aspx | 0 NKC_WF/{ => site}/OrderManager.aspx.cs | 0 NKC_WF/{ => site}/OrderManager.aspx.designer.cs | 0 NKC_WF/{ => site}/Painting.aspx | 0 NKC_WF/{ => site}/Painting.aspx.cs | 0 NKC_WF/{ => site}/Painting.aspx.designer.cs | 0 NKC_WF/{ => site}/PartValidation.aspx | 0 NKC_WF/{ => site}/PartValidation.aspx.cs | 0 NKC_WF/{ => site}/PartValidation.aspx.designer.cs | 0 NKC_WF/{ => site}/Reordering.aspx | 0 NKC_WF/{ => site}/Reordering.aspx.cs | 0 NKC_WF/{ => site}/Reordering.aspx.designer.cs | 0 NKC_WF/{ => site}/SecondScreen.aspx | 0 NKC_WF/{ => site}/SecondScreen.aspx.cs | 0 NKC_WF/{ => site}/SecondScreen.aspx.designer.cs | 0 NKC_WF/{ => site}/StackManager.aspx | 0 NKC_WF/{ => site}/StackManager.aspx.cs | 0 NKC_WF/{ => site}/StackManager.aspx.designer.cs | 0 NKC_WF/{ => site}/SyncData.aspx | 0 NKC_WF/{ => site}/SyncData.aspx.cs | 0 NKC_WF/{ => site}/SyncData.aspx.designer.cs | 0 NKC_WF/{ => site}/Unauth.aspx | 0 NKC_WF/{ => site}/Unauth.aspx.cs | 0 NKC_WF/{ => site}/Unauth.aspx.designer.cs | 0 NKC_WF/{ => site}/UpdateVoc.aspx | 0 NKC_WF/{ => site}/UpdateVoc.aspx.cs | 0 NKC_WF/{ => site}/UpdateVoc.aspx.designer.cs | 0 NKC_WF/{ => site}/Utility.aspx | 0 NKC_WF/{ => site}/Utility.aspx.cs | 0 NKC_WF/{ => site}/Utility.aspx.designer.cs | 0 NKC_WF/{ => site}/vocabolario.aspx | 0 NKC_WF/{ => site}/vocabolario.aspx.cs | 0 NKC_WF/{ => site}/vocabolario.aspx.designer.cs | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename NKC_WF/{ => site}/Kitting.aspx (100%) rename NKC_WF/{ => site}/Kitting.aspx.cs (100%) rename NKC_WF/{ => site}/Kitting.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Login.aspx (100%) rename NKC_WF/{ => site}/Login.aspx.cs (100%) rename NKC_WF/{ => site}/Login.aspx.designer.cs (100%) rename NKC_WF/{ => site}/MachineLoad.aspx (100%) rename NKC_WF/{ => site}/MachineLoad.aspx.cs (100%) rename NKC_WF/{ => site}/MachineLoad.aspx.designer.cs (100%) rename NKC_WF/{ => site}/MachineOffline.aspx (100%) rename NKC_WF/{ => site}/MachineOffline.aspx.cs (100%) rename NKC_WF/{ => site}/MachineOffline.aspx.designer.cs (100%) rename NKC_WF/{ => site}/MachineUnload.aspx (100%) rename NKC_WF/{ => site}/MachineUnload.aspx.cs (100%) rename NKC_WF/{ => site}/MachineUnload.aspx.designer.cs (100%) rename NKC_WF/{ => site}/MachineUnloadSmart.aspx (100%) rename NKC_WF/{ => site}/MachineUnloadSmart.aspx.cs (100%) rename NKC_WF/{ => site}/MachineUnloadSmart.aspx.designer.cs (100%) rename NKC_WF/{ => site}/OrderManager.aspx (100%) rename NKC_WF/{ => site}/OrderManager.aspx.cs (100%) rename NKC_WF/{ => site}/OrderManager.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Painting.aspx (100%) rename NKC_WF/{ => site}/Painting.aspx.cs (100%) rename NKC_WF/{ => site}/Painting.aspx.designer.cs (100%) rename NKC_WF/{ => site}/PartValidation.aspx (100%) rename NKC_WF/{ => site}/PartValidation.aspx.cs (100%) rename NKC_WF/{ => site}/PartValidation.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Reordering.aspx (100%) rename NKC_WF/{ => site}/Reordering.aspx.cs (100%) rename NKC_WF/{ => site}/Reordering.aspx.designer.cs (100%) rename NKC_WF/{ => site}/SecondScreen.aspx (100%) rename NKC_WF/{ => site}/SecondScreen.aspx.cs (100%) rename NKC_WF/{ => site}/SecondScreen.aspx.designer.cs (100%) rename NKC_WF/{ => site}/StackManager.aspx (100%) rename NKC_WF/{ => site}/StackManager.aspx.cs (100%) rename NKC_WF/{ => site}/StackManager.aspx.designer.cs (100%) rename NKC_WF/{ => site}/SyncData.aspx (100%) rename NKC_WF/{ => site}/SyncData.aspx.cs (100%) rename NKC_WF/{ => site}/SyncData.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Unauth.aspx (100%) rename NKC_WF/{ => site}/Unauth.aspx.cs (100%) rename NKC_WF/{ => site}/Unauth.aspx.designer.cs (100%) rename NKC_WF/{ => site}/UpdateVoc.aspx (100%) rename NKC_WF/{ => site}/UpdateVoc.aspx.cs (100%) rename NKC_WF/{ => site}/UpdateVoc.aspx.designer.cs (100%) rename NKC_WF/{ => site}/Utility.aspx (100%) rename NKC_WF/{ => site}/Utility.aspx.cs (100%) rename NKC_WF/{ => site}/Utility.aspx.designer.cs (100%) rename NKC_WF/{ => site}/vocabolario.aspx (100%) rename NKC_WF/{ => site}/vocabolario.aspx.cs (100%) rename NKC_WF/{ => site}/vocabolario.aspx.designer.cs (100%) diff --git a/NKC_WF/Kitting.aspx b/NKC_WF/site/Kitting.aspx similarity index 100% rename from NKC_WF/Kitting.aspx rename to NKC_WF/site/Kitting.aspx diff --git a/NKC_WF/Kitting.aspx.cs b/NKC_WF/site/Kitting.aspx.cs similarity index 100% rename from NKC_WF/Kitting.aspx.cs rename to NKC_WF/site/Kitting.aspx.cs diff --git a/NKC_WF/Kitting.aspx.designer.cs b/NKC_WF/site/Kitting.aspx.designer.cs similarity index 100% rename from NKC_WF/Kitting.aspx.designer.cs rename to NKC_WF/site/Kitting.aspx.designer.cs diff --git a/NKC_WF/Login.aspx b/NKC_WF/site/Login.aspx similarity index 100% rename from NKC_WF/Login.aspx rename to NKC_WF/site/Login.aspx diff --git a/NKC_WF/Login.aspx.cs b/NKC_WF/site/Login.aspx.cs similarity index 100% rename from NKC_WF/Login.aspx.cs rename to NKC_WF/site/Login.aspx.cs diff --git a/NKC_WF/Login.aspx.designer.cs b/NKC_WF/site/Login.aspx.designer.cs similarity index 100% rename from NKC_WF/Login.aspx.designer.cs rename to NKC_WF/site/Login.aspx.designer.cs diff --git a/NKC_WF/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx similarity index 100% rename from NKC_WF/MachineLoad.aspx rename to NKC_WF/site/MachineLoad.aspx diff --git a/NKC_WF/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs similarity index 100% rename from NKC_WF/MachineLoad.aspx.cs rename to NKC_WF/site/MachineLoad.aspx.cs diff --git a/NKC_WF/MachineLoad.aspx.designer.cs b/NKC_WF/site/MachineLoad.aspx.designer.cs similarity index 100% rename from NKC_WF/MachineLoad.aspx.designer.cs rename to NKC_WF/site/MachineLoad.aspx.designer.cs diff --git a/NKC_WF/MachineOffline.aspx b/NKC_WF/site/MachineOffline.aspx similarity index 100% rename from NKC_WF/MachineOffline.aspx rename to NKC_WF/site/MachineOffline.aspx diff --git a/NKC_WF/MachineOffline.aspx.cs b/NKC_WF/site/MachineOffline.aspx.cs similarity index 100% rename from NKC_WF/MachineOffline.aspx.cs rename to NKC_WF/site/MachineOffline.aspx.cs diff --git a/NKC_WF/MachineOffline.aspx.designer.cs b/NKC_WF/site/MachineOffline.aspx.designer.cs similarity index 100% rename from NKC_WF/MachineOffline.aspx.designer.cs rename to NKC_WF/site/MachineOffline.aspx.designer.cs diff --git a/NKC_WF/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx similarity index 100% rename from NKC_WF/MachineUnload.aspx rename to NKC_WF/site/MachineUnload.aspx diff --git a/NKC_WF/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs similarity index 100% rename from NKC_WF/MachineUnload.aspx.cs rename to NKC_WF/site/MachineUnload.aspx.cs diff --git a/NKC_WF/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs similarity index 100% rename from NKC_WF/MachineUnload.aspx.designer.cs rename to NKC_WF/site/MachineUnload.aspx.designer.cs diff --git a/NKC_WF/MachineUnloadSmart.aspx b/NKC_WF/site/MachineUnloadSmart.aspx similarity index 100% rename from NKC_WF/MachineUnloadSmart.aspx rename to NKC_WF/site/MachineUnloadSmart.aspx diff --git a/NKC_WF/MachineUnloadSmart.aspx.cs b/NKC_WF/site/MachineUnloadSmart.aspx.cs similarity index 100% rename from NKC_WF/MachineUnloadSmart.aspx.cs rename to NKC_WF/site/MachineUnloadSmart.aspx.cs diff --git a/NKC_WF/MachineUnloadSmart.aspx.designer.cs b/NKC_WF/site/MachineUnloadSmart.aspx.designer.cs similarity index 100% rename from NKC_WF/MachineUnloadSmart.aspx.designer.cs rename to NKC_WF/site/MachineUnloadSmart.aspx.designer.cs diff --git a/NKC_WF/OrderManager.aspx b/NKC_WF/site/OrderManager.aspx similarity index 100% rename from NKC_WF/OrderManager.aspx rename to NKC_WF/site/OrderManager.aspx diff --git a/NKC_WF/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs similarity index 100% rename from NKC_WF/OrderManager.aspx.cs rename to NKC_WF/site/OrderManager.aspx.cs diff --git a/NKC_WF/OrderManager.aspx.designer.cs b/NKC_WF/site/OrderManager.aspx.designer.cs similarity index 100% rename from NKC_WF/OrderManager.aspx.designer.cs rename to NKC_WF/site/OrderManager.aspx.designer.cs diff --git a/NKC_WF/Painting.aspx b/NKC_WF/site/Painting.aspx similarity index 100% rename from NKC_WF/Painting.aspx rename to NKC_WF/site/Painting.aspx diff --git a/NKC_WF/Painting.aspx.cs b/NKC_WF/site/Painting.aspx.cs similarity index 100% rename from NKC_WF/Painting.aspx.cs rename to NKC_WF/site/Painting.aspx.cs diff --git a/NKC_WF/Painting.aspx.designer.cs b/NKC_WF/site/Painting.aspx.designer.cs similarity index 100% rename from NKC_WF/Painting.aspx.designer.cs rename to NKC_WF/site/Painting.aspx.designer.cs diff --git a/NKC_WF/PartValidation.aspx b/NKC_WF/site/PartValidation.aspx similarity index 100% rename from NKC_WF/PartValidation.aspx rename to NKC_WF/site/PartValidation.aspx diff --git a/NKC_WF/PartValidation.aspx.cs b/NKC_WF/site/PartValidation.aspx.cs similarity index 100% rename from NKC_WF/PartValidation.aspx.cs rename to NKC_WF/site/PartValidation.aspx.cs diff --git a/NKC_WF/PartValidation.aspx.designer.cs b/NKC_WF/site/PartValidation.aspx.designer.cs similarity index 100% rename from NKC_WF/PartValidation.aspx.designer.cs rename to NKC_WF/site/PartValidation.aspx.designer.cs diff --git a/NKC_WF/Reordering.aspx b/NKC_WF/site/Reordering.aspx similarity index 100% rename from NKC_WF/Reordering.aspx rename to NKC_WF/site/Reordering.aspx diff --git a/NKC_WF/Reordering.aspx.cs b/NKC_WF/site/Reordering.aspx.cs similarity index 100% rename from NKC_WF/Reordering.aspx.cs rename to NKC_WF/site/Reordering.aspx.cs diff --git a/NKC_WF/Reordering.aspx.designer.cs b/NKC_WF/site/Reordering.aspx.designer.cs similarity index 100% rename from NKC_WF/Reordering.aspx.designer.cs rename to NKC_WF/site/Reordering.aspx.designer.cs diff --git a/NKC_WF/SecondScreen.aspx b/NKC_WF/site/SecondScreen.aspx similarity index 100% rename from NKC_WF/SecondScreen.aspx rename to NKC_WF/site/SecondScreen.aspx diff --git a/NKC_WF/SecondScreen.aspx.cs b/NKC_WF/site/SecondScreen.aspx.cs similarity index 100% rename from NKC_WF/SecondScreen.aspx.cs rename to NKC_WF/site/SecondScreen.aspx.cs diff --git a/NKC_WF/SecondScreen.aspx.designer.cs b/NKC_WF/site/SecondScreen.aspx.designer.cs similarity index 100% rename from NKC_WF/SecondScreen.aspx.designer.cs rename to NKC_WF/site/SecondScreen.aspx.designer.cs diff --git a/NKC_WF/StackManager.aspx b/NKC_WF/site/StackManager.aspx similarity index 100% rename from NKC_WF/StackManager.aspx rename to NKC_WF/site/StackManager.aspx diff --git a/NKC_WF/StackManager.aspx.cs b/NKC_WF/site/StackManager.aspx.cs similarity index 100% rename from NKC_WF/StackManager.aspx.cs rename to NKC_WF/site/StackManager.aspx.cs diff --git a/NKC_WF/StackManager.aspx.designer.cs b/NKC_WF/site/StackManager.aspx.designer.cs similarity index 100% rename from NKC_WF/StackManager.aspx.designer.cs rename to NKC_WF/site/StackManager.aspx.designer.cs diff --git a/NKC_WF/SyncData.aspx b/NKC_WF/site/SyncData.aspx similarity index 100% rename from NKC_WF/SyncData.aspx rename to NKC_WF/site/SyncData.aspx diff --git a/NKC_WF/SyncData.aspx.cs b/NKC_WF/site/SyncData.aspx.cs similarity index 100% rename from NKC_WF/SyncData.aspx.cs rename to NKC_WF/site/SyncData.aspx.cs diff --git a/NKC_WF/SyncData.aspx.designer.cs b/NKC_WF/site/SyncData.aspx.designer.cs similarity index 100% rename from NKC_WF/SyncData.aspx.designer.cs rename to NKC_WF/site/SyncData.aspx.designer.cs diff --git a/NKC_WF/Unauth.aspx b/NKC_WF/site/Unauth.aspx similarity index 100% rename from NKC_WF/Unauth.aspx rename to NKC_WF/site/Unauth.aspx diff --git a/NKC_WF/Unauth.aspx.cs b/NKC_WF/site/Unauth.aspx.cs similarity index 100% rename from NKC_WF/Unauth.aspx.cs rename to NKC_WF/site/Unauth.aspx.cs diff --git a/NKC_WF/Unauth.aspx.designer.cs b/NKC_WF/site/Unauth.aspx.designer.cs similarity index 100% rename from NKC_WF/Unauth.aspx.designer.cs rename to NKC_WF/site/Unauth.aspx.designer.cs diff --git a/NKC_WF/UpdateVoc.aspx b/NKC_WF/site/UpdateVoc.aspx similarity index 100% rename from NKC_WF/UpdateVoc.aspx rename to NKC_WF/site/UpdateVoc.aspx diff --git a/NKC_WF/UpdateVoc.aspx.cs b/NKC_WF/site/UpdateVoc.aspx.cs similarity index 100% rename from NKC_WF/UpdateVoc.aspx.cs rename to NKC_WF/site/UpdateVoc.aspx.cs diff --git a/NKC_WF/UpdateVoc.aspx.designer.cs b/NKC_WF/site/UpdateVoc.aspx.designer.cs similarity index 100% rename from NKC_WF/UpdateVoc.aspx.designer.cs rename to NKC_WF/site/UpdateVoc.aspx.designer.cs diff --git a/NKC_WF/Utility.aspx b/NKC_WF/site/Utility.aspx similarity index 100% rename from NKC_WF/Utility.aspx rename to NKC_WF/site/Utility.aspx diff --git a/NKC_WF/Utility.aspx.cs b/NKC_WF/site/Utility.aspx.cs similarity index 100% rename from NKC_WF/Utility.aspx.cs rename to NKC_WF/site/Utility.aspx.cs diff --git a/NKC_WF/Utility.aspx.designer.cs b/NKC_WF/site/Utility.aspx.designer.cs similarity index 100% rename from NKC_WF/Utility.aspx.designer.cs rename to NKC_WF/site/Utility.aspx.designer.cs diff --git a/NKC_WF/vocabolario.aspx b/NKC_WF/site/vocabolario.aspx similarity index 100% rename from NKC_WF/vocabolario.aspx rename to NKC_WF/site/vocabolario.aspx diff --git a/NKC_WF/vocabolario.aspx.cs b/NKC_WF/site/vocabolario.aspx.cs similarity index 100% rename from NKC_WF/vocabolario.aspx.cs rename to NKC_WF/site/vocabolario.aspx.cs diff --git a/NKC_WF/vocabolario.aspx.designer.cs b/NKC_WF/site/vocabolario.aspx.designer.cs similarity index 100% rename from NKC_WF/vocabolario.aspx.designer.cs rename to NKC_WF/site/vocabolario.aspx.designer.cs From 5e46f1b9e1cc1d887dc89b227dba160d4eb38bb9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Jan 2020 16:18:53 +0100 Subject: [PATCH 4/5] Aggiunta safe pages --- NKC_WF/Web.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 04b5825..b0d5308 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -42,6 +42,7 @@ + From cea540406b024823ba772faf1fc4a707899ecdd1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Jan 2020 16:19:04 +0100 Subject: [PATCH 5/5] Fix redirect in subdir --- NKC_WF/Home.aspx | 18 +---- NKC_WF/Home.aspx.cs | 4 +- NKC_WF/Home.aspx.designer.cs | 17 +--- NKC_WF/Index.aspx.cs | 2 +- NKC_WF/NKC_WF.csproj | 152 ++++++++++++++++++----------------- 5 files changed, 89 insertions(+), 104 deletions(-) diff --git a/NKC_WF/Home.aspx b/NKC_WF/Home.aspx index 739ab9c..96d22e9 100644 --- a/NKC_WF/Home.aspx +++ b/NKC_WF/Home.aspx @@ -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" %> - - - -
-

Sauder NKC

-

<%: traduci("NkcPresentationText") %>

-

<%: traduci("LearnMore") %> »

-
-
-
- -
-
+<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="Home.aspx.cs" Inherits="NKC_WF.Home1" %> + diff --git a/NKC_WF/Home.aspx.cs b/NKC_WF/Home.aspx.cs index 1b28680..9c9d5ff 100644 --- a/NKC_WF/Home.aspx.cs +++ b/NKC_WF/Home.aspx.cs @@ -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"); } } } \ No newline at end of file diff --git a/NKC_WF/Home.aspx.designer.cs b/NKC_WF/Home.aspx.designer.cs index bc12280..a8013af 100644 --- a/NKC_WF/Home.aspx.designer.cs +++ b/NKC_WF/Home.aspx.designer.cs @@ -1,26 +1,17 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace NKC_WF { - public partial class Home + public partial class Home1 { - - /// - /// Controllo cmp_homeButtons. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_homeButtons cmp_homeButtons; } } diff --git a/NKC_WF/Index.aspx.cs b/NKC_WF/Index.aspx.cs index a43a614..71ca519 100644 --- a/NKC_WF/Index.aspx.cs +++ b/NKC_WF/Index.aspx.cs @@ -11,7 +11,7 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { - Response.Redirect("Default.aspx"); + Response.Redirect("site/Default"); } } } \ No newline at end of file diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 68cf291..2f46bcd 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -233,12 +233,13 @@ - + + - + @@ -259,9 +260,9 @@ SheetColor.css - - - + + + @@ -271,23 +272,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + @@ -328,7 +329,7 @@ Site.css - + @@ -354,8 +355,8 @@ - - + + @@ -426,11 +427,18 @@ VersGen.cs - + + Home.aspx + ASPXCodeBehind + + + Home.aspx + + About.aspx ASPXCodeBehind - + About.aspx @@ -442,11 +450,11 @@ ASPXCodeBehind - + Contact.aspx ASPXCodeBehind - + Contact.aspx @@ -454,35 +462,35 @@ - + Default.aspx ASPXCodeBehind - + Default.aspx - + DevUtils.aspx ASPXCodeBehind - + DevUtils.aspx - + ErrorsLog.aspx ASPXCodeBehind - + ErrorsLog.aspx Global.asax - + Home.aspx ASPXCodeBehind - + Home.aspx @@ -492,89 +500,89 @@ Index.aspx - + KitRequestImporter.aspx ASPXCodeBehind - + KitRequestImporter.aspx - + Kitting.aspx ASPXCodeBehind - + Kitting.aspx - + Login.aspx ASPXCodeBehind - + Login.aspx - + MachineLoad.aspx ASPXCodeBehind - + MachineLoad.aspx - + MachineOffline.aspx ASPXCodeBehind - + MachineOffline.aspx - + MachineUnload.aspx ASPXCodeBehind - + MachineUnload.aspx - + MachineUnloadSmart.aspx ASPXCodeBehind - + MachineUnloadSmart.aspx - + OrderManager.aspx ASPXCodeBehind - + OrderManager.aspx - + Painting.aspx ASPXCodeBehind - + Painting.aspx - + PartValidation.aspx ASPXCodeBehind - + PartValidation.aspx - + Reordering.aspx ASPXCodeBehind - + Reordering.aspx - + SecondScreen.aspx ASPXCodeBehind - + SecondScreen.aspx @@ -598,46 +606,46 @@ TestAuth.aspx - + StackManager.aspx ASPXCodeBehind - + StackManager.aspx - + SyncData.aspx ASPXCodeBehind - + SyncData.aspx - + Unauth.aspx ASPXCodeBehind - + Unauth.aspx - + UpdateVoc.aspx ASPXCodeBehind - + UpdateVoc.aspx - + Utility.aspx ASPXCodeBehind - + Utility.aspx - + vocabolario.aspx ASPXCodeBehind - + vocabolario.aspx