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

Workflows badges #8127

Merged
merged 1 commit into from
Dec 23, 2020
Merged

Workflows badges #8127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowType/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
<div class="btn-group float-right">
<a class="btn btn-secondary btn-sm" asp-action="EditProperties" asp-route-id="@Model.WorkflowType.Id" asp-route-returnUrl="@FullRequestPath">@T["Properties"]</a>
<a class="btn btn-secondary btn-sm" asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@Model.WorkflowType.Id" asp-route-returnUrl="@FullRequestPath">@T["Instances"] <span class="badge badge-light">@Model.WorkflowCount</span></a>
<a class="btn btn-secondary btn-sm" asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@Model.WorkflowType.Id" asp-route-returnUrl="@FullRequestPath">@T["Instances"] <span class="badge ta-badge">@Model.WorkflowCount</span></a>
</div>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowType/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<input type="submit" name="submit.Filter" id="submitFilter" class="d-none" />
<input type="submit" name="submit.BulkAction" class="d-none" />
<input asp-for="Options.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 has-search">
Expand Down Expand Up @@ -72,16 +72,16 @@
<label class="custom-control-label" for="itemIds-@entry.Id"></label>
</div>
<a asp-action="Edit" asp-route-id="@entry.WorkflowType.Id" asp-route-returnUrl="@FullRequestPath">@entry.Name</a>
@if (!entry.WorkflowType.IsEnabled)
{
<span class="badge text-danger"><i class="fas fa-power-off"></i> @T["Disabled"]</span>
}
@if (entry.WorkflowCount > 0)
{
<a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa fa-list-ol"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
}

<div class="metadata">
@if (!entry.WorkflowType.IsEnabled)
{
<span class="badge badge-secondary">@T["Disabled"]</span>
}
@if (entry.WorkflowCount > 0)
{
<a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge badge-info">@T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
}
</div>
</div>
</li>
Expand Down Expand Up @@ -155,7 +155,7 @@

selectAllCtrl.prop("checked", selectedItemsCount == itemsCount);
selectAllCtrl.prop("indeterminate", selectedItemsCount > 0 && selectedItemsCount < itemsCount);

selectedItems.text(selectedItemsCount + ' @T["selected"]');
displayActionsOrFilters();
});
Expand Down