From bb9d6141afc5160c017ca4c3beadd8d9399220b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Sat, 30 May 2020 05:29:44 +0300 Subject: [PATCH 1/7] added search box view component --- .../AbpPageSearchBoxViewComponent.cs | 34 +++++++++++++++++++ .../AbpPageSearchBox/Default.cshtml | 13 +++++++ ....Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj | 4 +++ 3 files changed, 51 insertions(+) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs new file mode 100644 index 0000000000..127b86cc0e --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -0,0 +1,34 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox +{ + public class AbpPageSearchBoxViewComponent : AbpViewComponent + { + public string PlaceHolder { get; set; } + + public async Task InvokeAsync( + string placeHolder, + string formClassName, + string textBoxClassName) + { + return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", + new SearchBoxViewModel + { + PlaceHolder = placeHolder, + FormClassName = formClassName, + TextBoxClassName = textBoxClassName + })); + ; + } + } + + public class SearchBoxViewModel + { + public string PlaceHolder { get; set; } + + public string FormClassName { get; set; } + + public string TextBoxClassName { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml new file mode 100644 index 0000000000..ad83c93677 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml @@ -0,0 +1,13 @@ +@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.SearchBoxViewModel + + +
+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj index 7c4147bba5..755a71af48 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj @@ -40,4 +40,8 @@ + + <_ContentIncludedByDefault Remove="Pages\Shared\Components\AbpPageToolbar\AbpPageSearchBox\Default.cshtml" /> + + From 06c58cfd5cc2c798ecaa8bdd1e26ece4327ede3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Sat, 30 May 2020 05:32:12 +0300 Subject: [PATCH 2/7] removed emtpy line --- .../Pages/Shared/Components/AbpPageSearchBox/Default.cshtml | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml index ad83c93677..e1cd8e5277 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml @@ -1,6 +1,5 @@ @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.SearchBoxViewModel -
From 4cd669c3d8698ea568eb2190c324fe7a110b283c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Mon, 1 Jun 2020 02:02:23 +0300 Subject: [PATCH 3/7] refactored searchbox view component --- .../AbpPageSearchBoxViewComponent.cs | 25 ++----------------- .../AbpPageSearchBox/Default.cshtml | 7 +++--- ....Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj | 4 --- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index 127b86cc0e..e690d7d530 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -5,30 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageSearchBoxViewComponent : AbpViewComponent { - public string PlaceHolder { get; set; } - - public async Task InvokeAsync( - string placeHolder, - string formClassName, - string textBoxClassName) + public async Task InvokeAsync() { - return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", - new SearchBoxViewModel - { - PlaceHolder = placeHolder, - FormClassName = formClassName, - TextBoxClassName = textBoxClassName - })); - ; + return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml")); } } - - public class SearchBoxViewModel - { - public string PlaceHolder { get; set; } - - public string FormClassName { get; set; } - - public string TextBoxClassName { get; set; } - } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml index e1cd8e5277..0e621f7936 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml @@ -1,8 +1,7 @@ -@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.SearchBoxViewModel - - + +
- +
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj index 755a71af48..7c4147bba5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj @@ -40,8 +40,4 @@ - - <_ContentIncludedByDefault Remove="Pages\Shared\Components\AbpPageToolbar\AbpPageSearchBox\Default.cshtml" /> - - From d66b493885bb3f9f87021533243f9306bfd55976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Mon, 1 Jun 2020 10:46:06 +0300 Subject: [PATCH 4/7] renamed class and refactored view component --- .../AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs | 6 ++++-- .../Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs | 7 +++++++ .../Shared/Components/AbpPageSearchBox/Default.cshtml | 7 ++++--- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index e690d7d530..3db0d576cb 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -5,9 +5,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageSearchBoxViewComponent : AbpViewComponent { - public async Task InvokeAsync() + public async Task InvokeAsync(string placeHolder) { - return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml")); + return await Task.FromResult( + View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", + new AbpSearchBoxViewModel {PlaceHolder = placeHolder})); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs new file mode 100644 index 0000000000..86ba08500b --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox +{ + public class AbpSearchBoxViewModel + { + public string PlaceHolder { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml index 0e621f7936..9b13123379 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml @@ -1,7 +1,8 @@ - - +@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.AbpSearchBoxViewModel + +
- +
From f08ea476e1290b7e308fedf8d046ad36cdeb5c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Mon, 1 Jun 2020 16:42:53 +0300 Subject: [PATCH 5/7] changed InvokeAsync method as Invoke --- .../AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index 3db0d576cb..118668b6d2 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -5,11 +5,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageSearchBoxViewComponent : AbpViewComponent { - public async Task InvokeAsync(string placeHolder) + public IViewComponentResult Invoke(string placeHolder) { - return await Task.FromResult( - View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", - new AbpSearchBoxViewModel {PlaceHolder = placeHolder})); + return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", + new AbpSearchBoxViewModel {PlaceHolder = placeHolder}); } } } \ No newline at end of file From dc2850cd52f68de0468fe188070f1655451d5384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Wed, 3 Jun 2020 23:59:58 +0300 Subject: [PATCH 6/7] refactored searchbox viewcomponent added search localization key --- .../AbpPageSearchBoxViewComponent.cs | 3 +- .../AbpPageSearchBox/AbpSearchBoxViewModel.cs | 7 ---- .../AbpPageSearchBox/Default.cshtml | 7 ++-- .../Localization/Resources/AbpUi/ar.json | 3 +- .../Localization/Resources/AbpUi/cs.json | 3 +- .../Localization/Resources/AbpUi/de.json | 37 ++++++++++--------- .../Localization/Resources/AbpUi/en.json | 3 +- .../Localization/Resources/AbpUi/es.json | 3 +- .../Localization/Resources/AbpUi/nl.json | 3 +- .../Localization/Resources/AbpUi/pt-BR.json | 3 +- .../Localization/Resources/AbpUi/ru.json | 3 +- .../Localization/Resources/AbpUi/sl.json | 3 +- .../Localization/Resources/AbpUi/tr.json | 3 +- .../Localization/Resources/AbpUi/zh-Hans.json | 3 +- .../Localization/Resources/AbpUi/zh-Hant.json | 3 +- 15 files changed, 46 insertions(+), 41 deletions(-) delete mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index 118668b6d2..eaf49cc633 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -7,8 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public IViewComponentResult Invoke(string placeHolder) { - return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml", - new AbpSearchBoxViewModel {PlaceHolder = placeHolder}); + return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml"); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs deleted file mode 100644 index 86ba08500b..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpSearchBoxViewModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox -{ - public class AbpSearchBoxViewModel - { - public string PlaceHolder { get; set; } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml index 9b13123379..a45223e825 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml @@ -1,8 +1,9 @@ -@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.AbpSearchBoxViewModel - +@using Localization.Resources.AbpUi +@using Microsoft.Extensions.Localization +@inject IStringLocalizer L
- +
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json index 8fdc29ad8c..ea35628dc7 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json @@ -58,6 +58,7 @@ "404Message": "الصفحة غير موجودة", "500Message": "خطأ في الخادم الداخلي", "GoHomePage": "اذهب الى الصفحة الرئيسية", - "GoBack": "عد" + "GoBack": "عد", + "Search": "بحث" } } 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 3fba79a2b3..da42eb2401 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json @@ -54,6 +54,7 @@ "404Message": "Stránka nenalezena", "500Message": "Interní chyba serveru", "GoHomePage": "Přejít na domovskou stránku", - "GoBack": "Jít zpět" + "GoBack": "Jít zpět", + "Search": "Vyhledávání" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json index a663b772be..126304838a 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json @@ -1,18 +1,18 @@ { "culture": "de", "texts": { - "InternalServerErrorMessage": "Whrend Ihrer Anfrage ist ein interner Fehler aufgetreten!", - "ValidationErrorMessage": "Ihre Anfrage ist nicht gltig!", + "InternalServerErrorMessage": "W�hrend Ihrer Anfrage ist ein interner Fehler aufgetreten!", + "ValidationErrorMessage": "Ihre Anfrage ist nicht g�ltig!", "ValidationNarrativeErrorMessageTitle": "Die folgenden Fehler wurden bei der Validierung entdeckt.", "DefaultErrorMessage": "Ein Fehler ist aufgetreten!", "DefaultErrorMessageDetail": "Es wurden keine Fehlerdetails vom Server gesendet.", "DefaultErrorMessage401": "Sie sind nicht authentifiziert.", - "DefaultErrorMessage401Detail": "Sie sollten sich anmelden, um diese Operation durchzufhren.", + "DefaultErrorMessage401Detail": "Sie sollten sich anmelden, um diese Operation durchzuf�hren.", "DefaultErrorMessage403": "Sie sind nicht autorisiert!", - "DefaultErrorMessage403Detail": "Es ist Ihnen nicht erlaubt, diese Operation durchzufhren!", + "DefaultErrorMessage403Detail": "Es ist Ihnen nicht erlaubt, diese Operation durchzuf�hren!", "DefaultErrorMessage404": "Ressource nicht gefunden!", "DefaultErrorMessage404Detail": "Die angeforderte Ressource konnte auf dem Server nicht gefunden werden!", - "EntityNotFoundErrorMessage": "Es gibt keine Entitt {0} mit id = {1}!", + "EntityNotFoundErrorMessage": "Es gibt keine Entit�t {0} mit id = {1}!", "Languages": "Sprachen", "Error": "Fehler", "AreYouSure": "Sind Sie sicher?", @@ -20,11 +20,11 @@ "Yes": "Ja", "No": "Nein", "Ok": "Ok", - "Close": "Schlieen", + "Close": "Schlie�en", "Save": "Speichern", "SavingWithThreeDot": "Speichere...", "Actions": "Aktionen", - "Delete": "Lschen", + "Delete": "L�schen", "Edit": "Bearbeiten", "Refresh": "Aktualisieren", "Language": "Sprache", @@ -36,28 +36,29 @@ "Register": "Registrieren", "Logout": "Abmelden", "Submit": "Absenden", - "Back": "Zurck", + "Back": "Zur�ck", "PagerSearch": "Suchen", - "PagerNext": "Nchste", + "PagerNext": "N�chste", "PagerPrevious": "Vorherige", "PagerFirst": "Erste", "PagerLast": "Letzte", - "PagerInfo": "Zeige _START_ bis _END_ von _TOTAL_ Eintrgen", - "PagerInfo{0}{1}{2}": "Zeige {0} bis {1} von {2} Eintrgen", - "PagerInfoEmpty": "Zeige 0 bis 0 von 0 Eintrgen", - "PagerInfoFiltered": "(gefiltert von _MAX_ Eintrgen insgesamt)", - "NoDataAvailableInDatatable": "Keine Daten verfgbar", - "PagerShowMenuEntries": "Zeige _MENU_ Eintrge", + "PagerInfo": "Zeige _START_ bis _END_ von _TOTAL_ Eintr�gen", + "PagerInfo{0}{1}{2}": "Zeige {0} bis {1} von {2} Eintr�gen", + "PagerInfoEmpty": "Zeige 0 bis 0 von 0 Eintr�gen", + "PagerInfoFiltered": "(gefiltert von _MAX_ Eintr�gen insgesamt)", + "NoDataAvailableInDatatable": "Keine Daten verf�gbar", + "PagerShowMenuEntries": "Zeige _MENU_ Eintr�ge", "DatatableActionDropdownDefaultText": "Aktionen", - "ChangePassword": "Passwort ndern", + "ChangePassword": "Passwort �ndern", "PersonalInfo": "Mein Profil", - "AreYouSureYouWantToCancelEditingWarningMessage": "Sie haben ungespeicherte nderungen.", + "AreYouSureYouWantToCancelEditingWarningMessage": "Sie haben ungespeicherte �nderungen.", "UnhandledException": "Unerwartete Ausnahme!", "401Message": "Unauthorisiert", "403Message": "Verboten", "404Message": "Seite nicht gefunden", "500Message": "Internet Server Fehler", "GoHomePage": "Zur Startseite", - "GoBack": "Zurck" + "GoBack": "Zur�ck", + "Search": "Suche" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json index 77e3e37570..2bd4bc7352 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json @@ -58,6 +58,7 @@ "404Message": "Page not found", "500Message": "Internal Server Error", "GoHomePage": "Go to the homepage", - "GoBack": "Go back" + "GoBack": "Go back", + "Search" : "Search" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json index be137f013b..a7c511fe02 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json @@ -54,6 +54,7 @@ "404Message": "La página no existe", "500Message": "Error interno del servidor", "GoHomePage": "Ir a la página principal", - "GoBack": "Atras" + "GoBack": "Atras", + "Search": "Buscar" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json index b44ea3794b..6198aa360f 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json @@ -58,6 +58,7 @@ "404Message": "Pagina niet gevonden", "500Message": "Interne Server Fout", "GoHomePage": "Ga naar de homepage", - "GoBack": "Ga terug" + "GoBack": "Ga terug", + "Search": "Zoeken" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json index 6966b565c2..9d69ba1ef8 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json @@ -54,6 +54,7 @@ "404Message": "Página não encontrada", "500Message": "Erro interno do servidor", "GoHomePage": "Voltar à página principal", - "GoBack": "Voltar" + "GoBack": "Voltar", + "Search": "Procurar" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json index 7b48db1a3a..12ccca117b 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json @@ -57,6 +57,7 @@ "404Message": "Страница не найдена", "500Message": "Внутренняя ошибка сервера", "GoHomePage": "Вернуться на главную страницу", - "GoBack": "Вернуться назад" + "GoBack": "Вернуться назад", + "Search": "поиск" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json index 7fffcb73c6..2bbdb2c09d 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json @@ -58,6 +58,7 @@ "404Message": "Strani ni mogoče najti", "500Message": "Napaka na strani strežnika", "GoHomePage": "Pojdi na osnovno stran", - "GoBack": "Nazaj" + "GoBack": "Nazaj", + "Search": "Iskanje" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json index 1369491bc4..ddf8760fa9 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json @@ -58,6 +58,7 @@ "404Message": "Sayfa bulunamadı", "500Message": "Sunucu tarafında hata", "GoHomePage": "Ana sayfaya git", - "GoBack": "Geri dön" + "GoBack": "Geri dön", + "Search": "Arama" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json index d1d6aa1b81..bfe84fa36b 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json @@ -55,6 +55,7 @@ "404Message": "网页未找到", "500Message": "内部服务器错误", "GoHomePage": "返回主页", - "GoBack": "返回" + "GoBack": "返回", + "Search" : "搜索" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json index 7839409b4c..ae50048d03 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json @@ -54,6 +54,7 @@ "404Message": "網頁未找到", "500Message": "內部伺服器錯誤", "GoHomePage": "返回首頁", - "GoBack": "返回" + "GoBack": "返回", + "Search": "搜索" } } \ No newline at end of file From cb347cceb7bb70ac9607b7175d8075cf4a3ab5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Thu, 4 Jun 2020 00:06:23 +0300 Subject: [PATCH 7/7] refactored --- .../AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs | 2 +- framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index eaf49cc633..d14c92c62e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageSearchBoxViewComponent : AbpViewComponent { - public IViewComponentResult Invoke(string placeHolder) + public IViewComponentResult Invoke() { return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml"); } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json index 126304838a..e4b6d8e7a3 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json @@ -58,7 +58,6 @@ "404Message": "Seite nicht gefunden", "500Message": "Internet Server Fehler", "GoHomePage": "Zur Startseite", - "GoBack": "Zur�ck", - "Search": "Suche" + "GoBack": "Zur�ck" } }