Skip to content

Commit

Permalink
Merge pull request #12159 from abpframework/auto-merge/rel-5-0/965
Browse files Browse the repository at this point in the history 
Merge branch rel-5.1 with rel-5.0
  • Loading branch information
@EngincanV
EngincanV authored Apr 4, 2022
2 parents 099497d + 20fa13f commit 88c494f
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/en/Tutorials/Part-2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ Open the `/src/app/book/book.component.html` and replace the content as shown be
{%{{{ '::Menu:Books' | abpLocalization }}}%}
</h5>
</div>
<div class="text-right col col-md-6"></div>
<div class="text-end col col-md-6"></div>
</div>
</div>
<div class="card-body">
Expand Down
8 changes: 4 additions & 4 deletions docs/en/Tutorials/Part-3.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Open the `Pages/Books/Index.cshtml` and set the content of `abp-card-header` tag
<abp-column size-md="_6">
<abp-card-title>@L["Books"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
<abp-button id="NewBookButton"
text="@L["NewBook"].Value"
icon="plus"
Expand Down Expand Up @@ -175,7 +175,7 @@ The final content of `Index.cshtml` is shown below:
<abp-column size-md="_6">
<abp-card-title>@L["Books"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
<abp-button id="NewBookButton"
text="@L["NewBook"].Value"
icon="plus"
Expand Down Expand Up @@ -687,10 +687,10 @@ Open `/src/app/book/book.component.html` and make the following changes:
<div class="col col-md-6">
<h5 class="card-title">{%{{{ '::Menu:Books' | abpLocalization }}}%}</h5>
</div>
<div class="text-right col col-md-6">
<div class="text-end col col-md-6">

<!-- Add the "new book" button here -->
<div class="text-lg-right pt-2">
<div class="text-lg-end pt-2">
<button id="create" class="btn btn-primary" type="button" (click)="createBook()">
<i class="fa fa-plus mr-1"></i>
<span>{%{{{ "::NewBook" | abpLocalization }}}%}</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/en/Tutorials/Part-5.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Open the `Pages/Books/Index.cshtml` file and change the content as shown below:
<abp-column size-md="_6">
<abp-card-title>@L["Books"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
@if (await AuthorizationService.IsGrantedAsync(BookStorePermissions.Books.Create))
{
<abp-button id="NewBookButton"
Expand Down
6 changes: 3 additions & 3 deletions docs/en/Tutorials/Part-9.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Create a new razor page, `Index.cshtml` under the `Pages/Authors` folder of the
<abp-column size-md="_6">
<abp-card-title>@L["Authors"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
@if (await AuthorizationService
.IsGrantedAsync(BookStorePermissions.Authors.Create))
{
Expand Down Expand Up @@ -722,8 +722,8 @@ Open the `/src/app/author/author.component.html` and replace the content as belo
{%{{{ '::Menu:Authors' | abpLocalization }}}%}
</h5>
</div>
<div class="text-right col col-md-6">
<div class="text-lg-right pt-2">
<div class="text-end col col-md-6">
<div class="text-lg-end pt-2">
<button *abpPermission="'BookStore.Authors.Create'" id="create" class="btn btn-primary" type="button" (click)="createAuthor()">
<i class="fa fa-plus mr-1"></i>
<span>{%{{{ '::NewAuthor' | abpLocalization }}}%}</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/en/UI/Angular/Component-Replacement.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Open the generated `routes.component.html` in `src/app/routes` folder and replac
abpEllipsis="210px"
[abpEllipsisEnabled]="!smallScreen"
role="button"
class="btn d-block text-left dropdown-toggle"
class="btn d-block text-start dropdown-toggle"
>
<i class="fa fa-id-card-o"></i>
{%{{{ 'AbpIdentity::Menu:IdentityManagement' | abpLocalization }}}%}
Expand Down Expand Up @@ -264,7 +264,7 @@ Open the generated `routes.component.html` in `src/app/routes` folder and replac
abpEllipsis="210px"
[abpEllipsisEnabled]="!smallScreen"
role="button"
class="btn d-block text-left dropdown-toggle"
class="btn d-block text-start dropdown-toggle"
>
<i class="fa fa-users"></i>
{%{{{ 'AbpTenantManagement::Menu:TenantManagement' | abpLocalization }}}%}
Expand Down
2 changes: 1 addition & 1 deletion docs/en/UI/Angular/How-Replaceable-Components-Work-with-Extensions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Open the generated `src/app/my-role/my-role.component.html` file and replace its
<div class="col col-md-6">
<h5 class="card-title">My Roles</h5>
</div>
<div class="text-right col col-md-6">
<div class="text-end col col-md-6">
<abp-page-toolbar [record]="data.items"></abp-page-toolbar>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/en/UI/AspNetCore/Tag-Helpers/Figure.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Basic usage:
````html
<abp-figure>
<abp-image src="..." class="img-fluid rounded" alt="A generic square placeholder image with rounded corners in a figure.">
<abp-figcaption class="text-right">A caption for the above image.</abp-figcaption>
<abp-figcaption class="text-end">A caption for the above image.</abp-figcaption>
</abp-figure>
````

Expand Down
2 changes: 1 addition & 1 deletion docs/en/UI/AspNetCore/Theming.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ Another pre-defined section is the Content Toolbar section which can be used by

````html
<div id="AbpContentToolbar">
<div class="text-right mb-2">
<div class="text-end mb-2">
@RenderSection("content_toolbar", false)
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pt-BR/Tutorials/Angular/Part-II.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Adicione um botão rotulado `New book`para mostrar o modal:
Books
</h5>
</div>
<div class="text-right col col-md-6">
<div class="text-end col col-md-6">
<button id="create-role" class="btn btn-primary" type="button" (click)="createBook()">
<i class="fa fa-plus mr-1"></i> <span>New book</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion docs/pt-BR/Tutorials/AspNetCore-Mvc/Part-II.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Abra `Pages/Books/Index.cshtml`e altere a `abp-card-header`tag, como mostrado ab
<abp-column size-md="_6">
<h2>@L["Books"]</h2>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
<abp-button id="NewBookButton"
text="@L["NewBook"].Value"
icon="plus"
Expand Down
2 changes: 1 addition & 1 deletion docs/zh-Hans/Tutorials/Part-2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ export class BookComponent implements OnInit {
{%{{{ '::Menu:Books' | abpLocalization }}}%}
</h5>
</div>
<div class="text-right col col-md-6"></div>
<div class="text-end col col-md-6"></div>
</div>
</div>
<div class="card-body">
Expand Down
11 changes: 5 additions & 6 deletions docs/zh-Hans/Tutorials/Part-3.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ namespace Acme.BookStore.Web.Pages.Books
<abp-column size-md="_6">
<abp-card-title>@L["Books"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
<abp-button id="NewBookButton"
text="@L["NewBook"].Value"
icon="plus"
Expand Down Expand Up @@ -175,7 +175,7 @@ namespace Acme.BookStore.Web.Pages.Books
<abp-column size-md="_6">
<abp-card-title>@L["Books"]</abp-card-title>
</abp-column>
<abp-column size-md="_6" class="text-right">
<abp-column size-md="_6" class="text-end">
<abp-button id="NewBookButton"
text="@L["NewBook"].Value"
icon="plus"
Expand Down Expand Up @@ -688,11 +688,10 @@ export class BookComponent implements OnInit {
<div class="row">
<div class="col col-md-6">
<h5 class="card-title">{%{{{ '::Menu:Books' | abpLocalization }}}%}</h5>
</div>
<div class="text-right col col-md-6">

</div>
<div class="text-end col col-md-6">
<!-- Add the "new book" button here -->
<div class="text-lg-right pt-2">
<div class="text-lg-end pt-2">
<button id="create" class="btn btn-primary" type="button" (click)="createBook()">
<i class="fa fa-plus mr-1"></i>
<span>{%{{{ "::NewBook" | abpLocalization }}}%}</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/zh-Hans/UI/Angular/Component-Replacement.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ export class NavItemsComponent implements AfterViewInit {
{%{{{ (currentUser$ | async)?.userName }}}%}
</a>
<div
class="dropdown-menu dropdown-menu-right border-0 shadow-sm"
class="dropdown-menu dropdown-menu-end border-0 shadow-sm"
aria-labelledby="dropdownMenuLink"
[class.d-block]="smallScreen && currentUserDropdown.isOpen()"
>
Expand Down

0 comments on commit 88c494f

Please sign in to comment.