From 3425005d3f00e71bdb4015a27ffe3b67e39b966d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 17 Jun 2014 12:41:44 +0200
Subject: [PATCH] fix grafici: inserimenti nuovi lemmi traduzione...

---
 C2P/WebUserControls/mod_marginReport.ascx |  15 ++++++++-------
 C2P/WebUserControls/mod_testata.ascx      |   4 ++--
 C2P/bin/C2P.dll                           | Bin 366080 -> 366080 bytes
 VersGen/C2P.cs                            |   4 ++--
 VersGen/C2P.tt                            |   4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/C2P/WebUserControls/mod_marginReport.ascx b/C2P/WebUserControls/mod_marginReport.ascx
index 5f24870..e29b6f8 100644
--- a/C2P/WebUserControls/mod_marginReport.ascx
+++ b/C2P/WebUserControls/mod_marginReport.ascx
@@ -4,7 +4,8 @@
 
 <%@ Register Src="~/WebUserControls/mod_MaRepNewData.ascx" TagName="mod_MaRepNewData" TagPrefix="uc3" %>
 
-<div class="row"> <!--style="min-height: 282px;">-->
+<div class="row">
+    <!--style="min-height: 282px;">-->
     <div class="panel panel-default">
         <div class="btn-group btn-group-justified">
             <div class="btn-group">
@@ -23,7 +24,7 @@
                 <%: traduci("HMaRepBody") %>
                 <div class="panel panel-success">
                     <div class="panel-heading">
-                        <h4 style="margin-top: -4px;margin-bottom: -4px;"><%: traduci("HMaRepActData") %></h4>
+                        <h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepActData") %></h4>
                     </div>
                     <div class="panel-body bg-success">
                         <uc1:mod_MaRepActData ID="mod_MaRepActData1" runat="server" />
@@ -31,10 +32,10 @@
                 </div>
             </div>
             <div runat="server" id="divDataIn">
-                <h3>Step 1</h3>
+                <h3><%: traduci("HMaRepStepA") %></h3>
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h4 style="margin-top: -4px;margin-bottom: -4px;"><%: traduci("HMaRepLoadData") %></h4>
+                        <h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepLoadData") %></h4>
                     </div>
                     <div class="panel-body">
                         <uc2:mod_fileUploader ID="mod_fileUploader1" runat="server" contTypeFilt="application/vnd.ms-excel" fileName="MarginRep_Import.csv" />
@@ -50,10 +51,10 @@
                 </div>
             </div>
             <div runat="server" id="divDataProc">
-                <h3>Step 2</h3>
+                <h3><%: traduci("HMaRepStepB") %></h3>
                 <div class="panel panel-warning">
                     <div class="panel-heading">
-                        <h4 style="margin-top: -4px;margin-bottom: -4px;"><%: traduci("HMaRepProcData") %></h4>
+                        <h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepProcData") %></h4>
                     </div>
                     <div class="panel-body bg-warning">
                         <div class="row">
@@ -74,7 +75,7 @@
                 </div>
             </div>
             <div runat="server" id="divAnalisys">
-                <h3>Step 3</h3>
+                <h3><%: traduci("HMaRepStepC") %></h3>
                 <div class="col-xs-12 text-center">
                     <asp:HyperLink runat="server" ID="HyperLink2" class="btn btn-success btn-lg" NavigateUrl="~/Reports/MarginReport.xlsx">
                             
diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx
index 7551c21..4a17083 100644
--- a/C2P/WebUserControls/mod_testata.ascx
+++ b/C2P/WebUserControls/mod_testata.ascx
@@ -55,8 +55,8 @@
                             </a>
 
                             <ul class="dropdown-menu">
-                                <li><a href="MarginReport">Margin Report B3</a></li>
-                                <li><a href="StdCostList">Std Cost List A9</a></li>
+                                <li><a href="MarginReport"><%: traduci("MarginReport") %></a></li>
+                                <li><a href="StdCostList"><%: traduci("StdCostList") %></a></li>
                                 <%--<li><a href="http://jumpstartuidemo.com/themes/base/gallery.html">.......</a></li>
                             <li><a href="http://jumpstartuidemo.com/themes/base/reports.html">.......</a></li>--%>
                             </ul>
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index d523a89fb52f622f307ca87823d3656123ad0c25..cf6382658004e5b797f10c940c911a3fcc984a31 100644
GIT binary patch
delta 200
zcmZozBi67+Y(fXKqV$4|-Ksa4lNpX}-h8v(TE)rC#MITm&`{UK$<;#F#L3J;*V4?*
zK-bW~+|0$q*~Qhs%yD~|D5H_QfZzkyZ7*(Tcu)HvP<G|)gRJc{Oc)Oev0CaGT3Sqx
zb7xEgnLhovJEJCJ+4hg_jIWuwk1-@Oa4;}10O{?|y&2;fIV~CV7z`OK87#K@`!cE{
e@u%1OF`6T!+xPo10x=U1GXpWp_WgdWj_v?5oIHR4

delta 200
zcmZozBi67+Y(fX~+O6|8cB|fGPGUH^dGpPBYZW6mXEP^PS5sX_7dIDO6H_NkT}LAe
z16?;GOA|*+LsvIv6U*&kqKroJ0#ElH)Bn46r|Y7IPg7RP{qfvB!-Vmm5UYirp{4os
zICsW0km=KpyEAGsmTv#(&iI;{`zS*a0|x^G1CZYS+?z3;k<)@fkHL_^lEHktzb~UY
f5`TKVAEP-!x_!SNBM>tIF*6XeY~Sz4>gWyt`&d7s

diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs
index 1e0ee3b..6c3ef72 100644
--- a/VersGen/C2P.cs
+++ b/VersGen/C2P.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.8.98.197")]
-[assembly: AssemblyFileVersion("0.8.98.197")]
+[assembly: AssemblyVersion("0.8.99.198")]
+[assembly: AssemblyFileVersion("0.8.99.198")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt
index 85d9a41..0f2b966 100644
--- a/VersGen/C2P.tt
+++ b/VersGen/C2P.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.8.98.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("0.8.98.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("0.8.99.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("0.8.99.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+