mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-23 22:46:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1107 from NicolasDorier/ui/new-confirm

Browse source 
Redesign confirm forms
This commit is contained in:
Nicolas Dorier 2019-11-03 15:37:33 +09:00 • committed by GitHub
commit b0ae878ef6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 57 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View file

@ -12,6 +12,10 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<DefineConstants>$(DefineConstants);NETCOREAPP21</DefineConstants> <DefineConstants>$(DefineConstants);NETCOREAPP21</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(CI_TESTS)' == 'true'">
<DefineConstants>$(DefineConstants);SHORT_TIME</DefineConstants>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />

2
BTCPayServer.Tests/Dockerfile
View file

@ -25,6 +25,6 @@ ENV SCREEN_HEIGHT 600 \
SCREEN_WIDTH 1200 SCREEN_WIDTH 1200
COPY . . COPY . .
RUN cd BTCPayServer.Tests && dotnet build RUN cd BTCPayServer.Tests && dotnet build /p:CI_TESTS=true
WORKDIR /source/BTCPayServer.Tests WORKDIR /source/BTCPayServer.Tests
ENTRYPOINT ["./docker-entrypoint.sh"] ENTRYPOINT ["./docker-entrypoint.sh"]

2
BTCPayServer.Tests/TestUtils.cs
View file

@ -15,7 +15,7 @@ namespace BTCPayServer.Tests
{ {
public static class TestUtils public static class TestUtils
{ {
#if DEBUG #if DEBUG && !SHORT_TIMEOUT
public const int TestTimeout = 600_000; public const int TestTimeout = 600_000;
#else #else
public const int TestTimeout = 60_000; public const int TestTimeout = 60_000;

4
BTCPayServer/Controllers/StoresController.cs
View file

@ -574,7 +574,7 @@ namespace BTCPayServer.Controllers
{ {
return View("Confirm", new ConfirmModel() return View("Confirm", new ConfirmModel()
{ {
Action = "Delete this store", Action = "Delete",
Title = "Delete this store", Title = "Delete this store",
Description = "This action is irreversible and will remove all information related to this store. (Invoices, Apps etc...)", Description = "This action is irreversible and will remove all information related to this store. (Invoices, Apps etc...)",
ButtonClass = "btn-danger" ButtonClass = "btn-danger"
@ -637,7 +637,7 @@ namespace BTCPayServer.Controllers
return NotFound(); return NotFound();
return View("Confirm", new ConfirmModel() return View("Confirm", new ConfirmModel()
{ {
Action = "Revoke the token", Action = "Revoke",
Title = "Revoke the token", Title = "Revoke the token",
Description = $"The access token with the label \"{token.Label}\" will be revoked, do you wish to continue?", Description = $"The access token with the label \"{token.Label}\" will be revoked, do you wish to continue?",
ButtonClass = "btn-danger" ButtonClass = "btn-danger"

68
BTCPayServer/Views/Shared/Confirm.cshtml
View file

@ -1,26 +1,56 @@
@model ConfirmModel @model ConfirmModel
@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
@inject BTCPayServer.HostedServices.CssThemeManager themeManager
@addTagHelper *, BundlerMinifier.TagHelpers
@{ @{
Layout = "_Layout.cshtml"; Layout = null;
} }
<section> <!DOCTYPE html>
<div class="container"> <html lang="en">
<div class="row"> <head>
<div class="col-lg-12 text-center"> <meta charset="utf-8" />
<h2 class="section-heading">@Model.Title</h2> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<hr class="primary"> <meta name="description" content="">
<p>@Model.Description</p> <meta name="author" content="">
@if (themeManager.DiscourageSearchEngines)
{
<META NAME="robots" CONTENT="noindex">
}
<title>BTCPay Server</title>
@* CSS *@
<link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
<link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.CreativeStartUri)" rel="stylesheet" />
<bundle name="wwwroot/bundles/main-bundle.min.css" />
@* JS *@
<bundle name="wwwroot/bundles/main-bundle.min.js" />
</head>
<body class="bg-light">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title w-100 text-center">@Model.Title</h4>
</div>
<div class="modal-body">
<div class="row">
<div class="col-lg-12 text-center">
<p>@Model.Description</p>
</div>
</div>
@if (!String.IsNullOrEmpty(Model.Action))
{
<div class="row">
<div class="col-lg-12 text-center">
<form method="post">
<button id="continue" type="submit" class="btn btn-secondary @Model.ButtonClass w-25">@Model.Action</button>
<button type="submit" class="btn btn-secondary w-25" onclick="history.back(); return false;">Go back</button>
</form>
</div>
</div>
}
</div> </div>
</div> </div>
@if (!String.IsNullOrEmpty(Model.Action))
{
<div class="row">
<div class="col-lg-12 text-center">
<form method="post">
<button id="continue" type="submit" class="btn btn-secondary @Model.ButtonClass" title="Continue">@Model.Action</button>
</form>
</div>
</div>
}
</div> </div>
</section> </body>
</html>