ultime modifiche layout grafico
This commit is contained in:
Samuele E. Locatelli
@@ -90,6 +90,9 @@ a:focus {
|
||||
.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder {
|
||||
color: #666;
|
||||
}
|
||||
.titleBar {
|
||||
color: #f90;
|
||||
}
|
||||
/*------------------------------------------------------------------
|
||||
[ Subnavbar / .subnavbar ]
|
||||
*/
|
||||
|
||||
@@ -117,6 +117,10 @@ a {
|
||||
}
|
||||
|
||||
|
||||
.titleBar{
|
||||
color: #f90;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------
|
||||
[ Subnavbar / .subnavbar ]
|
||||
*/
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -5,98 +5,153 @@
|
||||
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
|
||||
<%} %>
|
||||
<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %>
|
||||
|
||||
|
||||
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
|
||||
<ItemTemplate>
|
||||
<div class="row bottomLine">
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor1" runat="server" etichetta='<%# traduci("RefCost01") %>' valore='<%# Eval("RefCost01", "{0:C3}") %>' />
|
||||
<uc1:mod_displayHor ID="mod_displayHor1" runat="server" etichetta='<%# traduci("RefSellCost01") %>' valore='<%# sumVal(Eval("SellCost01"),Eval("RefCost01"), "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicare con variabile se Ref / Sell</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%--<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor2" runat="server" etichetta='<%# traduci("SellCost01") %>' valore='<%# Eval("SellCost01", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia"><%: traduci("CasoVenditaRottame") %></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor10" runat="server" etichetta='<%# traduci("EECost") %>' valore='<%# Eval("EECost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor3" runat="server" etichetta='<%# traduci("GasCost") %>' valore='<%# Eval("GasCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor5" runat="server" etichetta='<%# traduci("DiesCost") %>' valore='<%# Eval("DiesCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor6" runat="server" etichetta='<%# traduci("RefCost04") %>' valore='<%# Eval("RefCost04", "{0:C3}") %>' />
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Note su selezione articolo/classe x DIES (da variabile)</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor6" runat="server" etichetta='<%# traduci("RefSellCost04") %>' valore='<%# sumVal(Eval("SellCost04"),Eval("RefCost04"), "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicare con variabile se Ref / Sell</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%--<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor9" runat="server" etichetta='<%# traduci("SellCost04") %>' valore='<%# Eval("SellCost04", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia"><%: traduci("CasoVenditaRottame") %></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor7" runat="server" etichetta='<%# traduci("PackCost") %>' valore='<%# Eval("PackCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor8" runat="server" etichetta='<%# traduci("ProvvCost") %>' valore='<%# Eval("ProvvCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor11" runat="server" etichetta='<%# traduci("TranspCost") %>' valore='<%# Eval("TranspCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicazione Incoterms + dest da variabile</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor12" runat="server" etichetta='<%# traduci("VC4UG01") %>' valore='<%# Eval("VC4UG01", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor16" runat="server" etichetta='<%# traduci("VC4UG04") %>' valore='<%# Eval("VC4UG04", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor13" runat="server" etichetta='<%# traduci("SC4UG01") %>' valore='<%# Eval("SC4UG01", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em;">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor14" runat="server" etichetta='<%# traduci("FVC") %>' valore='<%# Eval("FVC", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<uc1:mod_displayHor ID="mod_displayHor20" runat="server" etichetta='<%# traduci("P_FVC") %>' valore='<%# Eval("P_FVC", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor18" runat="server" etichetta='<%# traduci("CPS") %>' valore='<%# Eval("CPS", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<uc1:mod_displayHor ID="mod_displayHor21" runat="server" etichetta='<%# traduci("P_CPS") %>' valore='<%# Eval("P_CPS", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor22" runat="server" etichetta='<%# traduci("FC4UG04") %>' valore='<%# Eval("FC4UG04", "{0:C3}") %>' />
|
||||
@@ -104,15 +159,15 @@
|
||||
<div class="col-xs-6 text-right">
|
||||
<uc1:mod_displayHor ID="mod_displayHor23" runat="server" etichetta='<%# traduci("P_FC4UG04") %>' valore='<%# Eval("P_FC4UG04", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
</div>
|
||||
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em;">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor19" runat="server" etichetta='<%# traduci("FullCost") %>' valore='<%# Eval("FullCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<uc1:mod_displayHor ID="mod_displayHor24" runat="server" etichetta='<%# traduci("P_FullCost") %>' valore='<%# Eval("P_FullCost", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:FormView>
|
||||
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter">
|
||||
|
||||
@@ -28,6 +28,24 @@ namespace C2P.WebUserControls
|
||||
frmView.ChangeMode(FormViewMode.ReadOnly);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// restituisce una stringa formattata della somma di + valori
|
||||
/// </summary>
|
||||
/// <param name="val1"></param>
|
||||
/// <param name="val2"></param>
|
||||
/// <param name="format"></param>
|
||||
/// <returns></returns>
|
||||
public string sumVal(object val1, object val2, object format)
|
||||
{
|
||||
string answ = "";
|
||||
try
|
||||
{
|
||||
answ = string.Format(format.ToString(), Convert.ToDecimal(val1) + Convert.ToDecimal(val2));
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
return answ;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,9 @@
|
||||
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
|
||||
<ItemTemplate>
|
||||
<div class="row bottomLine">
|
||||
|
||||
</div>
|
||||
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em;">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor6" runat="server" etichetta='<%# traduci("MinPrice") %>' valore='<%# Eval("MinPrice", "{0:C3}") %>' />
|
||||
</div>
|
||||
@@ -18,12 +21,12 @@
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor7" runat="server" etichetta='<%# traduci("Charge") %>' valore='<%# Eval("Charge", "{0:C3}") %>' />
|
||||
<uc1:mod_displayHor ID="mod_displayHor7" runat="server" etichetta='<%# traduci("Charge") %>' valore='<%# Eval("Charge", "{0:P1}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em;">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor8" runat="server" etichetta='<%# traduci("PriceOff") %>' valore='<%# Eval("PriceOff", "{0:C3}") %>' />
|
||||
</div>
|
||||
@@ -31,7 +34,7 @@
|
||||
<uc1:mod_displayHor ID="mod_displayHor11" runat="server" etichetta='<%# traduci("P_PriceOff") %>' valore='<%# Eval("P_PriceOff", "{0:C3}") %>' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="row bottomLine bg-warning" style="font-size: 1.2em; line-height: 1.4em;">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor12" runat="server" etichetta='<%# traduci("NetMar") %>' valore='<%# Eval("NetMar", "{0:C3}") %>' />
|
||||
</div>
|
||||
@@ -40,7 +43,7 @@
|
||||
</div>
|
||||
<div class="row bottomLine">
|
||||
<div class="col-xs-6 text-left">
|
||||
<uc1:mod_displayHor ID="mod_displayHor13" runat="server" etichetta='<%# traduci("FCShield") %>' valore='<%# Eval("FCShield", "{0:C3}") %>' />
|
||||
<uc1:mod_displayHor ID="mod_displayHor13" runat="server" etichetta='<%# traduci("FCShield") %>' valore='<%# Eval("FCShield", "{0:P1}") %>' />
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
</div>
|
||||
|
||||
@@ -10,22 +10,23 @@
|
||||
<%} %>
|
||||
<div class="container-fluid" style="background-color: #969696;">
|
||||
<div class="container">
|
||||
<div class="row" style="font-size: 2em; padding: 8px;">
|
||||
<div class="row" style="font-size: 1.6em; padding: 8px 0px;">
|
||||
<div class="col-xs-4">
|
||||
<asp:LinkButton runat="server" ID="Return" PostBackUrl="~/OffersArchive"><i class="fa fa-arrow-left"></i> <%: traduci("ReturnOffersArchive") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="col-xs-8 text-right">
|
||||
<asp:ImageButton runat="server" ID="btnGetPdf" ImageUrl="~/Images/pdfExport.png" Height="24px" ToolTip="print" />
|
||||
<asp:Label runat="server" ID="lblQuoteType" />
|
||||
<asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size:0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
|
||||
|
|
||||
<div class="col-xs-8 text-right titleBar">
|
||||
<b>
|
||||
<asp:Label runat="server" ID="lblStatus" /></b>
|
||||
<asp:Label runat="server" ID="lblIdxQState" Visible="false" />
|
||||
|
|
||||
<asp:ImageButton runat="server" ID="btnGetPdf" ImageUrl="~/Images/pdfExport.png" Height="24px" ToolTip="print" />
|
||||
<asp:Label runat="server" ID="lblQuoteType" />
|
||||
<asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size: 0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br />
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="panel panel-default">
|
||||
@@ -56,6 +57,7 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
spostare button check...
|
||||
<asp:LinkButton runat="server" ID="lbChkStandard" class="btn btn-warning" Width="100%" OnClick="lbChkStandard_Click"><i class="fa fa-flash"></i> <%: traduci("CheckStd") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
|
||||
@@ -282,7 +282,7 @@ namespace C2P.WebUserControls
|
||||
// fix visibilità button creazione offerta
|
||||
lbCreateOffer.Visible = okCreate;
|
||||
// fix altri button x edit..
|
||||
lbChkStandard.Visible = showEdit;
|
||||
lbChkStandard.Visible = false;// showEdit;
|
||||
if (!showEdit)
|
||||
{
|
||||
lbCosts.CssClass = "btn btn-default disabled";
|
||||
|
||||
+18
-18
@@ -30,6 +30,24 @@ namespace C2P.WebUserControls {
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton Return;
|
||||
|
||||
/// <summary>
|
||||
/// lblStatus 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.Label lblStatus;
|
||||
|
||||
/// <summary>
|
||||
/// lblIdxQState 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.Label lblIdxQState;
|
||||
|
||||
/// <summary>
|
||||
/// btnGetPdf control.
|
||||
/// </summary>
|
||||
@@ -66,24 +84,6 @@ namespace C2P.WebUserControls {
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblQuoteRev;
|
||||
|
||||
/// <summary>
|
||||
/// lblStatus 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.Label lblStatus;
|
||||
|
||||
/// <summary>
|
||||
/// lblIdxQState 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.Label lblIdxQState;
|
||||
|
||||
/// <summary>
|
||||
/// lbHeader control.
|
||||
/// </summary>
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user