From 431963073f2900b87da34ab1e54bc336a3fdc024 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 22 Sep 2017 11:37:18 +0200 Subject: [PATCH] Width test --- .../v5/Financial/ListInvoicesInbound.aspx | 10 +++---- .../v5/Financial/ListInvoicesInbound.aspx.cs | 26 ++++++++++--------- .../ListInvoicesInbound.aspx.designer.cs | 4 +-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx index e5c2a56a..ee559a6c 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx @@ -179,15 +179,15 @@

- + - + - - + + diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs index 001fd899..c8937e71 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs @@ -115,23 +115,25 @@ namespace Swarmops.Frontend.Pages.v5.Financial InfoBoxLiteral = Resources.Pages.Financial.AttestCosts_Info; this.LabelListInboundInvoicesHeader.Text = Resources.Pages.Financial.ListInboundInvoices_Header; this.LabelGridHeaderItem.Text = Resources.Pages.Financial.AttestCosts_GridHeader_Item; - this.LabelGridHeaderActions.Text = Resources.Global.Global_Action; + this.LabelGridHeaderDueDate.Text = Resources.Global.Financial_DueDate; this.LabelGridHeaderBeneficiary.Text = Resources.Pages.Financial.ListInboundInvoices_Header_Sender; this.LabelGridHeaderBudget.Text = Resources.Global.Financial_Budget; - this.LabelGridHeaderDocs.Text = Resources.Pages.Financial.AttestCosts_GridHeader_Docs; this.LabelGridHeaderRequested.Text = Resources.Pages.Financial.AttestCosts_GridHeader_Requested; + this.LabelGridHeaderProgress.Text = Resources.Global.Global_Progress; + this.LabelGridHeaderDocs.Text = Resources.Pages.Financial.AttestCosts_GridHeader_Docs; + this.LabelGridHeaderActions.Text = Resources.Global.Global_Action; - /* this.LiteralErrorInsufficientBudget.Text = JavascriptEscape (Resources.Pages.Financial.AttestCosts_OutOfBudget); - this.LiteralWarnUnintializedBudget.Text = - JavascriptEscape (Resources.Pages.Financial.AttestCosts_Warn_UninitializedBudget);*/ -/* - this.LabelDescribeDeny.Text = Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionDeny; - this.LabelDescribeCorrect.Text = String.Format (Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionAmount, CurrentOrganization.Currency.DisplayCode); - this.LabelDescribeRebudget.Text = Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionRebudget; + /* this.LiteralErrorInsufficientBudget.Text = JavascriptEscape (Resources.Pages.Financial.AttestCosts_OutOfBudget); + this.LiteralWarnUnintializedBudget.Text = + JavascriptEscape (Resources.Pages.Financial.AttestCosts_Warn_UninitializedBudget);*/ + /* + this.LabelDescribeDeny.Text = Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionDeny; + this.LabelDescribeCorrect.Text = String.Format (Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionAmount, CurrentOrganization.Currency.DisplayCode); + this.LabelDescribeRebudget.Text = Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionRebudget; - this.LabelRadioCorrect.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionAmount; - this.LabelRadioDeny.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionDeny; - this.LabelRadioRebudget.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionRebudget;*/ + this.LabelRadioCorrect.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionAmount; + this.LabelRadioDeny.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionDeny; + this.LabelRadioRebudget.Text = Resources.Pages.Financial.AttestCosts_Modal_RadioOptionRebudget;*/ this.LiteralButtonCorrect.Text = JavascriptEscape(Resources.Pages.Financial.AttestCosts_Modal_ButtonAmount); this.LiteralButtonDeny.Text = JavascriptEscape(Resources.Pages.Financial.AttestCosts_Modal_ButtonDeny); diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.designer.cs b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.designer.cs index 66c60c0b..fca749ed 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.designer.cs +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.designer.cs @@ -67,13 +67,13 @@ namespace Swarmops.Frontend.Pages.v5.Financial { protected global::System.Web.UI.WebControls.Label LabelGridHeaderItem; /// - /// LabelDueDate control. + /// LabelGridHeaderDueDate control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label LabelDueDate; + protected global::System.Web.UI.WebControls.Label LabelGridHeaderDueDate; /// /// LabelGridHeaderBeneficiary control.