diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 6400e12..222793c 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/App_Start/BundleConfig.cs b/PROJ-ETS/PROJ-ETS/App_Start/BundleConfig.cs index d23207e..70c2a5b 100644 --- a/PROJ-ETS/PROJ-ETS/App_Start/BundleConfig.cs +++ b/PROJ-ETS/PROJ-ETS/App_Start/BundleConfig.cs @@ -31,6 +31,13 @@ namespace PROJ_ETS // ready for production, use the build tool at http://modernizr.com to pick only the tests you need bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( "~/Scripts/modernizr-*")); + + // aggiungo bundle dinamico x less --> css + //bundles.Add(new DynamicFolderBundle("less", "*.less")); + + // aggiungo bundle dinamico x coffee --> jscript + //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); } + } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Bundle.config b/PROJ-ETS/PROJ-ETS/Bundle.config index bc67343..85b2c97 100644 --- a/PROJ-ETS/PROJ-ETS/Bundle.config +++ b/PROJ-ETS/PROJ-ETS/Bundle.config @@ -2,10 +2,8 @@ - - + diff --git a/PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css b/PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css index 0eb0d67..2b591f5 100644 --- a/PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css +++ b/PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css @@ -1,5 +1,5 @@ /* zona blocchi Sx/DX */ -.divSx +/*.divSx { float: left; padding: 0; @@ -10,7 +10,7 @@ float: right; padding: 0; margin: 0; -} +}*/ .divCenter { float: none; diff --git a/PROJ-ETS/PROJ-ETS/Content/Site.css b/PROJ-ETS/PROJ-ETS/Content/Site.css index 3f7b916..af66d57 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Site.css +++ b/PROJ-ETS/PROJ-ETS/Content/Site.css @@ -103,20 +103,20 @@ h5, h6 { padding-bottom: 35px; } - .main-content { - background: url("../Images/accent.png") no-repeat; - padding-left: 10px; - padding-top: 30px; - } +.main-content { + background: url("../Images/accent.png") no-repeat; + padding-left: 10px; + padding-top: 30px; +} - .featured + .main-content { - background: url("../Images/heroAccent.png") no-repeat; - } +.featured + .main-content { + background: url("../Images/heroAccent.png") no-repeat; +} header .content-wrapper { - padding-top: 20px; + padding-top: 20px; } - + footer { clear: both; background-color: #e2e2e2; @@ -128,18 +128,18 @@ footer { /* site title ----------------------------------------------------------*/ .site-title { - color: #c8c8c8; + color: white; font-family: Rockwell, Consolas, "Courier New", Courier, monospace; font-size: 2.3em; margin: 0; } -.site-title a, .site-title a:hover, .site-title a:active { - background: none; - color: #c8c8c8; - outline: none; - text-decoration: none; -} + .site-title a, .site-title a:hover, .site-title a:active { + background: none; + color: white; + outline: none; + text-decoration: none; + } /* login @@ -159,11 +159,11 @@ footer { text-decoration: none; } - #login a.username { - background: none; - margin-left: 0px; - text-decoration: underline; - } + #login a.username { + background: none; + margin-left: 0px; + text-decoration: underline; + } #login ul { margin: 0; @@ -180,7 +180,6 @@ footer { ul#menu { font-size: 1.3em; font-weight: 600; - margin: 0 0 5px; padding: 0; text-align: right; } @@ -189,18 +188,20 @@ ul#menu { display: inline; list-style: none; padding-left: 15px; + padding-right: 15px; + border-left: 1px solid #DEDEDE; } ul#menu li a { + color: #a6dbed; background: none; - color: #999; text-decoration: none; } - ul#menu li a:hover { - color: #333; - text-decoration: none; - } + ul#menu li a:hover { + color: #ead919; + text-decoration: none; + } /* page elements @@ -221,27 +222,27 @@ ul#menu { padding: 20px 40px 30px 40px; } - .featured hgroup.title h1, .featured hgroup.title h2 { - color: #fff; - } + .featured hgroup.title h1, .featured hgroup.title h2 { + color: #fff; + } - .featured p { - font-size: 1.1em; - } + .featured p { + font-size: 1.1em; + } /* page titles */ hgroup.title { margin-bottom: 10px; } -hgroup.title h1, hgroup.title h2 { - display: inline; -} + hgroup.title h1, hgroup.title h2 { + display: inline; + } -hgroup.title h2 { - font-weight: normal; - margin-left: 3px; -} + hgroup.title h2 { + font-weight: normal; + margin-left: 3px; + } /* features */ section.feature { @@ -345,7 +346,7 @@ aside { } #socialLoginForm h2 { - margin-bottom: 5px; + margin-bottom: 5px; } fieldset.open-auth-providers { @@ -355,7 +356,7 @@ fieldset.open-auth-providers { fieldset.open-auth-providers button { margin-bottom: 12px; } - + /* contact */ .contact h3 { font-size: 1.2em; @@ -380,7 +381,7 @@ fieldset { fieldset legend { display: none; } - + fieldset ol { padding: 0; list-style: none; @@ -390,61 +391,61 @@ fieldset { padding-bottom: 5px; } - label { - display: block; - font-size: 1.2em; - font-weight: 600; - } +label { + display: block; + font-size: 1.2em; + font-weight: 600; +} label.checkbox { display: inline; } - input, textarea { - border: 1px solid #e2e2e2; - background: #fff; - color: #333; - font-size: 1.2em; - margin: 5px 0 6px 0; - padding: 5px; - width: 300px; +input, textarea { + border: 1px solid #e2e2e2; + background: #fff; + color: #333; + font-size: 1.2em; + margin: 5px 0 6px 0; + padding: 5px; + width: 300px; +} + +textarea { + font-family: inherit; + width: 500px; +} + + input:focus, textarea:focus { + border: 1px solid #7ac0da; } - textarea { - font-family: inherit; - width: 500px; - } - - input:focus, textarea:focus { - border: 1px solid #7ac0da; - } +input[type="checkbox"] { + background: transparent; + border: inherit; + width: auto; +} - input[type="checkbox"] { - background: transparent; - border: inherit; - width: auto; - } - - input[type="submit"], - input[type="button"], - button { - background-color: #d3dce0; - border: 1px solid #787878; - cursor: pointer; - font-size: 1.2em; - font-weight: 600; - padding: 7px; - margin-right: 8px; - width: auto; - } +input[type="submit"], +input[type="button"], +button { + background-color: #d3dce0; + border: 1px solid #787878; + cursor: pointer; + font-size: 1.2em; + font-weight: 600; + padding: 7px; + margin-right: 8px; + width: auto; +} - td input[type="submit"], - td input[type="button"], - td button { - font-size: 1em; - padding: 4px; - margin-right: 4px; - } +td input[type="submit"], +td input[type="button"], +td button { + font-size: 1em; + padding: 4px; + margin-right: 4px; +} /* info and errors */ .message-info { @@ -510,7 +511,7 @@ table { } th { - font-size: 1.2em; + font-size: 1.2em; text-align: left; border: none 0px; padding-left: 0; @@ -519,39 +520,38 @@ th { th a { display: block; position: relative; - } - th a:link, th a:visited, th a:active, th a:hover { - color: #333; - font-weight: 600; - text-decoration: none; - padding: 0; - } + th a:link, th a:visited, th a:active, th a:hover { + color: #333; + font-weight: 600; + text-decoration: none; + padding: 0; + } - th a:hover { - color: #000; - } + th a:hover { + color: #000; + } th.asc a, th.desc a { margin-right: .75em; } - - th.asc a:after, th.desc a:after { - display: block; - position: absolute; - right: 0em; - top: 0; - font-size: 0.75em; - } - th.asc a:after { - content: '▲'; - } + th.asc a:after, th.desc a:after { + display: block; + position: absolute; + right: 0em; + top: 0; + font-size: 0.75em; + } - th.desc a:after { - content: '▼'; - } + th.asc a:after { + content: '▲'; + } + + th.desc a:after { + content: '▼'; + } td { padding: 0.25em 2em 0.25em 0em; @@ -608,9 +608,9 @@ tr.pager td { padding: 0; } - #login a:hover { - color: #333; - } + #login a:hover { + color: #333; + } /* menu */ nav { @@ -675,12 +675,12 @@ tr.pager td { background: none; } - /* features */ - section.feature { + /* features */ + section.feature { float: none; padding: 10px; width: auto; - } + } section.feature img { color: #999; @@ -694,8 +694,8 @@ tr.pager td { width: 90%; } - - + + /* login page */ #loginForm { border-right: none; diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css index a4208d6..ff9f7dc 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.css @@ -5,6 +5,7 @@ @import url("ExtraComp.css"); @import url("ETS.css"); +/*#region body */ .bodyMainCenter { background-image: url('../images/logo_sw.png'); vertical-align: middle; @@ -24,16 +25,6 @@ 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; @@ -82,3 +73,16 @@ A:hover { background-attachment: scroll; background-repeat: no-repeat; } +/*#endregion */ +/*#region default */ +.centerMenu { + background-color: White; + text-align: center; + border-width: thin; + border-style: groove; + border-color: Blue; +} +A:hover { + color: red; +} +/*#endregion */ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less index 8773d34..19c6c10 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.less +++ b/PROJ-ETS/PROJ-ETS/Content/Style.less @@ -4,6 +4,8 @@ @import url("ETS.css"); +/*#region body */ + .bodyMainCenter { background-image: url('../images/logo_sw.png'); @@ -23,19 +25,6 @@ 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'); @@ -93,3 +82,23 @@ A:hover body { } + +/*#endregion */ + +/*#region default */ + +.centerMenu +{ + background-color: White; + text-align: center; + border-width: thin; + border-style: groove; + border-color: Blue; +} +A:hover +{ + color: red; +} + +/*#endregion */ + diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css index 9955cbc..5a4d1a5 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.min.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css @@ -1 +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 +@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%}.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}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:blue}A:hover{color:red} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Images/bg-menu-main.png b/PROJ-ETS/PROJ-ETS/Images/bg-menu-main.png new file mode 100644 index 0000000..10db9b8 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/bg-menu-main.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/home.png b/PROJ-ETS/PROJ-ETS/Images/home.png new file mode 100644 index 0000000..6cd6a24 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/home.png differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 46f77c3..5e8cbf3 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -113,7 +113,9 @@ - + + Style.less + Style.less @@ -180,9 +182,11 @@ + + diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master index b0102b4..d2ac22b 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master @@ -13,7 +13,6 @@ - <%----%> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx index 05da9fc..0769e2f 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx @@ -1,16 +1,35 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_testata" %> -<%--<% if (false) +<% if (false) { %> - - - - - -<% } %>--%> -<%--
-
+ +<% } %> +
+
+
+ +
+
+

+ + + PROJ-ETS + +

+
+
+ + +<%--
+
@@ -20,44 +39,5 @@
-
- - - - -
-
-
- - - - - - - - - - +
--%> -
-
- - Utente - -
-
- - -
-
-

- PROJ-ETS -

-
-
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs index 6dd20ed..9c8519e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs @@ -12,7 +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); + // sistemare + lblUser.Text = "Current user";// string.Format("{0} ({1})", utils.obj.currUserCognomeNome, utils.obj.currUserId); //lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss"); } /// 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 a00de36..1ce6e5c 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs @@ -13,13 +13,31 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_testata { /// - /// A1 control. + /// BundleReference1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlAnchor A1; + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// lblUser control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUser; + + /// + /// 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; /// /// A2 control. diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 6400e12..222793c 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 f9f25b1..da2861c 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b0a8b57..f4869b1 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 b8da961..bc73f73 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 f9f25b1..da2861c 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