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

Fix search box buttons and input size consistency #12459

Merged
merged 2 commits into from
Sep 22, 2022
Merged

Fix search box buttons and input size consistency #12459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2a05c
Fix search box buttons and input size consistency
MikeAlhayek Sep 20, 2022
c8197cd
Clean up some spacing issues
MikeAlhayek Sep 20, 2022
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
21 changes: 9 additions & 12 deletions src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartDetailAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ else
<div class="card bg-primary mb-3 position-sticky action-bar">
<div class="card-body">
<div class="row gx-3">
<div class="col">
<div class="col" style="min-width: 40%;">
sebastienros marked this conversation as resolved.
Show resolved Hide resolved
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
<div class="input-group has-filter">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-filter" title="@T["Filters"]" aria-hidden="true"></i>
Expand All @@ -71,17 +71,17 @@ else
</div>
</div>
<div class="col-auto">
<a class="btn btn-sm btn-primary" edit-for="@Model.ListPart.ContentItem" asp-route-returnUrl="@FullRequestPath">
<a class="btn btn-primary" edit-for="@Model.ListPart.ContentItem" asp-route-returnUrl="@FullRequestPath">
@T["Edit {0}", @Model.ListPart.ContentItem.DisplayText]
</a>
@if (authorizedContentTypeDefinitions.Count() == 1)
@if (authorizedContentTypeDefinitions.Count == 1)
{
var contentTypeDefinition = authorizedContentTypeDefinitions.FirstOrDefault();
<a class="btn btn-sm btn-success" asp-action="Create" asp-controller="Admin" asp-route-id="@contentTypeDefinition.Name" asp-route-area="OrchardCore.Contents" asp-route-ListPart.ContainerId="@Model.ListPart.ContentItem.ContentItemId" asp-route-ListPart.ContentType="@contentTypeDefinition.Name" asp-route-ListPart.EnableOrdering="@Model.EnableOrdering" asp-route-returnUrl="@FullRequestPath">
<a class="btn btn-success" asp-action="Create" asp-controller="Admin" asp-route-id="@contentTypeDefinition.Name" asp-route-area="OrchardCore.Contents" asp-route-ListPart.ContainerId="@Model.ListPart.ContentItem.ContentItemId" asp-route-ListPart.ContentType="@contentTypeDefinition.Name" asp-route-ListPart.EnableOrdering="@Model.EnableOrdering" asp-route-returnUrl="@FullRequestPath">
@T["Create {0}", contentTypeDefinition.DisplayName]
</a>
}
else if (authorizedContentTypeDefinitions.Count() > 1)
else if (authorizedContentTypeDefinitions.Count > 1)
{
<button class="btn btn-sm btn-success dropdown-toggle" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@T["Create"]
Expand All @@ -103,22 +103,19 @@ else

@if (Model.ContentItems.Any())
{
<ul class="list-group" @if (enableOrdering) {
<text> id="ci-sortable" </text>
}>

<ul class="list-group" id="ci-sortable">
@foreach (var contentItem in Model.ContentItems)
{
var contentItemSummary = (dynamic)await ContentItemDisplayManager.BuildDisplayAsync(contentItem, Model.Context.Updater, "SummaryAdmin", Model.Context.GroupId);
if (enableOrdering)
{
await contentItemSummary.Selectors.AddAsync(await New.ListPart_Sortable());
}
<li class="list-group-item">
<li class="list-group-item">
@await DisplayAsync(contentItemSummary)
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
</li>
</li>
}
</ul>
</ul>

@await DisplayAsync(Model.Pager)
@if (enableOrdering)
Expand Down