mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-20 02:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Column improvements quick patch (#2562)

Browse Source 
* removes title, switches search input with title

* adds CSS change

* Update BTCPayServer/Views/Server/ListUsers.cshtml

Breakpoint improvement

Co-authored-by: d11n <mail@dennisreimann.de>

* Update BTCPayServer/wwwroot/main/site.css

Co-authored-by: d11n <mail@dennisreimann.de>

* github revision fix

* spacing

* Simplify file details display

* Resolve users list conflict

* Indent fix

* Fix Tor casing

Co-authored-by: d11n <mail@dennisreimann.de>
This commit is contained in:
dstrukt 2021-06-09 01:53:24 -07:00 committed by GitHub
parent e4f298acac
commit f1f3dffc97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BTCPayServer/Views/Server/Files.cshtml
View File

@ -72,23 +72,18 @@ else
<li class="list-group-item"> <li class="list-group-item">
@file.FileName @file.FileName
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<div class="row px-0 mx-0"> <strong>URL:</strong>
<span class="col-sm-12 col-md-2">Url: </span> <a asp-action="GetFile" asp-controller="Storage" asp-route-fileId="@Model.SelectedFileId" target="_blank">
<a class="col-sm-12 col-md-10 text-end" asp-action="GetFile" asp-controller="Storage" asp-route-fileId="@Model.SelectedFileId" target="_blank"> @Url.Action("GetFile", "Storage", new
@Url.Action("GetFile", "Storage", new {
{ fileId = Model.SelectedFileId
fileId = Model.SelectedFileId }, Context.Request.Scheme, Context.Request.Host.ToString())
}, Context.Request.Scheme, Context.Request.Host.ToString()) </a>
</a>
</div>
</li> </li>
<li class="list-group-item "> <li class="list-group-item">
<div class="row px-0 mx-0"> <strong>Direct URL:</strong>
<span class="col-sm-12 col-md-2">Direct Url: </span> <a href="@Model.DirectFileUrl" target="_blank">@Model.DirectFileUrl</a>
<a class="col-sm-12 col-md-10 text-end" href="@Model.DirectFileUrl" target="_blank">@Model.DirectFileUrl</a>
</div>
</li> </li>
</ul> </ul>
</div> </div>

13
BTCPayServer/Views/Server/ListUsers.cshtml
View File

@ -35,19 +35,6 @@
</form> </form>
<a asp-action="CreateUser" class="btn btn-primary mb-2" role="button" id="CreateUser">Add User</a> <a asp-action="CreateUser" class="btn btn-primary mb-2" role="button" id="CreateUser">Add User</a>
</div> </div>
<form asp-action="ListUsers"
asp-route-sortOrder="@(userEmailSortOrder)">
<div class="input-group">
<input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
<button type="submit" class="btn btn-secondary" title="Search by email">
<span class="fa fa-search"></span> Search
</button>
</div>
<span asp-validation-for="SearchTerm" class="text-danger"></span>
</form>
<a asp-action="CreateUser" class="btn btn-primary" role="button" id="CreateUser">Add User</a>
</div>
<table class="table table-sm"> <table class="table table-sm">
<thead> <thead>

66
BTCPayServer/Views/Server/Services.cshtml
View File

@ -5,37 +5,37 @@
<h2 class="mb-4">@ViewData["PageTitle"]</h2> <h2 class="mb-4">@ViewData["PageTitle"]</h2>
<div class="mb-5"> <div class="mb-5">
<h4 class="mb-3">Crypto services exposed by your server</h4> <h4 class="mb-3">Crypto services exposed by your server</h4>
<table class="table table-sm mt-2"> <table class="table table-sm mt-2">
<thead> <thead>
<tr> <tr>
<th>Crypto</th> <th>Crypto</th>
<th>Access Type</th> <th>Access Type</th>
<th style="text-align: right">Actions</th> <th style="text-align: right">Actions</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var s in Model.ExternalServices.Where(service => !string.IsNullOrEmpty(service.CryptoCode))) @foreach (var s in Model.ExternalServices.Where(service => !string.IsNullOrEmpty(service.CryptoCode)))
{ {
<tr> <tr>
<td>@s.CryptoCode</td> <td>@s.CryptoCode</td>
<td> <td>
<span>@s.DisplayName</span> <span>@s.DisplayName</span>
@if (s.ConnectionString.IsOnion() == true || @if (s.ConnectionString.IsOnion() == true ||
(s.ConnectionString.IsOnion() == false && this.Context.Request.IsOnion())) (s.ConnectionString.IsOnion() == false && Context.Request.IsOnion()))
{ {
<span><img style="display:inline; margin-top:-8px;" src="~/img/icons/Onion_Color.svg" height="20" asp-append-version="true" /></span> <img style="display:inline; margin-top:-8px;" src="~/img/icons/Onion_Color.svg" height="20" asp-append-version="true" alt="Tor Hidden Service" />
} }
</td> </td>
<td style="text-align: right"> <td style="text-align: right">
<a asp-action="Service" asp-route-serviceName="@s.ServiceName" asp-route-cryptoCode="@s.CryptoCode">See information</a> <a asp-action="Service" asp-route-serviceName="@s.ServiceName" asp-route-cryptoCode="@s.CryptoCode">See information</a>
</td> </td>
</tr> </tr>
} }
</tbody> </tbody>
</table> </table>
</div> </div>
@if (Model.OtherExternalServices.Count != 0 || Model.ExternalServices.Any(service => string.IsNullOrEmpty(service.CryptoCode))) @if (Model.OtherExternalServices.Count != 0 || Model.ExternalServices.Any(service => string.IsNullOrEmpty(service.CryptoCode)))
{ {
@ -76,7 +76,7 @@
@if (Model.TorHttpServices.Count != 0) @if (Model.TorHttpServices.Count != 0)
{ {
<div class="mb-5"> <div class="mb-5">
<h4 class="mb-3">HTTP-based TOR hidden services</h4> <h4 class="mb-3">HTTP-based Tor hidden services</h4>
<table class="table table-sm mt-2"> <table class="table table-sm mt-2">
<thead> <thead>
@ -103,7 +103,7 @@
@if (Model.TorOtherServices.Count != 0) @if (Model.TorOtherServices.Count != 0)
{ {
<div class="mb-5"> <div class="mb-5">
<h4 class="mb-3">Other TOR hidden services</h4> <h4 class="mb-3">Other Tor hidden services</h4>
<table class="table table-sm mt-2"> <table class="table table-sm mt-2">
<thead> <thead>