From 626c843a00cd3980ab1ceca31c31f8ff018e10ee Mon Sep 17 00:00:00 2001
From: samuele <samuele@steamware.net>
Date: Mon, 29 Oct 2012 16:18:40 +0100
Subject: [PATCH] ritocchi grafici vers 108 come da richiesta

---
 ETS-WS/ETS-WS/MyDocs.aspx                     |   4 +-
 ETS-WS/ETS-WS/Web.sitemap                     |   8 +--
 .../WebUserControls/mod_fileUpload.ascx       |   3 -
 .../ETS-WS/WebUserControls/mod_inputDati.ascx |  14 ++---
 .../WebUserControls/mod_pathAndDocs.ascx      |  33 ++++++-----
 .../mod_pathAndDocs.ascx.designer.cs          |  54 +++++++++---------
 ETS-WS/ETS-WS/bin/ETS-WS.dll                  | Bin 61952 -> 61952 bytes
 ETS-WS/ETS-WS/images/load_l.png               | Bin 2305 -> 2219 bytes
 ETS-WS/ETS-WS/images/load_m.png               | Bin 1328 -> 1312 bytes
 ETS-WS/ETS-WS/images/load_s.png               | Bin 861 -> 868 bytes
 10 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/ETS-WS/ETS-WS/MyDocs.aspx b/ETS-WS/ETS-WS/MyDocs.aspx
index e118c2c..806cd74 100644
--- a/ETS-WS/ETS-WS/MyDocs.aspx
+++ b/ETS-WS/ETS-WS/MyDocs.aspx
@@ -10,12 +10,12 @@
         <div class="divCenter" style="padding-top: 0px; padding-bottom: 4px;">
             <div class="divSx half">
                 <div class="tabLabelGreen">
-                    <asp:LinkButton ID="lnkUpload" runat="server" OnClick="lnkUpload_Click">Upload File</asp:LinkButton>
+                    <asp:LinkButton ID="lnkUpload" runat="server" OnClick="lnkUpload_Click">Carica</asp:LinkButton>
                 </div>
             </div>
             <div class="divDx half">
                 <div class="tabLabelGray">
-                    <asp:LinkButton ID="lnkGestione" runat="server" OnClick="lnkGestione_Click">Gestione File</asp:LinkButton>
+                    <asp:LinkButton ID="lnkGestione" runat="server" OnClick="lnkGestione_Click">Gestisci</asp:LinkButton>
                 </div>
             </div>
         </div>
diff --git a/ETS-WS/ETS-WS/Web.sitemap b/ETS-WS/ETS-WS/Web.sitemap
index d6c2efd..1488564 100644
--- a/ETS-WS/ETS-WS/Web.sitemap
+++ b/ETS-WS/ETS-WS/Web.sitemap
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" >
     <siteMapNode url="Menu.aspx" title="Home"  description="ETS - WebScip">
-        <siteMapNode url="MyDocs.aspx" title="Upload"  description="Upload documenti ed editing" />
+        <siteMapNode url="MyDocs.aspx" title="Nuovo"  description="Upload documenti ed editing" />
         <siteMapNode url="GestioneDocumenti.aspx" title="Archivio"  description="Gestione Archivio Documenti" />
-        <siteMapNode url="Admin.aspx" title="Admin"  description="Area Admin">
+        <siteMapNode url="Admin.aspx" title="Impostazioni"  description="Area Admin">
             <siteMapNode url="AnagFasi.aspx" title="Fasi"  description="Gestione Fasi" />
-            <siteMapNode url="AnagTags.aspx" title="Tags"  description="Gestione Tags" />
+            <siteMapNode url="AnagTags.aspx" title="Etichette"  description="Gestione Tags" />
 
         </siteMapNode>
-        <siteMapNode url="Help.aspx" title="Help"  description="Help Area" />
+        <siteMapNode url="Help.aspx" title="Guida"  description="Help Area" />
     </siteMapNode>
 </siteMap>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
index 1a0c4d3..a245034 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
@@ -10,9 +10,6 @@
 <link href="../css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="divCenter fontPiccolo">
-    <div class="fontMedio">
-        <b>File list</b>
-    </div>
     <asp:AjaxFileUpload ID="fileUpload" runat="server" OnUploadComplete="fileUpload_UploadComplete" />
     <i>Caricamento files in area personale per catalogazione</i>
 </div>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
index 27abb38..e79cb56 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
@@ -15,11 +15,11 @@
         <div class="clearDiv">
             <asp:Panel runat="server" ID="pnlTemplateMetaDati" Height="86px" BackColor="#222222" ForeColor="#CDCDCD">
                 <div class="clearDiv" style="padding: 4px;">
-                    <asp:Label runat="server" ID="Label4" Text="Template MetaDati" CssClass="fontMedio" />
+                    <asp:Label runat="server" ID="Label4" Text="Modelli personalizzati" CssClass="fontMedio" />
                 </div>
                 <div class="clearDiv" style="padding: 4px;">
                     <div class="divSx">
-                        <asp:Label runat="server" ID="Label2" Text="Salva parametri attuali" CssClass="labelInput" />
+                        <asp:Label runat="server" ID="Label2" Text="Nuovo Modello" CssClass="labelInput" />
                     </div>
                     <div class="divDx">
                         <asp:TextBox runat="server" ID="txtNomeTMD" Font-Size="8pt" Width="8em" ToolTip="Nome template metadati" />
@@ -28,7 +28,7 @@
                 </div>
                 <div class="clearDiv" style="padding: 2px;">
                     <div class="divSx">
-                        <asp:Label runat="server" ID="Label3" Text="Carica da template" CssClass="labelInput" />
+                        <asp:Label runat="server" ID="Label3" Text="Carica Modello" CssClass="labelInput" />
                     </div>
                     <div class="divDx">
                         <asp:ImageButton ID="imgDeleteTemplate" runat="server" ImageUrl="~/images/delete_m.png" ImageAlign="AbsMiddle" ToolTip="ELIMINA template metadati" onclick="imgDeleteTemplate_Click"  />
@@ -63,22 +63,22 @@
             </div>
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblInOut" Text="In/Out" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblInOut" Text="Provenienza" CssClass="labelInput" /><br />
             <asp:RadioButtonList ID="rblInOut" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" RepeatLayout="Flow" CssClass="radioBtn" OnSelectedIndexChanged="rblInOut_SelectedIndexChanged" TabIndex="2">
                 <asp:ListItem Value="In" Text="In" />
                 <asp:ListItem Value="Out" Text="Out" Selected="True" />
             </asp:RadioButtonList>
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblCommessa" Text="Commessa (autocomplete)" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblCommessa" Text="Commessa" CssClass="labelInput" /><br />
             <uc1:mod_textAutocomplete ID="tacCommesse" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoCommesse" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" TabIndex="3" />
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblFase" Text="Fase (autocomplete)" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblFase" Text="Fase" CssClass="labelInput" /><br />
             <uc1:mod_textAutocomplete ID="tacFasi" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" TabIndex="4" />
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblFonte" Text="Fonte (autocomplete)" CssClass="labelInput" />
+            <asp:Label runat="server" ID="lblFonte" Text="Fonte" CssClass="labelInput" />
             <br />
             <uc1:mod_textAutocomplete ID="tacFonti" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFonti" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char" TabIndex="5" />
         </div>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
index dee75b9..1686e3e 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
@@ -16,7 +16,26 @@
         </div>
     </asp:Panel>
 </div>
+<div class="clearDiv" style="text-align: center; background: #EFEFBC; border-top: 1px solid #999999; border-bottom: 1px solid #999999;">
+    <asp:Panel runat="server" ID="pnlGenDocs">
+        <div style="padding: 4px 0px 4px 0px;">
+            <div style="height: 1.5em; font-weight:bold;" class="fontMedio">
+                Generatore nuovi documenti
+            </div>
+            <asp:Button ID="btnStaccaProto" runat="server" Text="Solo Protocollo" ToolTip="Genera e blocca protocollo" CssClass="btnGenProto" TabIndex="13" OnClick="btnStaccaProto_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenLettera" runat="server" Text="Lettera" ToolTip="Genera doc tipo lettera" CssClass="btnGenDoc" TabIndex="14" OnClick="btnGenLettera_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenFax" runat="server" Text="Fax" ToolTip="Genera doc tipo Fax" CssClass="btnGenFax" TabIndex="15" OnClick="btnGenFax_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenMail" runat="server" Text="Email" ToolTip="Genera email" CssClass="btnGenMail" TabIndex="16" OnClick="btnGenMail_Click" />
+        </div>
+    </asp:Panel>
+</div>
 <div class="clearDiv" style="text-align: center; padding: 4px 0px 4px 0px; background: #EFEFEF;">
+    <div style="height: 1.5em; font-weight: bold;" class="fontMedio">
+        Associa Documenti Caricati
+    </div>
     <div class="divDx">
         <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
             <ProgressTemplate>
@@ -32,17 +51,3 @@
     &nbsp;
     <asp:Button ID="btnSubmit" runat="server" Text="Archivia" OnClick="btnSubmit_Click" TabIndex="12" CssClass="btnArchivia" />
 </div>
-<div class="clearDiv" style="text-align: center; background: #DEDEDE; border-top: 1px solid #999999; border-bottom: 1px solid #999999;">
-    <asp:Panel runat="server" ID="pnlGenDocs">
-        <div style="padding: 4px 0px 4px 0px;">
-            generatore doc: &nbsp;
-            <asp:Button ID="btnStaccaProto" runat="server" Text="Solo Protocollo" ToolTip="Genera e blocca protocollo" CssClass="btnGenProto" TabIndex="13" OnClick="btnStaccaProto_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenLettera" runat="server" Text="Lettera" ToolTip="Genera doc tipo lettera" CssClass="btnGenDoc" TabIndex="14" OnClick="btnGenLettera_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenFax" runat="server" Text="Fax" ToolTip="Genera doc tipo Fax" CssClass="btnGenFax" TabIndex="15" OnClick="btnGenFax_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenMail" runat="server" Text="Email" ToolTip="Genera email" CssClass="btnGenMail" TabIndex="16" OnClick="btnGenMail_Click" />
-    </asp:Panel>
-</div>
-</div> 
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
index 89fad57..06c7807 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
@@ -39,33 +39,6 @@ namespace ETS_WS.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblFullPath;
         
-        /// <summary>
-        /// updtRicerca control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdateProgress updtRicerca;
-        
-        /// <summary>
-        /// btnUpdate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnUpdate;
-        
-        /// <summary>
-        /// btnSubmit control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnSubmit;
-        
         /// <summary>
         /// pnlGenDocs control.
         /// </summary>
@@ -110,5 +83,32 @@ namespace ETS_WS.WebUserControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnGenMail;
+        
+        /// <summary>
+        /// updtRicerca control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdateProgress updtRicerca;
+        
+        /// <summary>
+        /// btnUpdate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnUpdate;
+        
+        /// <summary>
+        /// btnSubmit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSubmit;
     }
 }
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index e40e7f251447ac42077b8d4553a25a002119005c..8cf5aca01e5b964d03b4e8bbfa665534acc68b6d 100644
GIT binary patch
delta 190
zcmZp8!rbtLc|r%%(zzSE)&z=oFfg#xB?F24Squzp`N|9oTntRrjhlUgPD^QD7u(Lj
z!th9}8AyHvlmEdar#MJt7F#}$EMf<-MK(L<M%YbWy4sdAsU$DBG$}W;Wb?z-p}Z>2
z&W;9-uBI-!mPY30x+cc1&bpT7X0EyhjxJ`-X2y;tE{=|yqjpYG7KmN9;7s|XH_p@Z
exUL<u@?Ew0&m9F`pgSkaz0zV7-R${lJ39b7r#*B4

delta 190
zcmZp8!rbtLc|r#h|BQ`YYXZfa85mgVl7U42ECvR)d}Rg(E(WIRmd(CFr=_%KvE?(c
zFch&j1Ig=RAo8Kub|Co%%>E4~Ie|v7FbHpU&W*6+Oe)C>E=|hKESWrOwcX}Nt3!BI
zj4hoE%q`qpbuBC`O?6Go4V`o?U5(9k&CQKmUCb>_%q$!&Hb?E8q%82SVuR(>4r%v!
f=H+_Vr(~?y{O67WFVLNn<z8tqifs0LwVfRRc+)#0

diff --git a/ETS-WS/ETS-WS/images/load_l.png b/ETS-WS/ETS-WS/images/load_l.png
index 0f4bc163bfb8047e35435ed5d4d3d6508b5f163f..6ff18878b0ce84f15849177475b220d21b5a6191 100644
GIT binary patch
delta 2170
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

delta 2257
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

diff --git a/ETS-WS/ETS-WS/images/load_m.png b/ETS-WS/ETS-WS/images/load_m.png
index 0c435ca8e33d9ee308554e52dfd748bd2c5488dc..4dcfd87375ed5a3115215ab7a959148afa871ebd 100644
GIT binary patch
delta 1256
zcmV<E1Q+|T3ZM#*NPiB)000id0mpBsWB>pJwMj%lR7gw3lY3B9RUF6fvOE@KUw3&d
zy9+EJkA+=!K`c{KK{H@bpe7>5rYQ}4pfY1M7zjuq1T^3ShorO#YP52EttD1Kf;{CB
zqOzocEC`yUjx$l}@a^1lm0mWZfAyXD%<kU%{e9-#d(JZdSAV30<%B{<F>`=*Wy}sv
z%%|jc9$^W=p72<iLCAGA*pI|zJ0Y)Dgz5o192*s&+G2}bvjbu_i6Eb8YazXLbm9>b
zCQ#V-MHMShKF;FvDG6$RmEeO38FpNiWBWB0mA6=Y^c#z9g9^;glz|c1)R8$gKmPDU
z2z{Mytf*6?`hTtrd#{U8Zk3~Cm__kr7KKABwq9~UX1_Z!&Us+-B_#@PdSLkh57@AF
z17u#sYyKXVad8|@Y0zN*9SJJOB-k+`!>%hb`hCy17*$ur<Wqu*D^e5<DX4r^w<j{k
zG<c>)1I9tvL_9)XHyvTcoH7+YyC<ch@)7dbgq@=-%6~>?plF!ku`=Yk7!_kO+Szo$
z11TL^th4&Sf4v)sXf5yKqZSz@lO@;Pu=i&%O39-ak`-~Q${%#ZzAKUFx&1M^Z||d2
zSoL^!&>8QM*Hbzy$GWpBBz5{Bp~VljD$!5GH+@=OpP#Ql%^fL9NqNhUuE@Q}^QJ|J
zFUHgG*MC%67bA1Pk>1ZE?>z6K3tnvV!Sm+>;hC)9R{b=uWrS60Ygv4FONOigH@tB{
ziMRTB($9(T$;e9HIK@*o7=?}J#nYX)EpABtL4(*X9YPD#oH&DOZJlk7<aWyN{<s3^
zXVsMTeQKok%JEVcgWW?f^I|SUoM)Mb72QIl^?xd8Z$qC7YkD<^?$9B;!kZHpQt=E{
zaP*xXDe{Ni@M^agR+63OC>U6Voc_f)I9hby%BN~*Bl0aV$m?H9`YNpI;rmP5bujGm
z;l#yMERqNgZ8;-D_K*_E?LKsu6IvD6Z!Nj6A`6|Gn&v^uF0Msln*u3kv~(u2H3UIr
zzJHu}8x@o6Og}C~&WI8T&3;HEyBpuEMRb!p+9tlGl7EU1jqbtXQ*zpUj`sa9w>1>n
z&0d^%HLqou<d|G%6i)EsCEo`k`cxnmHFzSvDHP+ARw{cS?Y-HK$ObRc^C7(e#5DS2
zQGF0*wS<9<WjV2l*D{RELvQy>&agXP>wodW+;4)h;JY9!tkWT^R*BUeNw_z4mr8H^
zK7oYBd5AdaN$)SHBR$fMs5c<!OFe{g+fL#W@LE3E&lZs5c8wgH#+fjFZ9qhA2%b0@
z0zb1mwp&W6IHPL~{LLQZx*oI1J&y2NJ&Y~0z$UtKtBvP%f5zTHYSWQ?*c}_J-hWuq
z5D1;wh#-m{hObOm(~%DUV}S@h9!k*@j3*2*wa$V%OUp^CdDXw8adH#($JHp2df6At
z+5-@NLXUuBCU_q<!u6m(e2<vmf7C?9Vf98Bo5P{X^oGDrP)p_=c+JD(F0d7t^=Wd%
z*J<&>xd6m=2V-H29#1tH@Z{-G%wcIYV)khx0;_e9Mbp3VZh{@1euShrxComyaZ>2B
zlnCG91=DUVbfsE&ZBRqHKsqUKv@w%j6kmV*7znQrwh~GR*@Ps558*$;Fn<6?fc&y!
Sx?%AE0000<MNUMnLSTY_T3o~c

delta 1272
zcmV<U1PA+|3a|>0NPi0w000XT0n*)m`~Uy|8FWQhbW?9;ba!ELWdK2BZ(?O2No`?g
zWm08fWO;GPWjp`?1fWSoK~zXfm6d5sTvZgu$J7=Z6V#+G7#nS9&>%!VSZ$0SG#af<
zn;K$cQza-hrXWaDX&P!vsPTglp^L1=v`QOeQ<545%F@Cx`+u;^`exoNoieNm%K*bt
zV3^0>b1q=f*rF#nbMD-G-|wFLKj+P;R@rHC=l^sa`5WZ_YU{~s($muyD=RB;?ms&3
zEh;KPLPEkAJ-<Vc{$Xc6J#YYQ5d~PJNI^J{SASnUx4<7{e!m~Fv9T`VtXsm}v70|#
zxF9wKdivp%y?=0d{E$38F=pqnL{atyV3%ZAoi5xA_F`aY6bc=XoSZaHoQIZhcTD1I
z2{3K0Z)n7gRyCS$w2Ii+e4WNEXi;m>+NMQAQ!{@1{SVj)9-f{-WMP59qr|y8xVxtp
zO$5^D^w8=J=(JeHxJ{!)duJDP1|zy?POZ^E_WCe0JAa3TXcS3FYk>Ru2cT}#puMA0
zxR#(slNk=D1U*4@beOrL15U|>x%miY$)k$0Hh5@wm|!|sZ8n1F3Fw66a^Y5YP>h|D
z1e@J~iSQ&z5EZU0F5UxNQ6a$N6BDpI9FRR85vNH*HZBkwF+@kOuAH$#3yb#xS1g0W
zl!?u5hkx7chJ(Nst5syrnYNPzc3R_TGMmvI42oyilAcc*US|Ex{sM<WAsCECNTeYj
zV4*^}-Le4kVLaz#c`Oc0jZI=G9D--y79M{x?ly4_lE(<*vPtDDQjCv_3>jpmtQg{>
z7r<h%z((_4uNNMNjGwR9;F!7`dD;pb)s|v+MSm6^+4&rZ<sg4SP|2jS@^S$l8ygca
z26uIJi3~Y9sVh9Bd%%4YrJ9TQuptkHmMT<9mvGrvkMn^mC=Oi2w(s^p^}u~2#N4t3
zE-Mq@a5xMdwV2Ij7u~>}z!De?1~_d_Ts78VPi;EBGUnr$As^Lp4aVoDpdYm0`>s-)
zkbl2L!jYFb^Q!_}Qd%m&ECpYg3nx**d_EtnRKS^;rS8aU%STGxE*#cmz&jQYb1POQ
zokFHM6?<DgKur9`X#xJBq(m%EPEHCL80w;o8O%})4h+KM^<aPPF6_Pb659G3#QtA>
z1vIWku_YB*>g~u@zl~2!JFq$B2}OX<oPRwlHnJ3aZ7!T>H!2!~UDPG@P4!5v-Hy*%
zlQ0#TKzCS&Ji{h@ZQg<cQ#|rb$;j2dh>VVHNK9J>7oR#Uz!UU>@YNZ}MKqaAkY!oO
z)7;pCoVwR=NcSj0vqAJuS#ZX-0q0$DsB~_|Y3oyT$TP@uBqCww!wU>{6&4i>Fn@Q2
zk@~p3y&Y<`T4c@{^IZR}Ayn&*BhRctOJA1Qe=T^Bx<Z93{uulyZAGb^h!fhU@!+QW
z`xxvmEIK7NM&{>9&jE43F#T?X=>{VdM@L4)dNA07bLLlYxqCfHaT1gBeXtJyLOLIZ
zdMFLGp{;oJ{f*oeUo!Zcox65pHgOUa53gkow-wEv_YjCYOaCbE&`c(x*av-YJl_2%
zhM|`jx?+{DzxmefFAnD_nb|o?#$EjLoI^@h_E9AzB~{s%maH5(7ONDT+z{RW@w&Ok
i;#7X(<SyY<sy_i%A@mLG$1Q>Y0000<MNUMnLSTZdr%cxX

diff --git a/ETS-WS/ETS-WS/images/load_s.png b/ETS-WS/ETS-WS/images/load_s.png
index 262600c4b45678737c95287736d088381c6b8f6e..1e9c09b5ac005ad2d2f5fce85b23e6c67c7f093d 100644
GIT binary patch
delta 809
zcmV+^1J?ZA2IK~iNPiB)000id0mpBsWB>pH`AI}UR5(wyky}WUVI0P1>gH)DcTm6S
za*pO<^K6QTvLp|cN!>^#wptQuC6WbYhGbSYP*F^}C@+k}6grEQQ_EA%%Cn|Z=aw0g
zMG1;Y<<qxs6?jp1{ouX%zt8V^U-;Ah2kXeQR}yMfx8v}-;eP`;wCSBHivdZHWi>h9
zMJ4`$zaZRRn|7Ox>+>wsePg2TI}<mT*(jUgAhn7GexOYgnOkp;uO-lRH~WivPJml0
zY*fr~P&~uM6{8~x^nBz_IwAi9fvgb%M2v%x%&#f2WrebIS3U?)y}(4-I}WbC=b&_!
zh7$6Wy|+NcEPoeyIw3N3Vx+!yhrN$o8|hh?b(&Rr${hh}zOtYuUo0|kQDo$x@zZg%
zf4PYJ^M`QRXpa)|N2kY}pq!8*L`{GccThSv#7<K_?+Eo<9&&X8oYnDgM#sU&m1&sJ
zFLmM6I0JbTd=yOakv1qsT<ZqdxZ6}w1sf08PF!2$;eW)a3$jN<$QWWnH9&`9sh29~
zUuZyT9}P!`9g#CiAah8Bc&#@CTbR$Of|zvrbn#~aRDEtx_B!Lj_;!@*m6%)BV|8^E
zQ;WSQol3#EH(PPA*9oeAF}7)az>j5jQ3Vl7#`vXqCnRenNO~be{^&mHWfP_X6F*je
zAbT(tdw;r}k=)~f$PNWqQLI*~z&*_BQNBS)UP_VBCPPFE7nPIeDG_EL1tS@VY~dlX
zLx#9cFZkV)gYH7FqzXv(r`B+BWJ-dtr#^_(cp~753p8^Llw4!D0Y#$#o0`3_N#ljE
zo&XRh#ilJpnRRlHqK$NI)|d#1uRI}d@Pq7;41dwhQK&W6BIvOnIrBn5qc4Kn{oz@!
zfVCT={+Ig)caL~mgYu;qNyFX<(D+00Kmp>e4AO_bkT(S)usaBzwQ|_`JG><G9J96-
zS4VHggYZHj5}ryC)8&JRP6a}r`NFr(8^kdYtX$}(-80SczY}doSeFPlJ3JA_vO789
n4k8VfJj+6I9&En;4UP5_H@TN3u)Y_U00000NkvXXu0mjfEuDOw

delta 802
zcmV+-1Ks@O2HggbNPi0w000XT0n*)m`~Uy|8FWQhbW?9;ba!ELWdK2BZ(?O2No`?g
zWm08fWO;GPWjp`?0?kQ8K~y+Tg;GmMRACsMphzj9MYJdag`%JqQ45h?yGS=Bx+#RB
z+Jr{YA}WH2pj1#1A!h_D3QHlKv`n*U7{__udEI$jC&$NS9)G^I(J^VB_w@bux)Gud
z9KMgsJ?H<<_y4L5TqFjG;(ur*77;h0vZ|_T!D_R?X6OD&JLiDaX2*BE9>vAQF4F8&
zqzb~k*NY5*>G>th5My(T)GM4>SVCla4zr8P^as$|`U0dWQKSmOZnqop#2R#Z1N6g2
z7)@rmHyB4SVt=+^a7YIWO(KzjMx$W{rxmFJ(c|%8ZG9aE60=bm%@*sXIyoiE6R6c{
zW^hW8Dj)+MzmrM&(I)40yFD16m_TTJ96rAvQ=*7$F84134>Fl7{DA<xJ|7~HC{|Y!
z_!*DOTwGd~D?^*6jTxL!qzXiy=aEjQ;dDCT^ZCI!9DiWnTrQVP&dMP=8Ad9bL2Z2<
zGq|is703ojiohx}VO0<WxrTycFxX6JGIgNI(}f!CGaS5Bl2dI}y(aB;*?>hzrBamL
z4G)RDbgeGxdD?}=ZAXpn3GSF4<CV|}-K-5Q;deOOPytommUh{IEsaHB1_9c`=;$bd
z!64$xaep*eTTuSx0y@XKkf1{t-jBUSHGdQPDhkuGfs=A(G8y?~A1#rMF9ZZcBQabb
zD91zVRl0>F`o($@KfpcH8Qij;!^zsCY#%C-T^*aiLCa%t<VpMin1-#mrag`~p}SZ~
zM)8!(L!EOso;wQhh(ChT#v<7u!rnVGaJihY(|=pwI8NUFkH7@l&9~9y+fU=q<7@Z^
zO|Szmg#&1d9Y)EOT`6WTWiXoLY}u^xSQv5}4=3?!6<tCJLa9>ZFoamP9zm%Rk2>}s
zzd)s724&|<%fj6s`*Pa8eyO|nlSIALL-m8USL)FYNR7?SQmy)!^jWu88vJ%BSAD-=
gB^y7ViB;SF0Q1zJU2(1~3IG5A07*qoM6N<$f_@cnNdN!<