diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index 6363b77..6400e12 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.sln b/PROJ-ETS/PROJ-ETS.sln
index 758fe06..b1074bb 100644
--- a/PROJ-ETS/PROJ-ETS.sln
+++ b/PROJ-ETS/PROJ-ETS.sln
@@ -5,6 +5,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PROJ-ETS", "PROJ-ETS\PROJ-E
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETS_Data", "..\ETS_Data\ETS_Data.csproj", "{0A14058F-ED18-4F82-91C9-93945C2C409A}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{79203114-695D-4D7F-94C7-70BCEB39C129}"
+ ProjectSection(SolutionItems) = preProject
+ WE-settings.xml = WE-settings.xml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/PROJ-ETS/PROJ-ETS/Bundle.config b/PROJ-ETS/PROJ-ETS/Bundle.config
index 669a33e..bc67343 100644
--- a/PROJ-ETS/PROJ-ETS/Bundle.config
+++ b/PROJ-ETS/PROJ-ETS/Bundle.config
@@ -1,20 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css
index fc36e88..a4208d6 100644
--- a/PROJ-ETS/PROJ-ETS/Content/Style.css
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.css
@@ -1,92 +1,84 @@
@import url("MasterPage.css");
+
@import url("BuildBlocks.css");
+
@import url("ExtraComp.css");
+
@import url("ETS.css");
+.bodyMainCenter {
+ background-image: url('../images/logo_sw.png');
+ vertical-align: middle;
+ border-left: #0D0083 1px solid;
+ /*border-top: #0D0083 1px solid;*/
+ text-align: center;
+ height: 100%;
+ width: 100%;
+ background-position: center;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
+}
+.bodyCenter {
+ vertical-align: middle;
+ text-align: center;
+ height: 100%;
+ width: 100%;
+}
+.centerMenu {
+ background-color: White;
+ text-align: center;
+ border-width: thin;
+ border-style: groove;
+ border-color: Blue;
+}
+A:hover {
+ color: red;
+}
+.bodyMain {
+ background-image: url('../images/logo_sw.png');
+ vertical-align: top;
+ border-left: #0D0083 1px solid;
+ /*border-top: #0D0083 1px solid;*/
-.bodyMainCenter
-{
- background-image: url('../images/logo_sw.png');
- vertical-align: middle;
- border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
- text-align: center;
- height: 100%;
- width: 100%;
- background-position: center;
- background-attachment: scroll;
- background-repeat: no-repeat;
-}
-.bodyCenter
-{
- vertical-align: middle;
- text-align: center;
- height: 100%;
- width: 100%;
-}
-.centerMenu
-{
- background-color: White;
- text-align: center;
- border-width: thin;
- border-style: groove;
- border-color: Blue;
-}
-A:hover
-{
- color: red;
-}
+ height: 100%;
+ width: 100%;
+ background-position: center;
+ /*was topleft*/
-.bodyMain
-{
- background-image: url('../images/logo_sw.png');
- vertical-align: top;
- border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
- height: 100%;
- width: 100%;
- background-position: center; /*was topleft*/
- background-attachment: scroll;
- background-repeat: no-repeat;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
}
-.bodyMainEmpty
-{
- vertical-align: top;
- border-left: maroon 1px solid;
- height: 100%;
- width: 100%;
+.bodyMainEmpty {
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
}
-
-.bodyMainWhite
-{
- vertical-align: top;
- border-left: maroon 1px solid;
- height: 100%;
- width: 100%;
- background-position: center;
- background-attachment: scroll;
- background-repeat: no-repeat;
+.bodyMainWhite {
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+ background-position: center;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
}
-
-.bodyMainWhite a:hover
-{
- color: white;
+.bodyMainWhite a:hover {
+ color: white;
}
-
-.bodyMainNoLogo
-{
- vertical-align: top;
- border-left: maroon 1px solid;
- height: 100%;
- width: 100%;
+.bodyMainNoLogo {
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
}
-
-.bodyMainLogoPiccolo
-{
- background-image: url('../images/sfondoMedio.png');
- background-position: 97% 210px;
- vertical-align: top;
- border-left: maroon 1px solid;
- height: 100%;
- width: 100%;
- background-attachment: scroll;
- background-repeat: no-repeat;
+.bodyMainLogoPiccolo {
+ background-image: url('../images/sfondoMedio.png');
+ background-position: 97% 210px;
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
}
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less
new file mode 100644
index 0000000..8773d34
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.less
@@ -0,0 +1,95 @@
+@import url("MasterPage.css");
+@import url("BuildBlocks.css");
+@import url("ExtraComp.css");
+@import url("ETS.css");
+
+
+.bodyMainCenter
+{
+ background-image: url('../images/logo_sw.png');
+ vertical-align: middle;
+ border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
+ text-align: center;
+ height: 100%;
+ width: 100%;
+ background-position: center;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
+}
+.bodyCenter
+{
+ vertical-align: middle;
+ text-align: center;
+ height: 100%;
+ width: 100%;
+}
+.centerMenu
+{
+ background-color: White;
+ text-align: center;
+ border-width: thin;
+ border-style: groove;
+ border-color: Blue;
+}
+A:hover
+{
+ color: red;
+}
+
+.bodyMain
+{
+ background-image: url('../images/logo_sw.png');
+ vertical-align: top;
+ border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
+ height: 100%;
+ width: 100%;
+ background-position: center; /*was topleft*/
+ background-attachment: scroll;
+ background-repeat: no-repeat;
+}
+.bodyMainEmpty
+{
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+}
+
+.bodyMainWhite
+{
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+ background-position: center;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
+}
+
+.bodyMainWhite a:hover
+{
+ color: white;
+}
+
+.bodyMainNoLogo
+{
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+}
+
+.bodyMainLogoPiccolo
+{
+ background-image: url('../images/sfondoMedio.png');
+ background-position: 97% 210px;
+ vertical-align: top;
+ border-left: maroon 1px solid;
+ height: 100%;
+ width: 100%;
+ background-attachment: scroll;
+ background-repeat: no-repeat;
+}
+
+body {
+}
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css
new file mode 100644
index 0000000..9955cbc
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css
@@ -0,0 +1 @@
+@import url("MasterPage.css");@import url("BuildBlocks.css");@import url("ExtraComp.css");@import url("ETS.css");.bodyMainCenter{background-image:url('../images/logo_sw.png');vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:blue}A:hover{color:red}.bodyMain{background-image:url('../images/logo_sw.png');vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainEmpty{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainWhite{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainWhite a:hover{color:#fff}.bodyMainNoLogo{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainLogoPiccolo{background-image:url('../images/sfondoMedio.png');background-position:97% 210px;vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/Images/favicon.png b/PROJ-ETS/PROJ-ETS/Images/favicon.png
new file mode 100644
index 0000000..ae6349b
Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/favicon.png differ
diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
index 260a188..46f77c3 100644
--- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
@@ -114,6 +114,9 @@
+
+ Style.less
+
@@ -178,6 +181,7 @@
+
@@ -203,6 +207,7 @@
+
diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master
index 0a132d2..b0102b4 100644
--- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master
+++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master
@@ -1,14 +1,19 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="PROJ_ETS.SiteMaster" %>
+<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %>
+
+
- <%: Page.Title %> - My ASP.NET Application
+ <%: Page.Title %> - PROJ-ETS
<%: Scripts.Render("~/bundles/modernizr") %>
+
+ <%----%>
@@ -33,8 +38,9 @@
<%--Site Scripts--%>
+ <%--testata pagina--%>
+ <%--corpo pagina--%>
+ <%--footer pagina--%>
+
diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs
index 0aa666d..02a543b 100644
--- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs
@@ -7,13 +7,11 @@
//
//------------------------------------------------------------------------------
-namespace PROJ_ETS
-{
-
-
- public partial class SiteMaster
- {
-
+namespace PROJ_ETS {
+
+
+ public partial class SiteMaster {
+
///
/// HeadContent control.
///
@@ -22,7 +20,16 @@ namespace PROJ_ETS
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
-
+
+ ///
+ /// mod_testata control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::PROJ_ETS.WebUserControls.mod_testata mod_testata;
+
///
/// FeaturedContent control.
///
@@ -31,7 +38,7 @@ namespace PROJ_ETS
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent;
-
+
///
/// MainContent control.
///
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
index 3f9d0b6..05da9fc 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
@@ -1,13 +1,13 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_testata" %>
-<% if (false)
+<%--<% if (false)
{ %>
-<% } %>
-
+<% } %>--%>
+<%--
--%>
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
index 0028154..6dd20ed 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
@@ -12,8 +12,8 @@ namespace PROJ_ETS.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
- lblUser.Text = string.Format("{0} ({1})",utils.obj.currUserCognomeNome, utils.obj.currUserId);
- lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
+ //lblUser.Text = string.Format("{0} ({1})",utils.obj.currUserCognomeNome, utils.obj.currUserId);
+ //lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
}
///
/// richiesta update
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
index 5140711..a00de36 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
@@ -13,66 +13,21 @@ namespace PROJ_ETS.WebUserControls {
public partial class mod_testata {
///
- /// lblUser control.
+ /// A1 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblUser;
+ protected global::System.Web.UI.HtmlControls.HtmlAnchor A1;
///
- /// btnUpdate control.
+ /// A2 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.LinkButton btnUpdate;
-
- ///
- /// lblDataOra control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblDataOra;
-
- ///
- /// ibHome control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Image ibHome;
-
- ///
- /// lblTitolo control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblTitolo;
-
- ///
- /// Menu1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Menu Menu1;
-
- ///
- /// SiteMapDS control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.SiteMapDataSource SiteMapDS;
+ protected global::System.Web.UI.HtmlControls.HtmlAnchor A2;
}
}
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 0dba89a..6400e12 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index ba99294..f9f25b1 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/favicon.ico b/PROJ-ETS/PROJ-ETS/favicon.ico
index a3a7999..70ccada 100644
Binary files a/PROJ-ETS/PROJ-ETS/favicon.ico and b/PROJ-ETS/PROJ-ETS/favicon.ico differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 94435d0..b0a8b57 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
index ac50a1c..b8da961 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
index ba99294..f9f25b1 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/WE-settings.xml b/PROJ-ETS/WE-settings.xml
new file mode 100644
index 0000000..a635520
--- /dev/null
+++ b/PROJ-ETS/WE-settings.xml
@@ -0,0 +1,48 @@
+
+
+
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ 1
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ 50
+ True
+ True
+ True
+ 2
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+ True
+
+
\ No newline at end of file