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

Admin: Display buttons text #8086

Merged
merged 11 commits into from
Dec 24, 2020
Merged

Admin: Display buttons text #8086

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c135f2c
Display buttons text on small screens
agriffard Dec 19, 2020
e6e0238
Display text everytime, ta-action-button for buttons
agriffard Dec 19, 2020
11bba75
ta-action-button and specific css class per button
agriffard Dec 19, 2020
8d9720f
Merge branch 'dev' into ag/buttonsText
agriffard Dec 19, 2020
06ab108
Merge dev and remove ta-action-button
agriffard Dec 19, 2020
1a0fdd0
Remove tooltips
agriffard Dec 20, 2020
20e1234
Widgets actions
agriffard Dec 21, 2020
d6a3bc9
nowrap for buttons
Skrypt Dec 21, 2020
c13808d
btn, dropdown-toggle
agriffard Dec 22, 2020
20b0e10
Remove ellipsis
agriffard Dec 23, 2020
ae3f375
Remove icons
agriffard Dec 24, 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
4 changes: 2 additions & 2 deletions ...e.Modules/OrchardCore.ContentLocalization/Views/LocalizationPart.SummaryAdminLinks.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
@if (!string.IsNullOrEmpty(Model.LocalizationSet) && Model.ContentItemCultures.Any())
{
<div class="btn-group" title="@T["Localizations"]">
<button type="button" class="btn btn-sm text-info" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-globe"></i>
<button type="button" class="btn btn-sm text-info localizations" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-globe"></i> <span>@T["Localizations"]</span>
</button>
<div class="dropdown-menu dropdown-menu-right">
@foreach (var culture in Model.ContentItemCultures)
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SummaryAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

<div class="row">
<div class="col-lg-9 col-sm-12 title">
<div class="col-lg-6 col-sm-12 title">
@if (Model.Selectors != null)
{
<div class="selectors d-inline cursor-pointer">
Expand Down Expand Up @@ -41,7 +41,7 @@
<div class="d-inline">@await DisplayAsync(Model.Meta)</div>
}
</div>
<div class="col-lg-3 col-sm-12">
<div class="col-lg-6 col-sm-12">
<div class="float-right">
@if (Model.Actions != null)
{
Expand All @@ -50,8 +50,8 @@
@if (Model.ActionsMenu != null)
{
<div class="btn-group" title="@T["Actions"]">
<button type="button" class="btn btn-sm text-secondary" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-v"></i>
<button type="button" class="btn btn-sm text-secondary actions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-v"></i> <span>@T["Actions"]</span>
</button>
<div class="actions-menu dropdown-menu dropdown-menu-right">
@await DisplayAsync(Model.ActionsMenu)
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsButtonEdit_SummaryAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

@if (hasEditPermission)
{
<a edit-for="@contentItem" asp-route-returnUrl="@FullRequestPath" data-toggle="tooltip" title="@T["Edit"]" class="btn btn-sm text-primary"><i class="fa fa-edit"></i></a>
<a edit-for="@contentItem" asp-route-returnUrl="@FullRequestPath" class="btn btn-sm text-primary edit"><i class="fa fa-edit"></i> <span>@T["Edit"]</span></a>
}

@if (hasPublished && hasViewPermission)
{
<a display-for="@contentItem" target="_blank" data-toggle="tooltip" title="@T["View"]" class="btn btn-sm text-success"><i class="fas fa-external-link-alt"></i></a>
<a display-for="@contentItem" target="_blank" class="btn btn-sm text-success view"><i class="fas fa-external-link-alt"></i> <span>@T["View"]</span></a>
}
@if (hasDraft && hasPreviewPermission)
{
<a asp-action="Preview" asp-controller="Item" asp-route-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" target="_blank" data-toggle="tooltip" title="@T["Preview Draft"]" class="btn btn-sm text-primary"><i class="fas fa-external-link-alt"></i></a>
<a asp-action="Preview" asp-controller="Item" asp-route-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" target="_blank" class="btn btn-sm text-primary preview"><i class="fas fa-external-link-alt"></i> <span>@T["Preview Draft"]</span></a>
}