aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-23 15:14:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicated entries on Services. Fix formatting of P2P page.

Browse Source
This commit is contained in:
nicolas.dorier
2019-05-07 14:31:49 +09:00
parent 5967666df6
commit b6c37a73b1
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/ServerController.cs
View File

@@ -505,7 +505,7 @@ namespace BTCPayServer.Controllers
public async Task<IActionResult> Services()
{
var result = new ServicesViewModel();
result.ExternalServices = _Options.ExternalServices;
result.ExternalServices = _Options.ExternalServices.ToList();
foreach (var externalService in _Options.OtherExternalServices)
{
result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()

18
BTCPayServer/Views/Server/P2PService.cshtml
View File

@@ -29,7 +29,7 @@
<div class="form-group">
<h5>QR Code connection</h5>
<p>
<span>You can use QR Code to connect @Model.WalletName from outside application.<br /></span>
<span>You can use QR Code to connect to @Model.WalletName with compatible wallets.<br /></span>
</p>
</div>
<div class="form-group">
@@ -42,6 +42,15 @@
</a>
<p><a href="https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" target="_blank">Blockstream Green Wallet</a></p>
</div>
<div class="col-lg-3 mr-auto text-center">
</div>
<div class="col-lg-3 mr-auto text-center">
</div>
<div class="col-lg-3 mr-auto text-center">
</div>
</div>
<div class="form-group">
@if (!Model.ShowQR)
@@ -59,6 +68,13 @@
<div id="qrCode"></div>
<div id="qrCodeData" data-url="@Html.Raw(Model.ServiceLink)"></div>
</div>
<p>See QR Code information by clicking <a href="#detailsQR" data-toggle="collapse">here</a></p>
<div id="detailsQR" class="collapse">
<div class="form-group">
<label>QR Code data</label>
<input asp-for="ServiceLink" readonly class="form-control" />
</div>
</div>
}
</div>
</div>