From be7cef29d817be1e9318aaa2e496e872c27371b8 Mon Sep 17 00:00:00 2001
From: Samuel Adams <samuel.atwood@gmail.com>
Date: Wed, 3 Nov 2021 11:43:08 -0400
Subject: [PATCH] UI changes

Removes the separate column for view style and instead appends it to the App Type column.
---
 BTCPayServer/Controllers/AppsController.cs |  2 --
 BTCPayServer/Views/Apps/ListApps.cshtml    | 24 ++++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/BTCPayServer/Controllers/AppsController.cs b/BTCPayServer/Controllers/AppsController.cs
index f4b65e8c9..0d8e649d7 100644
--- a/BTCPayServer/Controllers/AppsController.cs
+++ b/BTCPayServer/Controllers/AppsController.cs
@@ -73,8 +73,6 @@ namespace BTCPayServer.Controllers
                                 return app.StoreName;
                             case nameof(app.AppType):
                                 return app.AppType;
-                            case nameof(app.ViewStyle):
-                                return app.ViewStyle;
                             default:
                                 return app.Id;
                         }
diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 0b57d020b..94176ccb1 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -5,7 +5,6 @@
     var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"];
     var appNameSortOrder = (string)ViewData["AppNameSortOrder"];
     var appTypeSortOrder = (string)ViewData["AppTypeSortOrder"];
-    var viewStyleSortOrder = (string)ViewData["ViewStyleSortOrder"];
     var sortByDesc = "Sort by descending...";
     var sortByAsc = "Sort by ascending...";
 }
@@ -69,18 +68,6 @@
                                     <span class="fa @(appTypeSortOrder == "asc" ? "fa-sort-alpha-desc" : appTypeSortOrder == "desc" ? "fa-sort-alpha-asc" : "fa-sort")" />
                                 </a>
                             </th>
-                            <th>
-                                <a
-                                    asp-action="ListApps"
-                                    asp-route-sortOrder="@(viewStyleSortOrder ?? "asc")"
-                                    asp-route-sortOrderColumn="ViewStyle"
-                                    class="text-nowrap"
-                                    title="@(viewStyleSortOrder == "desc" ? sortByDesc : sortByAsc)"
-                                >
-                                    View Style
-                                    <span class="fa @(viewStyleSortOrder == "asc" ? "fa-sort-alpha-desc" : viewStyleSortOrder == "desc" ? "fa-sort-alpha-asc" : "fa-sort")" />
-                                </a>
-                            </th>
                             <th style="text-align:right">Actions</th>
                         </tr>
                         </thead>
@@ -99,8 +86,15 @@
                                     }
                                 </td>
                                 <td>@app.AppName</td>
-                                <td>@typeof(AppType).DisplayName(app.AppType)</td>
-                                <td>@app.ViewStyle</td>
+                                <td>
+                                    @typeof(AppType).DisplayName(app.AppType) 
+                                    @if (app.AppType != AppType.Crowdfund.ToString())
+                                    {
+                                        <span>-</span> 
+                                    }
+                                    
+                                    @app.ViewStyle
+                                </td>
                                 <td style="text-align:right">
                                     @if (app.IsOwner)
                                     {