Merge pull request #1090 from bolatovumar/issue-1089

Make UI checkboxes inline with their labels
This commit is contained in:
Nicolas Dorier 2019-10-14 22:47:29 +09:00 committed by GitHub
commit 8339ec59b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 127 additions and 102 deletions

View file

@ -153,34 +153,36 @@
<span asp-validation-for="NotificationEmail" class="text-danger"></span> <span asp-validation-for="NotificationEmail" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="Enabled"></label> <div class="form-check">
<input asp-for="Enabled" type="checkbox" class="form-check" /> <input asp-for="Enabled" type="checkbox" class="form-check-input" />
<span asp-validation-for="Enabled" class="text-danger"></span> <label asp-for="Enabled" class="form-check-label"></label>
</div> <span asp-validation-for="Enabled" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="SortPerksByPopularity"></label> <div class="form-check">
<input asp-for="SortPerksByPopularity" type="checkbox" class="form-check" /> <input asp-for="SortPerksByPopularity" type="checkbox" class="form-check-input" />
<span asp-validation-for="SortPerksByPopularity" class="text-danger"></span> <label asp-for="SortPerksByPopularity" class="form-check-label"></label>
</div> <span asp-validation-for="SortPerksByPopularity" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="DisplayPerksRanking"></label> <div class="form-check">
<input asp-for="DisplayPerksRanking" type="checkbox" class="form-check" /> <input asp-for="DisplayPerksRanking" type="checkbox" class="form-check-input" />
<span asp-validation-for="DisplayPerksRanking" class="text-danger"></span> <label asp-for="DisplayPerksRanking" class="form-check-label"></label>
</div> <span asp-validation-for="DisplayPerksRanking" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="EnforceTargetAmount"></label> <div class="form-check">
<input asp-for="EnforceTargetAmount" type="checkbox" class="form-check" /> <input asp-for="EnforceTargetAmount" type="checkbox" class="form-check-input" />
<span asp-validation-for="EnforceTargetAmount" class="text-danger"></span> <label asp-for="EnforceTargetAmount" class="form-check-label"></label>
</div> <span asp-validation-for="EnforceTargetAmount" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="UseAllStoreInvoices"></label> <div class="form-check">
<input asp-for="UseAllStoreInvoices" type="checkbox" class="form-check" /> <input asp-for="UseAllStoreInvoices" type="checkbox" class="form-check-input" />
<span asp-validation-for="UseAllStoreInvoices" class="text-danger"></span> <label asp-for="UseAllStoreInvoices" class="form-check-label"></label>
</div> <span asp-validation-for="UseAllStoreInvoices" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="SoundsEnabled"></label> <div class="form-check">
<input asp-for="SoundsEnabled" type="checkbox" class="form-check" /> <input asp-for="SoundsEnabled" type="checkbox" class="form-check-input" />
<span asp-validation-for="SoundsEnabled" class="text-danger"></span> <label asp-for="SoundsEnabled" class="form-check-label"></label>
<span asp-validation-for="SoundsEnabled" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="Sounds"></label> <label asp-for="Sounds"></label>
@ -188,9 +190,11 @@
<span asp-validation-for="Sounds" class="text-danger"></span> <span asp-validation-for="Sounds" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="AnimationsEnabled"></label> <div class="form-check">
<input asp-for="AnimationsEnabled" type="checkbox" class="form-check" /> <input asp-for="AnimationsEnabled" type="checkbox" class="form-check-input" />
<span asp-validation-for="AnimationsEnabled" class="text-danger"></span> <label asp-for="AnimationsEnabled" class="form-check-label"></label>
<span asp-validation-for="AnimationsEnabled" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="AnimationColors"></label> <label asp-for="AnimationColors"></label>
@ -198,9 +202,11 @@
<span asp-validation-for="AnimationColors" class="text-danger"></span> <span asp-validation-for="AnimationColors" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="DisqusEnabled"></label> <div class="form-check">
<input asp-for="DisqusEnabled" type="checkbox" class="form-check" /> <input asp-for="DisqusEnabled" type="checkbox" class="form-check-input" />
<span asp-validation-for="DisqusEnabled" class="text-danger"></span> <label asp-for="DisqusEnabled" class="form-check-label"></label>
<span asp-validation-for="DisqusEnabled" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="DisqusShortname" class="control-label"></label> <label asp-for="DisqusShortname" class="control-label"></label>

View file

@ -54,24 +54,26 @@
<span asp-validation-for="Currency" class="text-danger"></span> <span asp-validation-for="Currency" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="EnableShoppingCart"></label> <div class="form-check">
<input asp-for="EnableShoppingCart" type="checkbox" class="form-check" /> <input asp-for="EnableShoppingCart" type="checkbox" class="form-check-input" />
<span asp-validation-for="EnableShoppingCart" class="text-danger"></span> <label asp-for="EnableShoppingCart" class="form-check-label"></label>
</div> <span asp-validation-for="EnableShoppingCart" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="ShowCustomAmount"></label> <div class="form-check">
<input asp-for="ShowCustomAmount" type="checkbox" class="form-check" /> <input asp-for="ShowCustomAmount" type="checkbox" class="form-check-input" />
<span asp-validation-for="ShowCustomAmount" class="text-danger"></span> <label asp-for="ShowCustomAmount" class="form-check-label"></label>
</div> <span asp-validation-for="ShowCustomAmount" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="ShowDiscount"></label> <div class="form-check">
<input asp-for="ShowDiscount" type="checkbox" class="form-check" /> <input asp-for="ShowDiscount" type="checkbox" class="form-check-input" />
<span asp-validation-for="ShowDiscount" class="text-danger"></span> <label asp-for="ShowDiscount" class="form-check-label"></label>
</div> <span asp-validation-for="ShowDiscount" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="EnableTips"></label> <div class="form-check">
<input asp-for="EnableTips" type="checkbox" class="form-check" /> <input asp-for="EnableTips" type="checkbox" class="form-check-input" />
<span asp-validation-for="EnableTips" class="text-danger"></span> <label asp-for="EnableTips" class="form-check-label"></label>
<span asp-validation-for="EnableTips" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="ButtonText" class="control-label"></label>* <label asp-for="ButtonText" class="control-label"></label>*

View file

@ -12,24 +12,26 @@
<form method="post"> <form method="post">
<div class="form-group"> <div class="form-group">
<label asp-for="RequiresConfirmedEmail"></label> <div class="form-check">
<input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-inline"/> <input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-input"/>
<span asp-validation-for="RequiresConfirmedEmail" class="text-danger"></span> <label asp-for="RequiresConfirmedEmail" class="form-check-label"></label>
</div> <span asp-validation-for="RequiresConfirmedEmail" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="LockSubscription"></label> <div class="form-check">
<input asp-for="LockSubscription" type="checkbox" class="form-check-inline"/> <input asp-for="LockSubscription" type="checkbox" class="form-check-input"/>
<span asp-validation-for="LockSubscription" class="text-danger"></span> <label asp-for="LockSubscription" class="form-check-label"></label>
</div> <span asp-validation-for="LockSubscription" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="DiscourageSearchEngines"></label> <div class="form-check">
<input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-inline"/> <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-input"/>
<span asp-validation-for="DiscourageSearchEngines" class="text-danger"></span> <label asp-for="DiscourageSearchEngines" class="form-check-label"></label>
</div> <span asp-validation-for="DiscourageSearchEngines" class="text-danger"></span>
<div class="form-group"> </div>
<label asp-for="AllowLightningInternalNodeForAll"></label> <div class="form-check">
<input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-inline"/> <input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-input"/>
<span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span> <label asp-for="AllowLightningInternalNodeForAll" class="form-check-label"></label>
<span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="RootAppId"></label> <label asp-for="RootAppId"></label>

View file

@ -12,8 +12,10 @@
<div class="col-md-8"> <div class="col-md-8">
<form method="post"> <form method="post">
<div class="form-group"> <div class="form-group">
<label asp-for="IsAdmin"></label> <div class="form-check">
<input asp-for="IsAdmin" type="checkbox" class="form-check" /> <input asp-for="IsAdmin" type="checkbox" class="form-check-input" />
<label asp-for="IsAdmin" class="form-check-label"></label>
</div>
</div> </div>
<button name="command" type="submit" class="btn btn-primary" value="Save">Save</button> <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
</form> </form>

View file

@ -96,8 +96,10 @@ $(document).ready(function(){
<span asp-validation-for="Settings.Password" class="text-danger"></span> <span asp-validation-for="Settings.Password" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="Settings.EnableSSL"></label> <div class="form-check">
<input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline"/> <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-input"/>
<label asp-for="Settings.EnableSSL" class="form-check-label"></label>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="TestEmail"></label> <label asp-for="TestEmail"></label>

View file

@ -109,8 +109,10 @@
<input asp-for="KeyPath" class="form-control" readonly /> <input asp-for="KeyPath" class="form-control" readonly />
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="Enabled"></label> <div class="form-check">
<input asp-for="Enabled" type="checkbox" class="form-check" /> <input asp-for="Enabled" type="checkbox" class="form-check-input" />
<label asp-for="Enabled" class="form-check-label"></label>
</div>
</div> </div>
<button name="command" type="submit" class="btn btn-primary" value="save" id="Continue">Continue</button> <button name="command" type="submit" class="btn btn-primary" value="save" id="Continue">Continue</button>
} }

View file

@ -40,8 +40,10 @@
<select asp-for="DefaultLang" asp-items="Model.Languages" class="form-control"></select> <select asp-for="DefaultLang" asp-items="Model.Languages" class="form-control"></select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="RequiresRefundEmail"></label> <div class="form-check">
<input asp-for="RequiresRefundEmail" type="checkbox" class="form-check" /> <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check-input" />
<label asp-for="RequiresRefundEmail" class="form-check-label"></label>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="OnChainMinValue"></label> <label asp-for="OnChainMinValue"></label>
@ -56,16 +58,17 @@
<p class="form-text text-muted">Example: 5.50 USD</p> <p class="form-text text-muted">Example: 5.50 USD</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="LightningAmountInSatoshi"></label> <div class="form-check">
<input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check" /> <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check-input" />
<span asp-validation-for="LightningAmountInSatoshi" class="text-danger"></span> <label asp-for="LightningAmountInSatoshi" class="form-check-label"></label>
<span asp-validation-for="LightningAmountInSatoshi" class="text-danger"></span>
</div>
<div class="form-check">
<input asp-for="RedirectAutomatically" type="checkbox" class="form-check-input" />
<label asp-for="RedirectAutomatically" class="form-check-label" ></label>
<span asp-validation-for="RedirectAutomatically" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group">
<label asp-for="RedirectAutomatically"></label>
<input asp-for="RedirectAutomatically" type="checkbox" class="form-check" />
<span asp-validation-for="RedirectAutomatically" class="text-danger"></span>
</div>
<br />
<button name="command" type="submit" class="btn btn-primary" value="Save">Save</button> <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
</form> </form>
</div> </div>

View file

@ -38,9 +38,11 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="AnyoneCanCreateInvoice"></label> <div class="form-check">
<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-stores#allow-anyone-to-create-invoice" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="form-check-input" />
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="form-check" /> <label asp-for="AnyoneCanCreateInvoice" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-stores#allow-anyone-to-create-invoice" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="InvoiceExpiration"></label> <label asp-for="InvoiceExpiration"></label>

View file

@ -78,9 +78,11 @@
<span asp-validation-for="Outputs[index].Amount" class="text-danger"></span> <span asp-validation-for="Outputs[index].Amount" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label asp-for="Outputs[index].SubtractFeesFromOutput" class="control-label"></label> <div class="form-check">
<input type="checkbox" asp-for="Outputs[index].SubtractFeesFromOutput" class="form-check subtract-fees" /> <input type="checkbox" asp-for="Outputs[index].SubtractFeesFromOutput" class="form-check-input subtract-fees" />
<span asp-validation-for="Outputs[index].SubtractFeesFromOutput" class="text-danger"></span> <label asp-for="Outputs[index].SubtractFeesFromOutput" class="form-check-label"></label>
<span asp-validation-for="Outputs[index].SubtractFeesFromOutput" class="text-danger"></span>
</div>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-2 pull-right"> <div class="col-sm-12 col-md-12 col-lg-2 pull-right">
@ -108,9 +110,11 @@
@if (Model.Outputs.Count == 1) @if (Model.Outputs.Count == 1)
{ {
<div class="form-group"> <div class="form-group">
<label asp-for="Outputs[0].SubtractFeesFromOutput" class="control-label"></label> <div class="form-check">
<input type="checkbox" asp-for="Outputs[0].SubtractFeesFromOutput" class="form-check subtract-fees" /> <input type="checkbox" asp-for="Outputs[0].SubtractFeesFromOutput" class="form-check-input subtract-fees" />
<span asp-validation-for="Outputs[0].SubtractFeesFromOutput" class="text-danger"></span> <label asp-for="Outputs[0].SubtractFeesFromOutput" class="form-check-label"></label>
<span asp-validation-for="Outputs[0].SubtractFeesFromOutput" class="text-danger"></span>
</div>
</div> </div>
} }
<div class="card"> <div class="card">
@ -123,21 +127,21 @@
</div> </div>
<div id="accordian-advanced" class="collapse" aria-labelledby="accordian-advanced-header" data-parent="#accordian-advanced"> <div id="accordian-advanced" class="collapse" aria-labelledby="accordian-advanced-header" data-parent="#accordian-advanced">
<div class="card-body"> <div class="card-body">
<div class="form-group"> <div class="form-check">
<label asp-for="NoChange"></label> <input asp-for="NoChange" class="form-check-input" />
<label asp-for="NoChange" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/features/wallet#make-sure-no-change-utxo-is-created-expert-mode" target="_blank"> <a href="https://docs.btcpayserver.org/features/wallet#make-sure-no-change-utxo-is-created-expert-mode" target="_blank">
<span class="fa fa-question-circle-o" title="More information..."></span> <span class="fa fa-question-circle-o" title="More information..."></span>
</a> </a>
<input asp-for="NoChange" class="form-check" />
</div> </div>
@if (Model.SupportRBF) @if (Model.SupportRBF)
{ {
<div class="form-group"> <div class="form-check">
<label asp-for="DisableRBF"></label> <input asp-for="DisableRBF" class="form-check-input" />
<label asp-for="DisableRBF" class="form-check-label"></label>
<a href="https://bitcoin.org/en/glossary/rbf" target="_blank"> <a href="https://bitcoin.org/en/glossary/rbf" target="_blank">
<span class="fa fa-question-circle-o" title="More information..."></span> <span class="fa fa-question-circle-o" title="More information..."></span>
</a> </a>
<input asp-for="DisableRBF" class="form-check" />
</div> </div>
} }
</div> </div>