- +

hello world!

Area main content da customizzare diff --git a/C2P/Bootstrap.Master.designer.cs b/C2P/Bootstrap.Master.designer.cs index 3ba0b50..e4114dc 100644 --- a/C2P/Bootstrap.Master.designer.cs +++ b/C2P/Bootstrap.Master.designer.cs @@ -31,13 +31,13 @@ namespace C2P { protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// HeadContent control. + /// Head control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder Head; /// /// form1 control. @@ -67,30 +67,21 @@ namespace C2P { protected global::C2P.WebUserControls.mod_testata mod_testata; /// - /// FeaturedContent control. + /// Featured control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder Featured; /// - /// btnLearnMore control. + /// Main control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton btnLearnMore; - - /// - /// MainContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder Main; } } diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 1904b4e..9019b1f 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -194,8 +194,8 @@ - - + + @@ -255,6 +255,8 @@ + + @@ -335,15 +337,22 @@ Default.aspx + + FullPage.master + ASPXCodeBehind + + + FullPage.master + Global.asax - - Help.aspx + + JumboPage.master ASPXCodeBehind - - Help.aspx + + JumboPage.master diff --git a/C2P/Default.aspx b/C2P/Default.aspx index 18bd2fc..507d950 100644 --- a/C2P/Default.aspx +++ b/C2P/Default.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="C2P._Default" %> +<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/JumboPage.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="C2P._Default" %> <%--
@@ -17,49 +17,49 @@
-
-
+
+

Quote

- +

Quotazione di prodotti standard su base dati di campagna rilevati e contabilità industriale.

Quotazione »
-
-
+
+

Simulation

- +

Simulazione costing per nuovi prodotti senza record di campagna di dettaglio disponibili.

Simulazione »
-
-
+
+

Report

- +

Analisi economica e report da campagne di produzione storiche.

Report »
-
+

Help

- +

Accesso all'area di Help on-line dell'applicativo.

Help »
diff --git a/C2P/FullPage.master b/C2P/FullPage.master new file mode 100644 index 0000000..6d9e9da --- /dev/null +++ b/C2P/FullPage.master @@ -0,0 +1,14 @@ +<%@ Master Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="FullPage.master.cs" Inherits="C2P.FullPage" %> + + + + + + + + + + + + + diff --git a/C2P/Help.aspx.cs b/C2P/FullPage.master.cs similarity index 80% rename from C2P/Help.aspx.cs rename to C2P/FullPage.master.cs index c97575e..010fafd 100644 --- a/C2P/Help.aspx.cs +++ b/C2P/FullPage.master.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace C2P { - public partial class Help : System.Web.UI.Page + public partial class FullPage : System.Web.UI.MasterPage { protected void Page_Load(object sender, EventArgs e) { diff --git a/C2P/FullPage.master.designer.cs b/C2P/FullPage.master.designer.cs new file mode 100644 index 0000000..1073d9b --- /dev/null +++ b/C2P/FullPage.master.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P { + + + public partial class FullPage { + + /// + /// HeadContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + + /// + /// FeaturedContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + + /// + /// MainContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + } +} diff --git a/C2P/Help.aspx b/C2P/Help.aspx deleted file mode 100644 index cbbe762..0000000 --- a/C2P/Help.aspx +++ /dev/null @@ -1,7 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Help.aspx.cs" Inherits="C2P.Help" %> - - - - - - diff --git a/C2P/Help.aspx.designer.cs b/C2P/Help.aspx.designer.cs deleted file mode 100644 index 0bb05fe..0000000 --- a/C2P/Help.aspx.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace C2P -{ - - - public partial class Help - { - } -} diff --git a/C2P/JumboPage.master b/C2P/JumboPage.master new file mode 100644 index 0000000..bb7a3bd --- /dev/null +++ b/C2P/JumboPage.master @@ -0,0 +1,26 @@ +<%@ Master Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="JumboPage.master.cs" Inherits="C2P.JumboPage" %> + + + + + + + +
+
+ + +

Cost 2 Price

+

Segnaposto libero x informazioni generali o altro...

+

+ Learn more » +

+ + +
+
+ + + + + diff --git a/C2P/JumboPage.master.cs b/C2P/JumboPage.master.cs new file mode 100644 index 0000000..7a1f37f --- /dev/null +++ b/C2P/JumboPage.master.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 C2P +{ + public partial class JumboPage : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/JumboPage.master.designer.cs b/C2P/JumboPage.master.designer.cs new file mode 100644 index 0000000..e6d467f --- /dev/null +++ b/C2P/JumboPage.master.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P { + + + public partial class JumboPage { + + /// + /// HeadContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + + /// + /// FeaturedContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + + /// + /// btnLearnMore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnLearnMore; + + /// + /// MainContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + } +} diff --git a/C2P/Quote.aspx b/C2P/Quote.aspx index 844b6cc..e771281 100644 --- a/C2P/Quote.aspx +++ b/C2P/Quote.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> <%@ Register Src="WebUserControls/mod_newQuote.ascx" TagName="mod_newQuote" TagPrefix="uc1" %> diff --git a/C2P/Report.aspx b/C2P/Report.aspx index d79f106..63e7904 100644 --- a/C2P/Report.aspx +++ b/C2P/Report.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Report.aspx.cs" Inherits="C2P.Report" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="Report.aspx.cs" Inherits="C2P.Report" %> diff --git a/C2P/Simulation.aspx b/C2P/Simulation.aspx index 63ef800..c68568e 100644 --- a/C2P/Simulation.aspx +++ b/C2P/Simulation.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Simulation.aspx.cs" Inherits="C2P.Simulation" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="Simulation.aspx.cs" Inherits="C2P.Simulation" %> diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 61bcd82..e28c9f1 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -15,10 +15,15 @@ - - C2P - 13Al - - +
<%--
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index f49c59c..ae9ff37 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P.pdb b/C2P/bin/C2P.pdb index a6c5085..7429e66 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/bin/SteamWare.pdb b/C2P/bin/SteamWare.pdb index 0ed3996..c36b97b 100644 Binary files a/C2P/bin/SteamWare.pdb and b/C2P/bin/SteamWare.pdb differ diff --git a/C2P/help/index.html b/C2P/help/EN/index.html similarity index 84% rename from C2P/help/index.html rename to C2P/help/EN/index.html index 0230881..f56a217 100644 --- a/C2P/help/index.html +++ b/C2P/help/EN/index.html @@ -6,6 +6,6 @@

- Work In Progress

+ Work In Progress

diff --git a/C2P/help/IT/index.html b/C2P/help/IT/index.html new file mode 100644 index 0000000..f56a217 --- /dev/null +++ b/C2P/help/IT/index.html @@ -0,0 +1,11 @@ + + + + + + + +

+ Work In Progress

+ + diff --git a/C2P/logs/20140214.txt b/C2P/logs/20140214.txt index 30c93d0..1b13a6e 100644 --- a/C2P/logs/20140214.txt +++ b/C2P/logs/20140214.txt @@ -6,3 +6,15 @@ 11:02:23 9775 [LEMMA] - ac[C]liente 11:03:18 9190 [LEMMA] - ac[C]liente 11:03:24 3703 [LEMMA] - ac[C]liente +12:01:36 7694 [LEMMA] - ac[C]liente +12:11:05 6720 [LEMMA] - ac[C]liente +12:15:53 3294 [LEMMA] - ac[C]liente +12:15:59 9131 [LEMMA] - ac[C]liente +12:16:31 6408 [LEMMA] - ac[C]liente +12:16:37 1274 [LEMMA] - ac[C]liente +12:18:43 3650 [LEMMA] - ac[C]liente +12:28:38 2967 [LEMMA] - ac[C]liente +12:28:58 0661 [LEMMA] - ac[C]liente +12:29:01 9774 [LEMMA] - ac[C]liente +12:29:21 3368 [LEMMA] - ac[C]liente +12:30:51 1662 [LEMMA] - ac[C]liente diff --git a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache index a4449b7..90fc5e5 100644 Binary files a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache and b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index 5dcda6e..cc14307 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fe2a922..77779e5 100644 Binary files a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/C2P_Data/bin/Debug/C2P_Data.dll b/C2P_Data/bin/Debug/C2P_Data.dll index dd81474..c20e268 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.dll and b/C2P_Data/bin/Debug/C2P_Data.dll differ diff --git a/C2P_Data/bin/Debug/C2P_Data.pdb b/C2P_Data/bin/Debug/C2P_Data.pdb index 48dc5f0..9b2e220 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.pdb and b/C2P_Data/bin/Debug/C2P_Data.pdb differ diff --git a/C2P_Data/bin/Debug/SteamWare.dll b/C2P_Data/bin/Debug/SteamWare.dll index 048a6ad..f0700d7 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.dll and b/C2P_Data/bin/Debug/SteamWare.dll differ diff --git a/C2P_Data/bin/Debug/SteamWare.pdb b/C2P_Data/bin/Debug/SteamWare.pdb index 0ed3996..c36b97b 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.pdb and b/C2P_Data/bin/Debug/SteamWare.pdb differ