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
parent
commit
5c94d249bb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml
  2. 2
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml
  3. 2
      modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml
  4. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Index.cshtml
  5. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/Index.cshtml
  6. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
  7. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
  8. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Index.cshtml
  9. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.cshtml
  10. 2
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
  11. 2
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml
  12. 2
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
  13. 2
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
  14. 2
      modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
  15. 2
      modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/Index.cshtml

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml

@ -67,7 +67,7 @@
</abp-component-demo-section> </abp-component-demo-section>
<abp-component-demo-section title="Example 3" view-path="@TablesDemoViewComponent.ViewPath"> <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> <caption>List of users</caption>
<thead> <thead>
<tr> <tr>

2
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml

@ -233,7 +233,7 @@
<div class="demo-with-code"> <div class="demo-with-code">
<div class="demo-area"> <div class="demo-area">
<abp-table striped-rows="true" dark-theme="true"> <abp-table dark-theme="true">
<caption>List of users</caption> <caption>List of users</caption>
<thead> <thead>
<tr> <tr>

2
modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml

@ -43,7 +43,7 @@
</abp-row> </abp-row>
</abp-card-header> </abp-card-header>
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" id="BlogsTable" class="nowrap"> <abp-table id="BlogsTable" class="nowrap">
<thead> <thead>
<tr> <tr>
<th>@L["Actions"]</th> <th>@L["Actions"]</th>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Index.cshtml

@ -55,6 +55,6 @@
<abp-card> <abp-card>
<abp-card-body> <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-body>
</abp-card> </abp-card>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/Index.cshtml

@ -34,7 +34,7 @@
<div id="CmsKitBlogsWrapper"> <div id="CmsKitBlogsWrapper">
<abp-card> <abp-card>
<abp-card-body> <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-body>
</abp-card> </abp-card>
</div> </div>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml

@ -109,5 +109,5 @@
<h3>@L["RepliesToThisComment"]</h3> <h3>@L["RepliesToThisComment"]</h3>
<abp-table striped-rows="true" id="CommentsTable" class="nowrap"></abp-table> <abp-table id="CommentsTable" class="nowrap"></abp-table>
</div> </div>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml

@ -68,6 +68,6 @@
<abp-card> <abp-card>
<abp-card-body> <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-body>
</abp-card> </abp-card>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Index.cshtml

@ -39,6 +39,6 @@
<abp-card> <abp-card>
<abp-card-body> <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-body>
</abp-card> </abp-card>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.cshtml

@ -39,6 +39,6 @@
<abp-card> <abp-card>
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" id="TagsTable"></abp-table> <abp-table id="TagsTable"></abp-table>
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>

2
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml

@ -187,7 +187,7 @@
</form> </form>
</abp-card-header> </abp-card-header>
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" id="DocumentsTable" class="nowrap"> <abp-table id="DocumentsTable" class="nowrap">
<thead> <thead>
<tr> <tr>
<th>@L["Actions"]</th> <th>@L["Actions"]</th>

2
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml

@ -47,7 +47,7 @@
</abp-row> </abp-row>
</abp-card-header> </abp-card-header>
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" id="ProjectsTable" class="nowrap"> <abp-table id="ProjectsTable" class="nowrap">
<thead> <thead>
<tr> <tr>
<th>@L["Actions"]</th> <th>@L["Actions"]</th>

2
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml

@ -33,6 +33,6 @@
} }
<abp-card id="IdentityRolesWrapper"> <abp-card id="IdentityRolesWrapper">
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" class="nowrap"></abp-table> <abp-table class="nowrap"></abp-table>
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>

2
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml

@ -34,6 +34,6 @@
} }
<abp-card id="IdentityUsersWrapper"> <abp-card id="IdentityUsersWrapper">
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" class="nowrap"></abp-table> <abp-table class="nowrap"></abp-table>
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>

2
modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml

@ -30,6 +30,6 @@
} }
<abp-card id="TenantsWrapper"> <abp-card id="TenantsWrapper">
<abp-card-body> <abp-card-body>
<abp-table striped-rows="true" class="nowrap"></abp-table> <abp-table class="nowrap"></abp-table>
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>

2
modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/Index.cshtml

@ -32,7 +32,7 @@
@Html.Raw(Model.PathNavigation) @Html.Raw(Model.PathNavigation)
<abp-table striped-rows="true" class="nowrap dataTable no-footer"> <abp-table class="nowrap dataTable no-footer">
<thead> <thead>
<tr> <tr>
<th>@UiLocalizer["Actions"]</th> <th>@UiLocalizer["Actions"]</th>

Loading…
Cancel
Save