From 7af80611b6055ee1a6a380e80b7755ea8b951c0e Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Sat, 16 Nov 2019 22:59:51 +0100 Subject: [PATCH 1/2] UI: Better payment request amounts display Uses a table instead of list group items, so that the columns properly align (rows use the same grid). Also aligns the values on the right. --- .../MinimalPaymentRequest.cshtml | 53 +++++++++---------- .../PaymentRequest/ViewPaymentRequest.cshtml | 49 ++++++++--------- 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml index 2d51424a3..8fea053c4 100644 --- a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml @@ -4,45 +4,40 @@
-

+

@Model.Title @Model.Status

-
-
    -
  • -
    - Request amount: - @Model.AmountFormatted -
    -
    • -
  • -
    - Paid so far: - @Model.AmountCollectedFormatted -
    -
    • -
  • -
    - Amount due: - @Model.AmountDueFormatted -
    -
    • -
+
+ + + + + + + + + + + + + + + +
Request amount:@Model.AmountFormatted
Paid so far:@Model.AmountCollectedFormatted
Amount due:@Model.AmountDueFormatted
@Safe.Raw(Model.Description)
-
-
+
- +
- - - - + + + + diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml index 1d6be811b..cfc9a451f 100644 --- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml @@ -52,7 +52,7 @@ else
-

+

{{srvModel.title}} @@ -66,39 +66,34 @@ else

-
-
    -
  • -
    - Request amount: - {{srvModel.amountFormatted}} -
    -
    • -
  • -
    - Paid so far: - {{srvModel.amountCollectedFormatted}} -
    -
    • -
  • -
    - Amount due: - {{srvModel.amountDueFormatted}} -
    -
    • -
+
+
Invoice #PriceExpiryStatusInvoice #PriceExpiryStatus
+ + + + + + + + + + + + + + +
Request amount:{{srvModel.amountFormatted}}
Paid so far:{{srvModel.amountCollectedFormatted}}
Amount due:{{srvModel.amountDueFormatted}}
-
- - - - + + + + From 0be6f3ca70219a376222916c7db9e906c6baaaa0 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Sat, 16 Nov 2019 23:19:10 +0100 Subject: [PATCH 2/2] UI: Remove superfluous spaces when description is empty --- .../PaymentRequest/MinimalPaymentRequest.cshtml | 13 ++++++++----- .../Views/PaymentRequest/ViewPaymentRequest.cshtml | 14 +++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml index 8fea053c4..85f041819 100644 --- a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml @@ -8,10 +8,10 @@ @Model.Title @Model.Status -
-
+
+
-
Invoice #PriceExpiryStatusInvoice #PriceExpiryStatus
+
@@ -27,9 +27,12 @@
Request amount:
-
@Safe.Raw(Model.Description)
+ @if (Model.Description != null && Model.Description != "" && Model.Description != "
") + { +
@Safe.Raw(Model.Description)
+ }
-
+
diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml index cfc9a451f..894f0a0f5 100644 --- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml @@ -64,10 +64,10 @@ else -
-
+
+
-
+
@@ -83,9 +83,13 @@ else
Request amount:
-
+
-
+