diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index b0ff0a8..d5e5a22 100644
Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/Content/ETS.css b/PROJ-ETS/PROJ-ETS/Content/ETS.css
index 2e72185..9b93406 100644
--- a/PROJ-ETS/PROJ-ETS/Content/ETS.css
+++ b/PROJ-ETS/PROJ-ETS/Content/ETS.css
@@ -1,5 +1,6 @@
.areaTitolo
{
+ background-color: #0A64A4;
background-image: url('../images/bg-menu-main.png');
background-repeat: repeat-x;
color: #ECECEC;
diff --git a/PROJ-ETS/PROJ-ETS/Content/Site.css b/PROJ-ETS/PROJ-ETS/Content/Site.css
index af66d57..cbc370b 100644
--- a/PROJ-ETS/PROJ-ETS/Content/Site.css
+++ b/PROJ-ETS/PROJ-ETS/Content/Site.css
@@ -94,7 +94,7 @@ h5, h6 {
----------------------------------------------------------*/
.content-wrapper {
margin: 0 auto;
- max-width: 960px;
+ max-width: 1366px;
}
#body {
@@ -406,9 +406,9 @@ input, textarea {
background: #fff;
color: #333;
font-size: 1.2em;
- margin: 5px 0 6px 0;
+ /*margin: 5px 0 6px 0;
padding: 5px;
- width: 300px;
+ width: 300px;*/
}
textarea {
diff --git a/PROJ-ETS/PROJ-ETS/Images/Bazaar.png b/PROJ-ETS/PROJ-ETS/Images/Bazaar.png
new file mode 100644
index 0000000..207c15d
Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/Bazaar.png differ
diff --git a/PROJ-ETS/PROJ-ETS/Images/Project.png b/PROJ-ETS/PROJ-ETS/Images/Project.png
new file mode 100644
index 0000000..e91645f
Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/Project.png differ
diff --git a/PROJ-ETS/PROJ-ETS/Menu.aspx b/PROJ-ETS/PROJ-ETS/Menu.aspx
index e622ace..29a5e84 100644
--- a/PROJ-ETS/PROJ-ETS/Menu.aspx
+++ b/PROJ-ETS/PROJ-ETS/Menu.aspx
@@ -1,15 +1,10 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Site.Master" AutoEventWireup="true" CodeBehind="Menu.aspx.cs" Inherits="PROJ_ETS.Menu" %>
+
+<%@ Register Src="WebUserControls/mod_menu.ascx" TagName="mod_menu" TagPrefix="uc1" %>
-
-
- 
+
diff --git a/PROJ-ETS/PROJ-ETS/Menu.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Menu.aspx.designer.cs
index 66fb1b6..9400065 100644
--- a/PROJ-ETS/PROJ-ETS/Menu.aspx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/Menu.aspx.designer.cs
@@ -3,15 +3,22 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace PROJ_ETS
-{
-
-
- public partial class Menu
- {
+namespace PROJ_ETS {
+
+
+ public partial class Menu {
+
+ ///
+ /// mod_menu1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::PROJ_ETS.WebUserControls.mod_menu mod_menu1;
}
}
diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
index f1d3820..f8d0560 100644
--- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
@@ -186,6 +186,7 @@
+
@@ -203,6 +204,7 @@
+
@@ -218,6 +220,7 @@
+
@@ -331,6 +334,13 @@
ViewSwitcher.ascx
+
+ mod_menu.ascx
+ ASPXCodeBehind
+
+
+ mod_menu.ascx
+
mod_menuBottomFullpage.ascx
ASPXCodeBehind
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx
new file mode 100644
index 0000000..ba25927
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx
@@ -0,0 +1,24 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menu.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_menu" %>
+
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.cs
new file mode 100644
index 0000000..7b2b620
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.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 PROJ_ETS.WebUserControls
+{
+ public partial class mod_menu : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.designer.cs
new file mode 100644
index 0000000..7285e83
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menu.ascx.designer.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+//
+// 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 PROJ_ETS.WebUserControls {
+
+
+ public partial class mod_menu {
+
+ ///
+ /// logoETS control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Image logoETS;
+
+ ///
+ /// btnProgetti control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ImageButton btnProgetti;
+
+ ///
+ /// btnBazaar control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ImageButton btnBazaar;
+
+ ///
+ /// hlHelp control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink hlHelp;
+
+ ///
+ /// btnAdmin control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ImageButton btnAdmin;
+ }
+}
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
index 6516453..8077786 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
@@ -12,7 +12,7 @@