Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tenants UI #8015

Merged
merged 22 commits into from
Dec 17, 2020
Merged

Tenants UI #8015

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3c19c5c
Tenants UI
agriffard Dec 15, 2020
831d945
Setup, external link
agriffard Dec 16, 2020
c41b508
Filter
agriffard Dec 16, 2020
dcf9eec
Filters, Host
agriffard Dec 16, 2020
501d15e
badge
agriffard Dec 16, 2020
d272a6c
badge and icon
agriffard Dec 16, 2020
a622e51
Feedback
agriffard Dec 16, 2020
7ac4df6
badge font-weight-normal
agriffard Dec 16, 2020
9e56128
Fix list header disappearing (and filters) when filtering returns no …
Skrypt Dec 16, 2020
52c3c37
Database, Recipe
agriffard Dec 16, 2020
19b701f
mx-4
agriffard Dec 16, 2020
26c5a05
Url host with mx-0
agriffard Dec 16, 2020
ef14dca
RecipeName
agriffard Dec 16, 2020
c8f2c47
Move View icon
agriffard Dec 16, 2020
a5b3bf5
@ cols
agriffard Dec 17, 2020
66401a4
col-lg-6
agriffard Dec 17, 2020
e5d9329
Fix margin with flex-shrink-0
Skrypt Dec 17, 2020
1b8346d
Add confirm modal when disabling tenant.
Skrypt Dec 17, 2020
43fc420
Merge branch 'dev' into ag/tenantsTooltips
Skrypt Dec 17, 2020
b7b9a39
Text break for long tenant names
Skrypt Dec 17, 2020
c4b8700
Merge branch 'dev' into ag/tenantsTooltips
agriffard Dec 17, 2020
b84a30c
badges
agriffard Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,25 @@
<input type="submit" name="submit.Filter" id="submitFilter" class="d-none" />
<input type="submit" name="submit.BulkAction" class="d-none" />
<input name="BulkAction" type="hidden" />

<div class="card mb-3 position-sticky action-bar">
<div class="card-body bg-primary p-3">
<div class="form-group mb-n1">
<div class="input-group input-group-sm w-lg-50 d-inline-flex has-filter">
<div class="input-group input-group-sm w-lg-50 d-inline-flex">
<div class="input-group-prepend">
<button class="btn btn-sm dropdown-toggle" style="border:1px solid lightgrey" type="button" data-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-filter" title="@T["Filters"]"></i>
<button class="btn btn-secondary btn-sm dropdown-toggle" style="border:1px solid lightgrey" type="button" data-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
@T["Filters"]
</button>
<div class="dropdown-menu @if(CultureInfo.CurrentUICulture.IsRightToLeft()){<text>dropdown-menu-right</text>}" aria-labelledby="filter-dropdown">
<div class="dropdown-menu" aria-labelledby="filter-dropdown">
<a class="dropdown-item" href="?Options.Filter=Running">@T["Only running tenants"]</a>
<a class="dropdown-item" href="?Options.Filter=Disabled">@T["Only disabled tenants"]</a>
<a class="dropdown-item" href="?Options.Filter=Uninitialized">@T["Only uninitialized tenants"]</a>
</div>
</div>
<i class="fa fa-search form-control-feedback"></i>
<input id="search-box" asp-for="Options.Search" class="form-control" placeholder="@T["Search"]" type="search" autofocus />
<div class="input-group-append">
<button type="submit" class="btn btn-sm btn-secondary">@T["Search"]</button>
</div>
</div>
<div class="dropdown float-right order-md-1">
<a asp-route-action="Create" class="btn btn-sm btn-secondary float-right create" role="button">@T["Add Tenant"]</a>
Expand Down Expand Up @@ -145,37 +147,37 @@
</div>
<div class="properties">
<div class="related">
<a asp-action="Edit" asp-route-id="@entry.Name" class="btn btn-primary btn-sm">@T["Edit"]</a>
<a asp-action="Edit" asp-route-id="@entry.Name" class="btn text-primary btn-sm" data-toggle="tooltip" title="@T["Edit"]"><i class="fa fa-edit"></i></a>
@if (!entry.IsDefaultTenant && entry.ShellSettings.State == TenantState.Running)
{
<a asp-action="Disable" asp-route-id="@entry.Name" class="btn btn-danger btn-sm" itemprop="UnsafeUrl">@T["Disable"]</a>
<a asp-action="Disable" asp-route-id="@entry.Name" class="btn text-danger btn-sm" itemprop="UnsafeUrl" data-toggle="tooltip" title="@T["Disable"]"><i class="fa fa-toggle-off"></i></a>
}
@if (entry.ShellSettings.State == TenantState.Disabled)
{
<a asp-action="Enable" asp-route-id="@entry.Name" class="btn btn-success btn-sm" itemprop="UnsafeUrl">@T["Enable"]</a>
<a asp-action="Enable" asp-route-id="@entry.Name" class="btn text-success btn-sm" itemprop="UnsafeUrl" data-toggle="tooltip" title="@T["Enable"]"><i class="fa fa-toggle-on"></i></a>
}
@if (entry.ShellSettings.State == TenantState.Uninitialized)
{
<a class="btn btn-info btn-sm" id="btn-setup-@entry.Name" href="@GetEncodedUrl(entry, originalPathBase)">@T["Setup"]</a>
<a class="btn btn-info btn-sm" id="btn-setup-@entry.Name" href="@GetEncodedUrl(entry, originalPathBase)" data-toggle="tooltip" title="@T["Setup"]"><i class="fa fa-cog"></i></a>
}
<a asp-action="Reload" asp-route-id="@entry.Name" class="btn btn-secondary btn-sm" itemprop="UnsafeUrl">@T["Reload"]</a>
<a asp-action="Reload" asp-route-id="@entry.Name" class="btn text-secondary btn-sm" itemprop="UnsafeUrl" data-toggle="tooltip" title="@T["Reload"]"><i class="fa fa-redo"></i></a>
</div>
@switch (entry.ShellSettings.State)
{
case TenantState.Uninitialized:
<small><i class="fa fa-xs fa-circle text-secondary" title="@T["Uninitialized"]"></i></small>
<span data-toggle="tooltip" title="@T["Uninitialized"]"><i class="fa fa-circle text-secondary"></i></span>
break;
case TenantState.Initializing:
<small><i class="fa fa-xs fa-circle text-info" title="@T["Initializing"]"></i></small>
<span data-toggle="tooltip" title="@T["Initializing"]"><i class="fa fa-circle text-info"></i></span>
break;
case TenantState.Running:
<small><i class="fa fa-xs fa-circle text-success" title="@T["Running"]"></i></small>
<span data-toggle="tooltip" title="@T["Running"]"><i class="fa fa-circle text-success"></i></span>
break;
case TenantState.Disabled:
<small><i class="fa fa-xs fa-circle text-danger" title="@T["Disabled"]"></i></small>
<span data-toggle="tooltip" title="@T["Disabled"]"><i class="fa fa-circle text-danger"></i></span>
break;
case TenantState.Invalid:
<small><i class="fa fa-xs fa-circle text-warning" title="@T["Invalid"]"></i></small>
<span data-toggle="tooltip" title="@T["Invalid"]"><i class="fa fa-circle text-warning"></i></span>
break;
}
<a href="@GetEncodedUrl(entry, originalPathBase)" target="_blank">@entry.Name</a>
Expand Down