Browse Source
Merge pull request #18950 from abpframework/auto-merge/rel-8-0/2468
Merge branch prerel-8.1 with rel-8.0
pull/18951/head
maliming
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with
15 additions and
15 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml
-
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml
-
modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Index.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/Index.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Index.cshtml
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.cshtml
-
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
-
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml
-
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
-
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
-
modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
-
modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/Index.cshtml
|
|
|
@ -67,7 +67,7 @@ |
|
|
|
</abp-component-demo-section> |
|
|
|
|
|
|
|
<abp-component-demo-section title="Example 3" view-path="@TablesDemoViewComponent.ViewPath"> |
|
|
|
<abp-table striped-rows="true" dark-theme="true"> |
|
|
|
<abp-table dark-theme="true"> |
|
|
|
<caption>List of users</caption> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
|
|
|
|
@ -233,7 +233,7 @@ |
|
|
|
<div class="demo-with-code"> |
|
|
|
<div class="demo-area"> |
|
|
|
|
|
|
|
<abp-table striped-rows="true" dark-theme="true"> |
|
|
|
<abp-table dark-theme="true"> |
|
|
|
<caption>List of users</caption> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
|
|
|
|
@ -43,7 +43,7 @@ |
|
|
|
</abp-row> |
|
|
|
</abp-card-header> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="BlogsTable" class="nowrap"> |
|
|
|
<abp-table id="BlogsTable" class="nowrap"> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
<th>@L["Actions"]</th> |
|
|
|
|
|
|
|
@ -55,6 +55,6 @@ |
|
|
|
|
|
|
|
<abp-card> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="BlogPostsTable" class="nowrap"></abp-table> |
|
|
|
<abp-table id="BlogPostsTable" class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -34,7 +34,7 @@ |
|
|
|
<div id="CmsKitBlogsWrapper"> |
|
|
|
<abp-card> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="BlogsTable" class="nowrap"></abp-table> |
|
|
|
<abp-table id="BlogsTable" class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
</div> |
|
|
|
|
|
|
|
@ -109,5 +109,5 @@ |
|
|
|
|
|
|
|
<h3>@L["RepliesToThisComment"]</h3> |
|
|
|
|
|
|
|
<abp-table striped-rows="true" id="CommentsTable" class="nowrap"></abp-table> |
|
|
|
<abp-table id="CommentsTable" class="nowrap"></abp-table> |
|
|
|
</div> |
|
|
|
|
|
|
|
@ -68,6 +68,6 @@ |
|
|
|
|
|
|
|
<abp-card> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="CommentsTable" class="nowrap"></abp-table> |
|
|
|
<abp-table id="CommentsTable" class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -39,6 +39,6 @@ |
|
|
|
|
|
|
|
<abp-card> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="PagesTable" class="nowrap"></abp-table> |
|
|
|
<abp-table id="PagesTable" class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -39,6 +39,6 @@ |
|
|
|
|
|
|
|
<abp-card> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="TagsTable"></abp-table> |
|
|
|
<abp-table id="TagsTable"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -187,7 +187,7 @@ |
|
|
|
</form> |
|
|
|
</abp-card-header> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="DocumentsTable" class="nowrap"> |
|
|
|
<abp-table id="DocumentsTable" class="nowrap"> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
<th>@L["Actions"]</th> |
|
|
|
|
|
|
|
@ -47,7 +47,7 @@ |
|
|
|
</abp-row> |
|
|
|
</abp-card-header> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" id="ProjectsTable" class="nowrap"> |
|
|
|
<abp-table id="ProjectsTable" class="nowrap"> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
<th>@L["Actions"]</th> |
|
|
|
|
|
|
|
@ -33,6 +33,6 @@ |
|
|
|
} |
|
|
|
<abp-card id="IdentityRolesWrapper"> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" class="nowrap"></abp-table> |
|
|
|
<abp-table class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -34,6 +34,6 @@ |
|
|
|
} |
|
|
|
<abp-card id="IdentityUsersWrapper"> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" class="nowrap"></abp-table> |
|
|
|
<abp-table class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -30,6 +30,6 @@ |
|
|
|
} |
|
|
|
<abp-card id="TenantsWrapper"> |
|
|
|
<abp-card-body> |
|
|
|
<abp-table striped-rows="true" class="nowrap"></abp-table> |
|
|
|
<abp-table class="nowrap"></abp-table> |
|
|
|
</abp-card-body> |
|
|
|
</abp-card> |
|
|
|
|
|
|
|
@ -32,7 +32,7 @@ |
|
|
|
|
|
|
|
@Html.Raw(Model.PathNavigation) |
|
|
|
|
|
|
|
<abp-table striped-rows="true" class="nowrap dataTable no-footer"> |
|
|
|
<abp-table class="nowrap dataTable no-footer"> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
<th>@UiLocalizer["Actions"]</th> |
|
|
|
|