diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 4f56478..001a1fb 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/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index fe037aa..04ca065 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -4,85 +4,104 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master index 75beed8..4c24b41 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master @@ -3,6 +3,9 @@ <%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %> +<%@ Register Src="../WebUserControls/mod_menuBottomFullpage.ascx" TagName="mod_menuBottomFullpage" TagPrefix="uc2" %> + + @@ -12,7 +15,7 @@ <%: Scripts.Render("~/bundles/modernizr") %> - + @@ -57,11 +60,7 @@ <%--footer pagina--%>
-
-
-

© <%: DateTime.Now.Year %> - My ASP.NET Application

-
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs index 36b7997..a54d8a0 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs @@ -56,5 +56,14 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + + /// + /// mod_menuBottomFullpage1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_menuBottomFullpage mod_menuBottomFullpage1; } } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx index c308bba..e2cedef 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx @@ -2,19 +2,15 @@ Inherits="PROJ_ETS.WebUserControls.mod_menuBottomFullpage" %> <% if (false) { %> - - - - - + <% } %> -
+
-  -   - +  -   + © 2013-<%: DateTime.Now.Year %> - SteamWare, ETS
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.cs index 3660430..f97238e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.cs @@ -17,7 +17,6 @@ namespace PROJ_ETS.WebUserControls { // sistemo le stringhe... lblApp.Text = string.Format("{0} v.{1}.{2}", ConfigurationManager.AppSettings.Get("appName"), ConfigurationManager.AppSettings.Get("mainRev"), ConfigurationManager.AppSettings.Get("minRev")); - lblCopyRight.Text = string.Format("{0}", ConfigurationManager.AppSettings.Get("copyRight")); setTimer(); setClock(); } @@ -35,7 +34,7 @@ namespace PROJ_ETS.WebUserControls private void setClock() { - lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss"); + lblDateTime.Text = DateTime.Now.ToString("dddd dd/MM/yyyy, HH:mm:ss"); } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs index 7347088..cab5a34 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs @@ -12,6 +12,15 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_menuBottomFullpage { + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + /// /// lblDateTime control. /// @@ -39,15 +48,6 @@ namespace PROJ_ETS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblrev; - /// - /// lblCopyRight control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblCopyRight; - /// /// Timer1 control. /// diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx index 8077786..04a6f8a 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx @@ -7,7 +7,7 @@

- +