From e4f3c1ae94f7371907d703df471849e4bb983f50 Mon Sep 17 00:00:00 2001
From: rockstardev <rockstardev@users.noreply.github.com>
Date: Sun, 13 Sep 2020 23:25:59 -0500
Subject: [PATCH] Tweaking UI for Shopify integration

---
 BTCPayServer/Views/Stores/Integrations.cshtml | 13 +++++++------
 BTCPayServer/Views/Stores/_Nav.cshtml         | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/BTCPayServer/Views/Stores/Integrations.cshtml b/BTCPayServer/Views/Stores/Integrations.cshtml
index d038aafe7..722810d30 100644
--- a/BTCPayServer/Views/Stores/Integrations.cshtml
+++ b/BTCPayServer/Views/Stores/Integrations.cshtml
@@ -23,32 +23,31 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            <h4 class="mb-3">Shopify</h4>
+            <h4 class="mb-3">
+                Shopify
+                <a href="https://docs.btcpayserver.org/Shopify" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            </h4>
 
             <div class="form-group">
                 <label asp-for="Shopify.ShopName"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="Shopify.ShopName" class="form-control" readonly="@shopifyCredsSet" />
                 <span asp-validation-for="Shopify.ShopName" class="text-danger"></span>
             </div>
 
             <div class="form-group">
                 <label asp-for="Shopify.ApiKey"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="Shopify.ApiKey" class="form-control" readonly="@shopifyCredsSet" />
                 <span asp-validation-for="Shopify.ApiKey" class="text-danger"></span>
             </div>
 
             <div class="form-group">
                 <label asp-for="Shopify.Password"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="Shopify.Password" class="form-control" readonly="@shopifyCredsSet" />
                 <span asp-validation-for="Shopify.Password" class="text-danger"></span>
             </div>
 
             <div class="form-group">
                 <label asp-for="Shopify.SharedSecret"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
                 <input asp-for="Shopify.SharedSecret" class="form-control" readonly="@shopifyCredsSet" />
                 <span asp-validation-for="Shopify.SharedSecret" class="text-danger"></span>
             </div>
@@ -71,7 +70,9 @@
                 {
                     <button name="command" type="submit" class="btn btn-primary" value="ShopifyIntegrate">Integrate Shopify Order Paid Marking</button>
                 }
-                <button name="command" type="submit" class="btn btn-danger" value="ShopifyClearCredentials">Clear Credentials</button>
+                <button name="command" type="submit" class="btn btn-danger" value="ShopifyClearCredentials">
+                    @(shopify.IntegratedAt.HasValue? "Stop Shopify calls and clear credentials" : "Clear credentials")
+                </button>
             }
 
         </form>
diff --git a/BTCPayServer/Views/Stores/_Nav.cshtml b/BTCPayServer/Views/Stores/_Nav.cshtml
index 2a3fd3755..47d4c3090 100644
--- a/BTCPayServer/Views/Stores/_Nav.cshtml
+++ b/BTCPayServer/Views/Stores/_Nav.cshtml
@@ -1,14 +1,15 @@
 <div class="nav flex-column nav-pills mb-4">
-    <a id="@(nameof(StoreNavPages.Index))"class="nav-link @ViewData.IsActivePage(StoreNavPages.Index)" asp-controller="Stores" asp-action="UpdateStore" asp-route-storeId="@this.Context.GetRouteValue("storeId")">General settings</a>
-    <a id="@(nameof(StoreNavPages.Rates))"class="nav-link @ViewData.IsActivePage(StoreNavPages.Rates)" asp-controller="Stores" asp-action="Rates" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Rates</a>
-    <a id="@(nameof(StoreNavPages.Checkout))"class="nav-link @ViewData.IsActivePage(StoreNavPages.Checkout)" asp-controller="Stores" asp-action="CheckoutExperience" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Checkout experience</a>
-    <a id="@(nameof(StoreNavPages.Tokens))"class="nav-link @ViewData.IsActivePage(StoreNavPages.Tokens)" asp-controller="Stores" asp-action="ListTokens" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Access Tokens</a>
-    <a id="@(nameof(StoreNavPages.Users))"class="nav-link @ViewData.IsActivePage(StoreNavPages.Users)" asp-controller="Stores" asp-action="StoreUsers" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Users</a>
-    <a id="@(nameof(StoreNavPages.PayButton))"class="nav-link @ViewData.IsActivePage(StoreNavPages.PayButton)" asp-controller="Stores" asp-action="PayButton" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Pay Button</a>
+    <a id="@(nameof(StoreNavPages.Index))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Index)" asp-controller="Stores" asp-action="UpdateStore" asp-route-storeId="@this.Context.GetRouteValue("storeId")">General settings</a>
+    <a id="@(nameof(StoreNavPages.Rates))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Rates)" asp-controller="Stores" asp-action="Rates" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Rates</a>
+    <a id="@(nameof(StoreNavPages.Checkout))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Checkout)" asp-controller="Stores" asp-action="CheckoutExperience" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Checkout experience</a>
+    <a id="@(nameof(StoreNavPages.Tokens))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Tokens)" asp-controller="Stores" asp-action="ListTokens" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Access Tokens</a>
+    <a id="@(nameof(StoreNavPages.Users))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Users)" asp-controller="Stores" asp-action="StoreUsers" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Users</a>
+    <a id="@(nameof(StoreNavPages.PayButton))" class="nav-link @ViewData.IsActivePage(StoreNavPages.PayButton)" asp-controller="Stores" asp-action="PayButton" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Pay Button</a>
+    <a id="@(nameof(StoreNavPages.Integrations))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Integrations)" asp-controller="Stores" asp-action="Integrations" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Integrations</a>
     @inject IEnumerable<BTCPayServer.Contracts.IStoreNavExtension> Extensions;
     @foreach (var extension in Extensions)
     {
-        <partial name="@extension.Partial"/>
+        <partial name="@extension.Partial" />
     }
 </div>