From 84168daa1e987f1b69fd6a22d9f9cfa391383d0d Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Wed, 8 Jul 2020 11:18:53 +0800 Subject: [PATCH 1/8] Update Part-5.md --- docs/en/Tutorials/Part-5.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/Tutorials/Part-5.md b/docs/en/Tutorials/Part-5.md index 441db14638..e49d53388a 100644 --- a/docs/en/Tutorials/Part-5.md +++ b/docs/en/Tutorials/Part-5.md @@ -366,7 +366,7 @@ Open the `/src/app/book/book.component.html` file and replace the create button ```` @@ -385,12 +385,12 @@ Open the `/src/app/book/book.component.html` file and replace the edit and delet ````html ```` From af6db568cc042b357f71c983cfb782840a66c237 Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Wed, 8 Jul 2020 11:33:05 +0800 Subject: [PATCH 2/8] Rename bookTypeArr to bookTypes. --- docs/en/Tutorials/Part-3.md | 4 ++-- docs/pt-BR/Tutorials/Angular/Part-II.md | 8 ++++---- docs/zh-Hans/Tutorials/Part-2.md | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md index 275f1b9730..ef1f903c51 100644 --- a/docs/en/Tutorials/Part-3.md +++ b/docs/en/Tutorials/Part-3.md @@ -832,7 +832,7 @@ Open `/src/app/book/book.component.html` and replace ` Type * @@ -921,7 +921,7 @@ export class BookComponent implements OnInit { form: FormGroup; - // <== added bookTypeArr array ==> + // <== added bookTypes array ==> bookTypes = Object.keys(BookType).filter( (bookType) => typeof this.booksType[bookType] === 'number' ); diff --git a/docs/pt-BR/Tutorials/Angular/Part-II.md b/docs/pt-BR/Tutorials/Angular/Part-II.md index 44c00e6370..b75fa9e21c 100644 --- a/docs/pt-BR/Tutorials/Angular/Part-II.md +++ b/docs/pt-BR/Tutorials/Angular/Part-II.md @@ -195,7 +195,7 @@ Abra `book-list.component.html`e adicione o formulário no modelo de corpo do mo * @@ -218,18 +218,18 @@ Abra `book-list.component.html`e adicione o formulário no modelo de corpo do mo > Usamos o [datepicker do NgBootstrap](https://ng-bootstrap.github.io/#/components/datepicker/overview) neste componente. -Abra o `book-list.component.ts`e crie uma matriz chamada `bookTypeArr`: +Abra o `book-list.component.ts`e crie uma matriz chamada `bookTypes`: ```js //... form: FormGroup; -bookTypeArr = Object.keys(Books.BookType).filter( +bookTypes = Object.keys(Books.BookType).filter( bookType => typeof this.booksType[bookType] === 'number' ); ``` -O `bookTypeArr`contém os campos da `BookType`enumeração. A matriz resultante é mostrada abaixo: +O `bookTypes`contém os campos da `BookType`enumeração. A matriz resultante é mostrada abaixo: ```js ['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...] diff --git a/docs/zh-Hans/Tutorials/Part-2.md b/docs/zh-Hans/Tutorials/Part-2.md index 5ddc8c2a66..751bd85ece 100644 --- a/docs/zh-Hans/Tutorials/Part-2.md +++ b/docs/zh-Hans/Tutorials/Part-2.md @@ -650,7 +650,7 @@ export class BookListComponent implements OnInit { * @@ -721,8 +721,8 @@ export class BookListComponent implements OnInit { booksType = BookType; - // <== added bookTypeArr array ==> - bookTypeArr = Object.keys(BookType).filter( + // <== added bookTypes array ==> + bookTypes = Object.keys(BookType).filter( (bookType) => typeof this.booksType[bookType] === 'number' ); @@ -764,7 +764,7 @@ export class BookListComponent implements OnInit { * 我们添加了一个新的 `NgbDateAdapter` 提供程序,它将Datepicker值转换为Date类型. 有关更多详细信息,请参见[datepicker adapters](https://ng-bootstrap.github.io/#/components/datepicker/overview). -* 我们添加了 `bookTypeArr` 数组,以便能够在combobox值中使用它. `bookTypeArr` 包含 `BookType` 枚举的字段. 得到的数组如下所示: +* 我们添加了 `bookTypes` 数组,以便能够在combobox值中使用它. `bookTypes` 包含 `BookType` 枚举的字段. 得到的数组如下所示: ```js ['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...] @@ -799,7 +799,7 @@ export class BookListComponent implements OnInit { booksType = BookType; - bookTypeArr = Object.keys(BookType).filter( + bookTypes = Object.keys(BookType).filter( (bookType) => typeof this.booksType[bookType] === 'number' ); @@ -904,7 +904,7 @@ export class BookListComponent implements OnInit { booksType = BookType; - bookTypeArr = Object.keys(BookType).filter( + bookTypes = Object.keys(BookType).filter( (bookType) => typeof this.booksType[bookType] === 'number' ); From c5a6caa13938cf8fe79de92626fd1dea944471af Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Wed, 8 Jul 2020 11:40:24 +0800 Subject: [PATCH 3/8] Update Part-5.md --- docs/en/Tutorials/Part-5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Tutorials/Part-5.md b/docs/en/Tutorials/Part-5.md index e49d53388a..5dd6a55e30 100644 --- a/docs/en/Tutorials/Part-5.md +++ b/docs/en/Tutorials/Part-5.md @@ -390,7 +390,7 @@ Open the `/src/app/book/book.component.html` file and replace the edit and delet ```` From 3ba4f33da1cc1dcc3b6c228c5af513085c22802c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Wed, 8 Jul 2020 13:57:20 +0300 Subject: [PATCH 4/8] Demo view components converted to embedded resource --- .../AbpAspNetCoreMvcUiThemeSharedDemoModule.cs | 2 +- ...Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj | 10 ++++++++++ .../Pages/Components/Dropdowns/Index.cshtml | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/AbpAspNetCoreMvcUiThemeSharedDemoModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/AbpAspNetCoreMvcUiThemeSharedDemoModule.cs index cd312db532..30265019c4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/AbpAspNetCoreMvcUiThemeSharedDemoModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/AbpAspNetCoreMvcUiThemeSharedDemoModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo { Configure(options => { - options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo"); + options.FileSets.AddEmbedded(); }); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj index 8c098c3300..8ce2077235 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj @@ -12,6 +12,7 @@ false false false + true true Library @@ -23,5 +24,14 @@ + + + + + + + + + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml index 2b8c7f387e..9bdf7abe38 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml @@ -4,10 +4,10 @@ @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Dropdowns.IndexModel @inject IPageLayout PageLayout @{ - PageLayout.Content.Title = "DrowDowns"; + PageLayout.Content.Title = "Dropdowns"; } -

Cards

-

Based on Bootstrap button.

+

Dropdowns

+

Based on Bootstrap Dropdown.

Check the ABP Documentation.

@await Component.InvokeAsync(typeof(DropdownsDemoViewComponent)) \ No newline at end of file From 106683530c9f4160bee1523916522fe47e9e6dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 8 Jul 2020 17:43:04 +0300 Subject: [PATCH 5/8] Add BookStoreTestConsts.CollectionDefinitionName --- docs/en/Tutorials/Part-4.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/Tutorials/Part-4.md b/docs/en/Tutorials/Part-4.md index 0325f3f60a..95fdacc69f 100644 --- a/docs/en/Tutorials/Part-4.md +++ b/docs/en/Tutorials/Part-4.md @@ -83,6 +83,9 @@ using Xunit; namespace Acme.BookStore.Books { +{{if DB=="Mongo"}} + [Collection(BookStoreTestConsts.CollectionDefinitionName)] +{{end}} public class BookAppService_Tests : BookStoreApplicationTestBase { private readonly IBookAppService _bookAppService; @@ -173,6 +176,9 @@ using Xunit; namespace Acme.BookStore.Books { +{{if DB=="Mongo"}} + [Collection(BookStoreTestConsts.CollectionDefinitionName)] +{{end}} public class BookAppService_Tests : BookStoreApplicationTestBase { private readonly IBookAppService _bookAppService; From 2778e023a4b87bed93399a0d949d2de9167d4458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 8 Jul 2020 17:46:34 +0300 Subject: [PATCH 6/8] Update Part-4.md --- docs/en/Tutorials/Part-4.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/en/Tutorials/Part-4.md b/docs/en/Tutorials/Part-4.md index 95fdacc69f..5e87d18653 100644 --- a/docs/en/Tutorials/Part-4.md +++ b/docs/en/Tutorials/Part-4.md @@ -82,10 +82,8 @@ using Volo.Abp.Application.Dtos; using Xunit; namespace Acme.BookStore.Books -{ -{{if DB=="Mongo"}} - [Collection(BookStoreTestConsts.CollectionDefinitionName)] -{{end}} +{ {{if DB=="Mongo"}} + [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}} public class BookAppService_Tests : BookStoreApplicationTestBase { private readonly IBookAppService _bookAppService; @@ -175,10 +173,8 @@ using Volo.Abp.Validation; using Xunit; namespace Acme.BookStore.Books -{ -{{if DB=="Mongo"}} - [Collection(BookStoreTestConsts.CollectionDefinitionName)] -{{end}} +{ {{if DB=="Mongo"}} + [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}} public class BookAppService_Tests : BookStoreApplicationTestBase { private readonly IBookAppService _bookAppService; From e7562a28d2d024d0b5a19de02a97dd9f60d6184e Mon Sep 17 00:00:00 2001 From: Xeevis Date: Wed, 8 Jul 2020 19:05:01 +0200 Subject: [PATCH 7/8] Update Czech translations --- .../Localization/Resources/AbpUi/cs.json | 2 ++ .../Account/Localization/Resources/cs.json | 5 +++- .../Admin/ApplicationContracts/cs.json | 2 +- .../Blogging/Localization/Resources/cs.json | 2 +- .../Docs/ApplicationContracts/cs.json | 23 ++++++++++++++++++- .../Localization/MyProjectName/cs.json | 3 ++- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json index 2e4095ceae..b42cc1ebe3 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json @@ -47,6 +47,8 @@ "PagerInfoEmpty": "Zobrazeno od 0 do 0 z celkem 0 záznamů", "PagerInfoFiltered": "(filtrováno ze všech _MAX_ záznamů)", "NoDataAvailableInDatatable": "Nejsou žádná data", + "Total": "celkem", + "Selected": "vybráno", "PagerShowMenuEntries": "Zobrazit _MENU_ záznamů", "DatatableActionDropdownDefaultText": "Akce", "ChangePassword": "Změnit heslo", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json index 120060c4f4..ba7979dc65 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json @@ -40,6 +40,9 @@ "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolena automatická registrace", "Description:Abp.Account.IsSelfRegistrationEnabled": "Zda si uživatel může účet zaregistrovat sám.", "DisplayName:Abp.Account.EnableLocalLogin": "Ověření pomocí místního účtu", - "Description:Abp.Account.EnableLocalLogin": "Označuje, zda server umožní uživatelům ověřovat se pomocí místního účtu." + "Description:Abp.Account.EnableLocalLogin": "Označuje, zda server umožní uživatelům ověřovat se pomocí místního účtu.", + "LoggedOutTitle": "Odhlášeno", + "LoggedOutText": "Byli jste odhlášeni a brzy budete přesměrováni.", + "ReturnToText": "Kliknutím sem přejdete na {0}" } } diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Localization/Resources/Blogging/Admin/ApplicationContracts/cs.json b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Localization/Resources/Blogging/Admin/ApplicationContracts/cs.json index 1c8657c85c..b56e842ddc 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Localization/Resources/Blogging/Admin/ApplicationContracts/cs.json +++ b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Localization/Resources/Blogging/Admin/ApplicationContracts/cs.json @@ -1,7 +1,7 @@ { "culture": "cs", "texts": { - "Permission:BloggingAdmin": "Blog", + "Permission:BloggingAdmin": "Blogování", "Permission:Blogs": "Blogy", "Permission:Management": "Správa", "Permission:Edit": "Upravit", diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/cs.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/cs.json index 2761ca0278..109a695ea2 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/cs.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/cs.json @@ -2,7 +2,7 @@ "culture": "cs", "texts": { "Menu:Blogs": "Blogy", - "Menu:BlogManagement": "Správa blogu", + "Menu:BlogManagement": "Blogování", "Title": "Nadpis", "Delete": "Smazat", "Reply": "Odpovědět", diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json index 64ecaa2f47..081a5f2cd4 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json @@ -7,6 +7,7 @@ "Permission:Delete": "Smazat", "Permission:Create": "Vytvořit", "Permission:Documents": "Dokumenty", + "Menu:Documents": "Dokumenty", "Menu:DocumentManagement": "Dokumenty", "Menu:ProjectManagement": "Projekty", "CreateANewProject": "Vytvořit nový projekt", @@ -32,6 +33,26 @@ "DisplayName:GitHubUserAgent": "GitHub user agent", "DisplayName:All": "Pull všeho", "DisplayName:LanguageCode": "Kód jazyka", - "DisplayName:Version": "Verze" + "DisplayName:Version": "Verze", + "Documents": "Dokumenty", + "RemoveFromCache": "Odebrat z mezipaměti", + "Reindex": "Reindex", + "ReindexCompleted": "Reindex dokončen", + "RemovedFromCache": "Odebráno z mezipaměti", + "RemoveFromCacheConfirmation": "Opravdu chcete tuto položku odebrat z mezipaměti?", + "ReIndexDocumentConfirmation": "Opravdu chcete tuto položku reindexovat?", + "DeleteDocumentFromDbConfirmation": "Opravdu chcete tuto položku odstranit z databáze?", + "DeleteFromDatabase": "Odstranit z databáze", + "Deleted": "Vymazáno", + "Search": "Vyhledávání", + "StartDate": "Počáteční datum", + "EndDate": "Datum ukončení", + "CreationTime": "Čas vytvoření", + "LastUpdateTime": "Poslední aktualizace", + "LastSignificantUpdateTime": "Poslední významná aktualizace", + "Version": "Verze", + "LanguageCode": "Kód jazyka", + "FileName": "Název souboru", + "LastCachedTime": "Čas uložení v mezipaměti" } } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json index 7e0fbb38b3..a975797eb2 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json @@ -1,6 +1,7 @@ { "culture": "cs", "texts": { - "ManageYourProfile": "Spravovat profil" + "ManageYourProfile": "Spravovat profil", + "SamplePageMessage": "Ukázková stránka pro modul MyProjectName" } } From 750f81bd97fb6c0306424c592b904793417200cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 8 Jul 2020 21:19:49 +0300 Subject: [PATCH 8/8] Revise the index page. Add packages link to the nav menu. --- docs/en/Getting-Started.md | 2 +- docs/en/Index.md | 20 +++++--------------- docs/en/docs-nav.json | 4 ++++ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/docs/en/Getting-Started.md b/docs/en/Getting-Started.md index 5f3d79d94a..4a597181d0 100644 --- a/docs/en/Getting-Started.md +++ b/docs/en/Getting-Started.md @@ -344,6 +344,6 @@ If you don't plan to develop a mobile application with React Native, you can saf See the "[Getting Started with the React Native](Getting-Started-React-Native.md)" document to learn how to configure and run the React Native application. -## See Also +## Next * [Web Application Development Tutorial](Tutorials/Part-1.md) \ No newline at end of file diff --git a/docs/en/Index.md b/docs/en/Index.md index 8eeb7aeb72..5fe44625ad 100644 --- a/docs/en/Index.md +++ b/docs/en/Index.md @@ -1,28 +1,18 @@ # ABP Documentation -ABP is an **open source application framework** focused on ASP.NET Core based web application development, but also supports developing other type of applications. +ABP is an **open source application framework** focused on **ASP.NET Core** based **web application development**. It also supports developing other type of applications. -Explore the left navigation menu to deep dive in the documentation. +Explore the navigation menu to deep dive in the documentation. ## Getting Started -Easiest way to start a new project with ABP is to use the startup templates: +The easiest way to start a new web application with the ABP Framework is to use the [getting started](Getting-Started.md) tutorial. -* [ASP.NET Core MVC (Razor Pages) UI Startup Template](Getting-Started.md?UI=MVC&DB=EF&Tiered=No) -* [Angular UI Startup Template](Getting-Started.md?UI=NG&DB=EF&Tiered=No) - -If you want to start from scratch (with an empty project) then manually install the ABP Framework and use the following tutorials: - -* [Console Application](Getting-Started-Console-Application.md) -* [ASP.NET Core Web Application](Getting-Started-AspNetCore-Application.md) - -## Packages - -ABP Framework is distributed as NuGet and NPM packages. See [this page](http://abp.io/packages) for the complete list of the packages. +Then you can continue with the [web application development tutorial](Tutorials/Part-1.md). ## Source Code -ABP is hosted on GitHub. See [the source code](https://github.com/abpframework/abp). +ABP is hosted on GitHub. See [the source code](https://github.com/abpframework). ## Want to Contribute? diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index 239f071619..a6ab09dfee 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -626,6 +626,10 @@ { "text": "API Documentation", "path": "{ApiDocumentationUrl}" + }, + { + "text": "Official Packages", + "path": "https://abp.io/packages" } ] }