Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix grafici: inserimenti nuovi lemmi traduzione...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-06-17 12:41:44 +02:00
parent fe5514d06d
commit 3425005d3f
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_marginReport.ascx
+8 -7
View File
@@ -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">
C2P/WebUserControls/mod_testata.ascx
+2 -2
View File
@@ -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>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -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")]
VersGen/C2P.tt
+2 -2
View File
@@ -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")]
<#+