From 6a0cda69c96afa2e30d5e8173e723515cf31e63e Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 7 Apr 2020 18:12:15 +0200 Subject: [PATCH 1/4] Wallet view improvements As brought up by @kukks with [this comment](https://github.com/btcpayserver/btcpayserver/pull/1434#issuecomment-609724703). These improvements can be applied across themes, so these fixes are separated from the originating PR. Pure visual finetunings for the Coin Selection form and amount/fee rate links. --- BTCPayServer/Views/Wallets/CoinSelection.cshtml | 8 ++++---- BTCPayServer/Views/Wallets/WalletSend.cshtml | 7 ++++--- BTCPayServer/Views/Wallets/WalletTransactions.cshtml | 10 +++++----- BTCPayServer/wwwroot/main/site.css | 4 ++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/BTCPayServer/Views/Wallets/CoinSelection.cshtml b/BTCPayServer/Views/Wallets/CoinSelection.cshtml index c80fe28fb..b80f604fa 100644 --- a/BTCPayServer/Views/Wallets/CoinSelection.cshtml +++ b/BTCPayServer/Views/Wallets/CoinSelection.cshtml @@ -23,22 +23,22 @@
  • - {{item.outpoint}} + {{item.outpoint}}
    i {{label.value}}
    - {{item.amount}} + {{item.amount}}
  • diff --git a/BTCPayServer/Views/Wallets/WalletSend.cshtml b/BTCPayServer/Views/Wallets/WalletSend.cshtml index 808c1e33f..2e0906054 100644 --- a/BTCPayServer/Views/Wallets/WalletSend.cshtml +++ b/BTCPayServer/Views/Wallets/WalletSend.cshtml @@ -51,6 +51,7 @@ +
    } @if (Model.Outputs.Count == 1) @@ -71,7 +72,7 @@

    Your current balance is - @Model.CryptoCode. + @Model.CryptoCode.

    } @@ -101,7 +102,7 @@

    Your current balance is - @Model.CryptoCode. + @Model.CryptoCode.

    @@ -132,7 +133,7 @@

    The recommended value is - satoshi per byte. + satoshi per byte.

    @if (Model.Outputs.Count == 1) diff --git a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml index bc4cfe928..844427191 100644 --- a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml +++ b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml @@ -15,7 +15,7 @@ } } - .unconf { + .unconf > * { opacity: 0.5; } @@ -102,10 +102,10 @@ " > @label.Value -
    @@ -137,7 +137,7 @@
    -
    @@ -171,7 +171,7 @@ }
    - diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css index 3def21f4c..4c3005d59 100644 --- a/BTCPayServer/wwwroot/main/site.css +++ b/BTCPayServer/wwwroot/main/site.css @@ -146,3 +146,7 @@ pre { .cursor-pointer{ cursor: pointer; } + +.list-group-item a { + color: inherit; +} From d6d58a98db9d9a109de78e9121e33b531b19a085 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 8 Apr 2020 13:15:03 +0200 Subject: [PATCH 2/4] Improve non-js coin selection --- BTCPayServer/Views/Wallets/WalletSend.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BTCPayServer/Views/Wallets/WalletSend.cshtml b/BTCPayServer/Views/Wallets/WalletSend.cshtml index 2e0906054..78e92e669 100644 --- a/BTCPayServer/Views/Wallets/WalletSend.cshtml +++ b/BTCPayServer/Views/Wallets/WalletSend.cshtml @@ -43,10 +43,10 @@ {
    - @foreach (var input in Model.InputsAvailable) { - + }
    From 5a841216b8b472a0b1694f69c9bd6e27028f3fde Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 8 Apr 2020 13:29:16 +0200 Subject: [PATCH 3/4] Add checkbox coin selection (js version) --- .../Views/Wallets/CoinSelection.cshtml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/BTCPayServer/Views/Wallets/CoinSelection.cshtml b/BTCPayServer/Views/Wallets/CoinSelection.cshtml index b80f604fa..937ad3a66 100644 --- a/BTCPayServer/Views/Wallets/CoinSelection.cshtml +++ b/BTCPayServer/Views/Wallets/CoinSelection.cshtml @@ -25,8 +25,22 @@ :key="item.outpoint" v-bind:class="{ 'list-group-item-secondary': item.selected }" v-on:click="toggleItem($event, item, !item.selected)"> - {{item.outpoint}} -
    +
    + +
    i Date: Wed, 8 Apr 2020 13:29:54 +0200 Subject: [PATCH 4/4] Fix wording for no vault connection --- BTCPayServer/wwwroot/js/vaultbridge.ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BTCPayServer/wwwroot/js/vaultbridge.ui.js b/BTCPayServer/wwwroot/js/vaultbridge.ui.js index 2caf6e3dc..facf8988c 100644 --- a/BTCPayServer/wwwroot/js/vaultbridge.ui.js +++ b/BTCPayServer/wwwroot/js/vaultbridge.ui.js @@ -28,7 +28,7 @@ var vaultui = (function () { vaultLoading: new VaultFeedback("?", "Checking BTCPayServer Vault is running...", "vault-feedback1", "vault-loading"), vaultDenied: new VaultFeedback("failed", "The user declined access to the vault.", "vault-feedback1", "vault-denied"), vaultGranted: new VaultFeedback("ok", "Access to vault granted by owner.", "vault-feedback1", "vault-granted"), - noVault: new VaultFeedback("failed", "BTCPayServer Vault does not seems running, you can download it on Github.", "vault-feedback1", "no-vault"), + noVault: new VaultFeedback("failed", "BTCPayServer Vault does not seem to be running, you can download it on Github.", "vault-feedback1", "no-vault"), noWebsockets: new VaultFeedback("failed", "Web sockets are not supported by the browser.", "vault-feedback1", "no-websocket"), errorWebsockets: new VaultFeedback("failed", "Error of the websocket while connecting to the backend.", "vault-feedback1", "error-websocket"), bridgeConnected: new VaultFeedback("ok", "BTCPayServer successfully connected to the vault.", "vault-feedback1", "bridge-connected"),