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

Jump to bottom

Update the action bar on manage features page #12400

Closed
wants to merge 3 commits into from
Closed

Update the action bar on manage features page #12400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f8fce
Fix the features view
MikeAlhayek Sep 13, 2022
235937e
Update round corner and button size
MikeAlhayek Sep 13, 2022
84ed0e8
Update TheAdmin.csproj
MikeAlhayek Sep 13, 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
37 changes: 21 additions & 16 deletions src/OrchardCore.Modules/OrchardCore.Features/Views/Admin/Features.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,30 @@
<zone Name="Title"><h1>@RenderTitleSegments(T["Features"])</h1></zone>

<form autocomplete="off" class="position-sticky action-bar">
<div class="card mb-3">
<div class="card-body bg-primary p-3">
<div class="mb-0">
<div class="input-group input-group-sm w-sm-50 w-25 d-inline-flex has-search">
<i class="fa fa-search form-control-feedback" aria-hidden="true"></i>
<input id="search-box" class="form-control me-sm-2" placeholder="@T["Search"]" type="search" autofocus />
<div class="card bg-primary mb-3">
<div class="card-body">

<div class="row gx-3">
<div class="col">
<div class="has-search">
<i class="fa fa-search form-control-feedback" aria-hidden="true"></i>
<input id="search-box" class="form-control" placeholder="@T["Search"]" type="search" autofocus />
</div>
</div>
<div class="dropdown float-end order-md-1">
<button class="btn btn-sm btn-secondary dropdown-toggle" type="button" id="bulk-action-menu-button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@T["Bulk Actions"]
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bulk-action-menu-button">
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Disable)">@T["Disable"]</a></li>
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Enable)">@T["Enable"]</a></li>
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Toggle)">@T["Toggle"]</a></li>
</ul>
<div class="col-auto">
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" id="bulk-action-menu-button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@T["Bulk Actions"]
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bulk-action-menu-button">
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Disable)">@T["Disable"]</a></li>
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Enable)">@T["Enable"]</a></li>
<li><a class="dropdown-item" href="#" data-action="@nameof(FeaturesBulkAction.Toggle)">@T["Toggle"]</a></li>
</ul>
</div>
</div>
</div>

</div>
</div>
</form>
Expand Down Expand Up @@ -210,6 +216,5 @@
$("[name='BulkAction']").val($(this).data('action'));
$("[name='submit.BulkAction']").click();
});

});
</script>
11 changes: 9 additions & 2 deletions src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/admin/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

.validation-summary-errors {
@extend .alert, .alert-danger;

ul {
margin-bottom: 0px;
}
Expand Down Expand Up @@ -85,8 +86,14 @@ input[type="password"]::-ms-clear {
color: #aaa;
}

.has-search .form-control-feedback {
left: 10px;
.has-search:not(.input-group) .form-control-feedback {
left: 1.75rem;
top: 1.25rem;
}

.has-filter:not(.input-group) .form-control-feedback {
left: 1.75rem;
top: 1.25rem;
}

.has-filter .form-control-feedback {
Expand Down
48 changes: 32 additions & 16 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,13 +2793,9 @@ html[dir=rtl][data-theme=default] .input-group.has-validation > :nth-last-child(
}
html[dir=ltr][data-theme=default] .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-left: -1px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
html[dir=rtl][data-theme=default] .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-right: -1px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
html[data-theme=default] .valid-feedback {
display: none;
Expand Down Expand Up @@ -29182,11 +29178,23 @@ html[dir=ltr][data-theme=default] .has-filter .form-control-feedback, html[dir=l
html[dir=rtl][data-theme=default] .has-filter .form-control-feedback, html[dir=rtl][data-theme=default] .has-search .form-control-feedback {
right: 10px;
}
html[dir=ltr][data-theme=default] .has-search .form-control-feedback {
left: 10px;
html[data-theme=default] .has-search:not(.input-group) .form-control-feedback {
top: 1.25rem;
}
html[dir=rtl][data-theme=default] .has-search .form-control-feedback {
right: 10px;
html[dir=ltr][data-theme=default] .has-search:not(.input-group) .form-control-feedback {
left: 1.75rem;
}
html[dir=rtl][data-theme=default] .has-search:not(.input-group) .form-control-feedback {
right: 1.75rem;
}
html[data-theme=default] .has-filter:not(.input-group) .form-control-feedback {
top: 1.25rem;
}
html[dir=ltr][data-theme=default] .has-filter:not(.input-group) .form-control-feedback {
left: 1.75rem;
}
html[dir=rtl][data-theme=default] .has-filter:not(.input-group) .form-control-feedback {
right: 1.75rem;
}
html[dir=ltr][data-theme=default] .has-filter .form-control-feedback {
left: 55px;
Expand Down Expand Up @@ -31990,13 +31998,9 @@ html[dir=rtl][data-theme=darkmode] .input-group.has-validation > :nth-last-child
}
html[dir=ltr][data-theme=darkmode] .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-left: -1px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
html[dir=rtl][data-theme=darkmode] .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-right: -1px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
html[data-theme=darkmode] .valid-feedback {
display: none;
Expand Down Expand Up @@ -58659,11 +58663,23 @@ html[dir=ltr][data-theme=darkmode] .has-filter .form-control-feedback, html[dir=
html[dir=rtl][data-theme=darkmode] .has-filter .form-control-feedback, html[dir=rtl][data-theme=darkmode] .has-search .form-control-feedback {
right: 10px;
}
html[dir=ltr][data-theme=darkmode] .has-search .form-control-feedback {
left: 10px;
html[data-theme=darkmode] .has-search:not(.input-group) .form-control-feedback {
top: 1.25rem;
}
html[dir=rtl][data-theme=darkmode] .has-search .form-control-feedback {
right: 10px;
html[dir=ltr][data-theme=darkmode] .has-search:not(.input-group) .form-control-feedback {
left: 1.75rem;
}
html[dir=rtl][data-theme=darkmode] .has-search:not(.input-group) .form-control-feedback {
right: 1.75rem;
}
html[data-theme=darkmode] .has-filter:not(.input-group) .form-control-feedback {
top: 1.25rem;
}
html[dir=ltr][data-theme=darkmode] .has-filter:not(.input-group) .form-control-feedback {
left: 1.75rem;
}
html[dir=rtl][data-theme=darkmode] .has-filter:not(.input-group) .form-control-feedback {
right: 1.75rem;
}
html[dir=ltr][data-theme=darkmode] .has-filter .form-control-feedback {
left: 55px;
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css
View file
Open in desktop

Large diffs are not rendered by default.