From 4d4459fa4e4ab16e0a42320f1ec2f2bf1d64d75a Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Fri, 25 Sep 2020 18:08:45 +0200 Subject: [PATCH] Payment Request UI: Layout and header --- .../MinimalPaymentRequest.cshtml | 10 +- .../PaymentRequest/ViewPaymentRequest.cshtml | 294 +++++++++--------- BTCPayServer/Views/Shared/_Layout.cshtml | 14 +- BTCPayServer/bundleconfig.json | 11 +- BTCPayServer/wwwroot/main/site.css | 14 +- BTCPayServer/wwwroot/payment-request/app.js | 13 +- .../wwwroot/payment-request/styles/main.css | 7 - 7 files changed, 174 insertions(+), 189 deletions(-) delete mode 100644 BTCPayServer/wwwroot/payment-request/styles/main.css diff --git a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml index 152b7262b..f960291bb 100644 --- a/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/MinimalPaymentRequest.cshtml @@ -147,7 +147,8 @@ } - }else if (Model.Archived) + } + else if (Model.Archived) { @@ -162,13 +163,6 @@ -
- -
Updated @Model.LastUpdated.ToString("g")
-
- Powered by BTCPay Server -
-
diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml index 1cddd13dc..a1db9907e 100644 --- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml +++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml @@ -12,96 +12,162 @@ @Model.Title - - + + + @if (Model.CustomCSSLink != null) { } - @if (!Context.Request.Query.ContainsKey("simple")) - { - - - - @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@ - - } - - - + + + @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@ + @Safe.Raw(Model.EmbeddedCSS) - - - -@if (Context.Request.Query.ContainsKey("simple")) -{ - @await Html.PartialAsync("MinimalPaymentRequest", Model) -} -else -{ - - -
-
-
-
-

- {{srvModel.title}} - - - - - -

-
+ +
+