UI changes

Removes the separate column for view style and instead appends it to the App Type column.
This commit is contained in:
Samuel Adams 2021-11-03 11:43:08 -04:00 committed by Andrew Camilleri
parent e914c84ad3
commit be7cef29d8
2 changed files with 9 additions and 17 deletions

View File

@ -73,8 +73,6 @@ namespace BTCPayServer.Controllers
return app.StoreName; return app.StoreName;
case nameof(app.AppType): case nameof(app.AppType):
return app.AppType; return app.AppType;
case nameof(app.ViewStyle):
return app.ViewStyle;
default: default:
return app.Id; return app.Id;
} }

View File

@ -5,7 +5,6 @@
var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"]; var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"];
var appNameSortOrder = (string)ViewData["AppNameSortOrder"]; var appNameSortOrder = (string)ViewData["AppNameSortOrder"];
var appTypeSortOrder = (string)ViewData["AppTypeSortOrder"]; var appTypeSortOrder = (string)ViewData["AppTypeSortOrder"];
var viewStyleSortOrder = (string)ViewData["ViewStyleSortOrder"];
var sortByDesc = "Sort by descending..."; var sortByDesc = "Sort by descending...";
var sortByAsc = "Sort by ascending..."; 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")" /> <span class="fa @(appTypeSortOrder == "asc" ? "fa-sort-alpha-desc" : appTypeSortOrder == "desc" ? "fa-sort-alpha-asc" : "fa-sort")" />
</a> </a>
</th> </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> <th style="text-align:right">Actions</th>
</tr> </tr>
</thead> </thead>
@ -99,8 +86,15 @@
} }
</td> </td>
<td>@app.AppName</td> <td>@app.AppName</td>
<td>@typeof(AppType).DisplayName(app.AppType)</td> <td>
<td>@app.ViewStyle</td> @typeof(AppType).DisplayName(app.AppType)
@if (app.AppType != AppType.Crowdfund.ToString())
{
<span>-</span>
}
@app.ViewStyle
</td>
<td style="text-align:right"> <td style="text-align:right">
@if (app.IsOwner) @if (app.IsOwner)
{ {