From 2944fdf6799e1abe4435cfbfed823c43e39bdb0f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 9 May 2013 14:39:30 +0200 Subject: [PATCH] definizione preliminare testata pagina --- ETS_Data/obj/Debug/ETS_Data.dll | Bin 444928 -> 444928 bytes PROJ-ETS/PROJ-ETS/App_Start/BundleConfig.cs | 7 + PROJ-ETS/PROJ-ETS/Bundle.config | 4 +- PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css | 4 +- PROJ-ETS/PROJ-ETS/Content/Site.css | 246 +++++++++--------- PROJ-ETS/PROJ-ETS/Content/Style.css | 24 +- PROJ-ETS/PROJ-ETS/Content/Style.less | 35 ++- PROJ-ETS/PROJ-ETS/Content/Style.min.css | 2 +- PROJ-ETS/PROJ-ETS/Images/bg-menu-main.png | Bin 0 -> 975 bytes PROJ-ETS/PROJ-ETS/Images/home.png | Bin 0 -> 1520 bytes PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj | 6 +- PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master | 1 - .../PROJ-ETS/WebUserControls/mod_testata.ascx | 78 +++--- .../WebUserControls/mod_testata.ascx.cs | 3 +- .../mod_testata.ascx.designer.cs | 22 +- PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll | Bin 444928 -> 444928 bytes PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll | Bin 12800 -> 12800 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 27820 -> 28050 bytes ...J-ETS.csprojResolveAssemblyReference.cache | Bin 107900 -> 107910 bytes PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll | Bin 12800 -> 12800 bytes 20 files changed, 226 insertions(+), 206 deletions(-) create mode 100644 PROJ-ETS/PROJ-ETS/Images/bg-menu-main.png create mode 100644 PROJ-ETS/PROJ-ETS/Images/home.png diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 6400e125bf34fbf21f897253dffe472af809c309..222793ca962c7d52fab3efba4c0568a3884dc320 100644 GIT binary patch delta 107 zcmZpeBHb`WdO`=&g^7(_tzC?*T}-WA%&lE4tzE2JyVy2O5-2&+Y2$lyx!)w24_@0} zbVqFWnat*)t8-yucOU~0Fafa)BLl;ldu$AA4zMu<1-k?v{qa*=#O1xqWbCm(YbEX5 zl1bZrCbN0y>e$wI2QmNw6A;TVGBB*U$HuVc02@P4uuHIEO!KTmVr4#?8@T>w-Tf@I K{lEb>2TlNcsVAra 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 0000000000000000000000000000000000000000..10db9b8c1621b0b523c8362396ffff6991248df4 GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^B0y}z!3-n=S7fCCDVB6cUq=Rp^(V|(yIwLdFf#=B zgt+ylR|DNig)We7;j%q!9Ja}7}_GuAWJGrImR(;2A9!PCVt#KQmW2}dRe1rdgejw*^T z|CN_E-n{v5dkxP=^Z181S^F1o<{ebEU=1zc=t>YzIj9!F>bZdl%G4HX$%3 z7=Q^3jf&MmTirMve_2akOLuZD)Di#?iL^tR-$?Z1mfF=rt)Rp<702qqP87-hQh=D5N{aTLn4$0Cf1!5BDDl7o zh)PP9P3QhMDIrsl^znKhzQUw&V;=>3_<8e+>JsDJfWyER&&i>xeTz`-v?{a2IKR^@ z)nTLu=04&<1Rk%?QcA)JFPzp*V{bi?=$xpcQ6h~wulO zYb=F|WL_7rl*~5_=H!VN(!f!1KBNLdE^P>|Rau&mj=zkKsSheJZ(7y)$6^7pTjT-r zn=4V8nQN7X`*-3aK&){oX$g!U(R&Ol$PY2nLndjLuLfmo{>E1s#2hJ0!>)DWR)ukA zA4Pi`vi;Z3uwWOiLF$jqBzA=qE0M1k096u`!*T^AtU2aE@ftY1_9k; z>n=nwMEKVBQ^=@C=bKUBu>JGt+o&;;z(}_iUo|M4lCvLR$cCi%L1bU$iW!<9_fY~b zvgT5=@rOX*@Zs!gm;+@3+eI6a)~c3Blw9n-9(SAP<*@O?mvF~!c}5P0XO zZ}TK|Uz~bc1J#-lvXy+Xd4tK5{#x9P7prqtH4Sg3vD&Ot!;;w~V_#<{Tedwmg^sV08x#W{X!@E)N4VI3#se zE8B6zxn#vtAxN%A{2B(E>4R^eb!W+i%vlZ>epV=7Jnn$0^SgqoR8e>61qZKas-FuM zL=LQ_UCol)?m7^us6fiJvx!XWh>pR6Q(c4EQwPsep{}@#6+LNccwlc+o9q%7O-OnV znTbk*NJ8F55?Uw=yJ&|h9Zh^96jVIB_#mGmH9X-dSfNTixMJF4@rgH=W52H2GQi5Q z$NGHX-NJd2uc>Qfa@bM*bCDe?X5=1gpEaYk;)98)m^zMGIEf0YG^c;y6TQzC?HB5D zUfn(Hz5^Uq3k++av{o|3St=DQ&6<|Rx0aNu6hvC}pc!_`y<~INQ}FR73d?DvXe!;w zSPrIJEP^q9xz7|8jxsoI(DgM@1pMB5eX9sLDG#(Q-*;1Ar-4`+h5aTRp@janV{$qms2=P(TMQ-QDU+KtiAK_2LC6VnqVKNBys` zKhx_J3mMUmDhg%bkWKb z_`ldWpRC|-Mj!JeF#eN - + + 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 6400e125bf34fbf21f897253dffe472af809c309..222793ca962c7d52fab3efba4c0568a3884dc320 100644 GIT binary patch delta 107 zcmZpeBHb`WdO`=&g^7(_tzC?*T}-WA%&lE4tzE2JyVy2O5-2&+Y2$lyx!)w24_@0} zbVqFWnat*)t8-yucOU~0Fafa)BLl;ldu$AA4zMu<1-k?v{qa*=#O1xqWbCm(YbEX5 zl1bZrCbN0y>e$wI2QmNw6A;TVGBB*U$HuVc02@P4uuHIEO!KTmVr4#?8@T>w-Tf@I K{lEb>2TlNcsVAra diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index f9f25b1b0a8fad692b4c2a9b5b728db2a9bc7e63..da2861cbe48677f45f5ba13a7832ab7e31c94abb 100644 GIT binary patch delta 2335 zcmb7`du)@}8OERY`15x)Ut@cL1QKE=B&k;tNQp|bi7r`F+O%my$O2-BwYiwZA~@7B zLJOsKcIjwZg{I#s4be-otgP!Fpvvo}XfQz~dT&vxUC5$N$p)&TQdQoTskCL*M1~wl~}R#6j`i*x1NQQQI>1;uiPZT|fu;dH^teW6^LR3j{bG zzY{3&qGGkTjjBa`%=<1qTwKt?8NPTB1pN4E74UfkAa5eJ-rFRWQ`Flfb}-)%8z`DH ze2c`vWi84p=-4yx4Zz!EHu`uv?+J6&hO`Y-JPge7y`Q_N=t!p$ z$!`yG9<9rOMxDLR4m@586tGuuXJ<<@-=F6A0WWV>TQXY0k0LK>ts&EEx3*=LqERc< zY$UWF3LVF_r!*aZ)Lv)i6s!Oh_J94v=nEO4UU2$PLgV<)rQco#N?6pt`_&~M$(l22NIV&u(bgWVAu}*Q#0ZT4_(W+$nZOMpY+j@1|ZnxPw9<%q@ zHeR&f#d2J*PqHRQHnGx?4c)_fB@Q@!PB~t3o^*69IC5$|AeUbgSQaS97B6ofH-2n^ zU;iTSXU>7bP1+G?=+f3P)7o>0;)IpVtqYu`(q29w!1wWYUlq!cRM9XrtsJXx*ei3F zW%_6p&R58)N6fdZ6jkDL6}^f@V+56GUL|v{;M}CYfOhJfif$ z|8lO)UZ*qv9(G;g|MCy1C9mcGI$O!ruCE>N0dFqhkmhZsu6QuX`9O`gE|1~V-2NjDcYSbV~jmB$;(N^Pa6e~Z5q%n;;I%NC- z4Rq9aA5CRoz5B`A&7IvC|e&He`PKjpKy^}tcm_}4g(!%_W)a2kJXf~UN%LlQ-ZDq$&Ktv573|v^r@_H4#9o?P zDPd2uPS~?#sUuc`XYD+d@B#abIcqHu(_C33W+>>CiKYyW8daj5ZgeL3%(hY=cUSMM z6Lr++j37^2od#i1mvftlsU|Mb8K+H<_?`0!w>#r>iWbZ{qe|}(mdHCjq6?RtV+e{H z0(~MV|5#gt5RMxBMLDs2jJ@>`awOixewQYOSiQS2zu5@A`DUFQ-sojJ4`rc%3e|&R%XFL^8 z_QbD`>(Jlb-#Hjh;jZ-V{-$J4-#{vtTK1_yF>gHjCGVCCdPiEfBccHT7#L)i4R^Y rxz#a~LTFL@udq_;$XIl#C}_!be>p%oclD<}v9=)>T>CMNtu_7y((l}9 delta 2162 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 delta 223 zcmZoW&GzRM+lKvytS^=P*mrF{Vkm9G7_<37Y626}W~R+f8CL8}F-)85@^7?mPWW2N z$-}sriGkrHBLf2?%a+X#r#)btx}7lvsC2t5Bcmr17f2QaSayIVrw6bymLUXpK?FCj zGsc6o2y!rbgRI#e$HnN1r1t*M1~wl~}R#6j`i*x1NQQQI>1;uiPZT|fu;dH^teW6^LR3j{bG zzY{3&qGGkTjjBa`%=<1qTwKt?8NPTB1pN4E74UfkAa5eJ-rFRWQ`Flfb}-)%8z`DH ze2c`vWi84p=-4yx4Zz!EHu`uv?+J6&hO`Y-JPge7y`Q_N=t!p$ z$!`yG9<9rOMxDLR4m@586tGuuXJ<<@-=F6A0WWV>TQXY0k0LK>ts&EEx3*=LqERc< zY$UWF3LVF_r!*aZ)Lv)i6s!Oh_J94v=nEO4UU2$PLgV<)rQco#N?6pt`_&~M$(l22NIV&u(bgWVAu}*Q#0ZT4_(W+$nZOMpY+j@1|ZnxPw9<%q@ zHeR&f#d2J*PqHRQHnGx?4c)_fB@Q@!PB~t3o^*69IC5$|AeUbgSQaS97B6ofH-2n^ zU;iTSXU>7bP1+G?=+f3P)7o>0;)IpVtqYu`(q29w!1wWYUlq!cRM9XrtsJXx*ei3F zW%_6p&R58)N6fdZ6jkDL6}^f@V+56GUL|v{;M}CYfOhJfif$ z|8lO)UZ*qv9(G;g|MCy1C9mcGI$O!ruCE>N0dFqhkmhZsu6QuX`9O`gE|1~V-2NjDcYSbV~jmB$;(N^Pa6e~Z5q%n;;I%NC- z4Rq9aA5CRoz5B`A&7IvC|e&He`PKjpKy^}tcm_}4g(!%_W)a2kJXf~UN%LlQ-ZDq$&Ktv573|v^r@_H4#9o?P zDPd2uPS~?#sUuc`XYD+d@B#abIcqHu(_C33W+>>CiKYyW8daj5ZgeL3%(hY=cUSMM z6Lr++j37^2od#i1mvftlsU|Mb8K+H<_?`0!w>#r>iWbZ{qe|}(mdHCjq6?RtV+e{H z0(~MV|5#gt5RMxBMLDs2jJ@>`awOixewQYOSiQS2zu5@A`DUFQ-sojJ4`rc%3e|&R%XFL^8 z_QbD`>(Jlb-#Hjh;jZ-V{-$J4-#{vtTK1_yF>gHjCGVCCdPiEfBccHT7#L)i4R^Y rxz#a~LTFL@udq_;$XIl#C}_!be>p%oclD<}v9=)>T>CMNtu_7y((l}9 delta 2162 zcmb7_du&ui6vn?Zd*8QQ*e$e$Ztd>2lrGc)3gHzV4Gpx238fU$K#_*3Jj$a$P!YRZ zc~?`~TqF?0me4;82?0_NA%V2f5HR5tA&5Kz;h{tkQ3wGFdhSq_;6HkI?{B{Iote33 z=T4{big-o+S}`)#Q2UaoD`?m;*%?p(OaWgr0K?Z1PE3dc2^_bN0fKH=u_cB1+;-u3nyZ?< z%+VZm;yc+LX!a%DebX$BS?H#$5gMi|`HF^h$~(*^$wQJCCGSf*s+WyQ=1VSD%Tx{Z zlAlRuzvK_<8Fc|3tAK{ynx$zN$8=DoC6b0}trZSdu}+HN3vCl8u5n=DvGx|zub+U0 zsN^`NhFN+mJ4^NR%Ugr z@}%TV$wJF|YHAp2rCSzCtrJMX2CI_wZq^o#TV6qrSoc7Voov5^8FrqnVUz7my^m?( zvVDYo)wS(i`dAbEj+5Os`-9FQWeXH!FvFN@&S@!5I7w;6{Q7~FxaZ441Z6U+fucl^ ziM8%XCplI@nYf8+lm?Ba|wPr#iR`I}eC8qD=dl}v7j`kJ8r0GY|UHVa^>BkYJ z5&F02PbIwVhR}3g{5+bcUqK;N>$hU?V~t+N)~EU}%x3)_ck-$mLObEKr=TQ#%QDAhXC?*+C_yLthE<4MNTFj>P#sDg$W@9K- z(OF{@y+=P9V<=Wb_c=}U)ELB_O7!tWq?kptP8JcCzoUV51e>L^jk$+Eo|EA1M>-(& z0ZOrsvre(jktw%W5U*ReDaae_0khUL#WC*LRh*_)D^=v7M30EV7@e~kdC!ig3a;*& z)mKF6j#Z0Wq}c-nQ5Soth{_`F(h~bM@sL*9_qg1(c9AH=db>{QQbD50enXVwb9)C& zaoDa9rtsD>iaYi~;TMnX2(O=+uvC_PN7b`H#my13)BXaR7jxZM^ z%8rfYtP`b^Dzh1q@8cED4#W4H9W9+=$*K5_ow*45w$TNeO4~bljcTY(>Z_7*;boh| zh4I|9%HWFRRq+#jN$`2;kYtncJL@ZwP(2-zJd9MDLNn+nU8X;%v&a*3+^RsDZ=<=~ zZ3y&9ZKE@EgQ7x-dwc%*YnFR1P~L45AM@aY<)6#q1E)MOoyuBj5>u2;1xw~t=FOiu zYr!Jq^>2BQ{77&4H9bS~BYR51{8i_66vS6gJltdEsZQ>wtj3rUA`&XYU*$)g=J3M;-93cW5CZW}BsX)9KzyrXKnSOcKfX=joXID?l;k)*K7o88@Z>yZ z=d<~?sv$walxM-7fUf286g+^*U%^WD-sg35f>IxlJS5rX*7urAXWjN*JtCJJkqBAC zrJ$yZK>U)UcMHU?QX>D2!&C0y>@4Si2IAyx+4HVjnH?H%*AZN1ApS&$;yA%zP=(-D z0U3^0e~qf@t=ZReM#erW@|Ioj9prbDGM4WsFtIql_+Z