From 8b41e00f618906ca802d8a011e4899e79312b707 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Tue, 26 Jan 2021 15:47:24 +0300 Subject: [PATCH 1/4] added module menu --- .../Menus/MyProjectNameMenuContributor.cs | 3 ++- .../Menus/MyProjectNameMenus.cs | 2 +- .../Menus/MyProjectNameMenuContributor.cs | 1 + .../Menus/MyProjectNameMenus.cs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs index 8d10a7c7f3..9ed725efb7 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs @@ -16,7 +16,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Menus private Task ConfigureMainMenuAsync(MenuConfigurationContext context) { //Add main menu items. - + context.Menu.AddItem(new ApplicationMenuItem(MyProjectNameMenus.Prefix, displayName: "MyProjectName", "~/MyProjectName", icon: "fa fa-globe")); + return Task.CompletedTask; } } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs index 18d64be308..1fd011d0f3 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs @@ -2,7 +2,7 @@ { public class MyProjectNameMenus { - private const string Prefix = "MyProjectName"; + public const string Prefix = "MyProjectName"; //Add your menu items here... //public const string Home = Prefix + ".MyNewMenuItem"; diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs index 5db507a100..63837ab762 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs @@ -16,6 +16,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus private Task ConfigureMainMenuAsync(MenuConfigurationContext context) { //Add main menu items. + context.Menu.AddItem(new ApplicationMenuItem(MyProjectNameMenus.Prefix, displayName: "MyProjectName", "~/MyProjectName", icon: "fa fa-globe")); return Task.CompletedTask; } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs index 82ff4a2781..253701a9a6 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs @@ -2,7 +2,7 @@ { public class MyProjectNameMenus { - private const string Prefix = "MyProjectName"; + public const string Prefix = "MyProjectName"; //Add your menu items here... //public const string Home = Prefix + ".MyNewMenuItem"; From af3dcf0137a6bafc8b27583fdabc184bf3afcccf Mon Sep 17 00:00:00 2001 From: Ahmet Date: Tue, 26 Jan 2021 15:50:31 +0300 Subject: [PATCH 2/4] Update Index.cshtml --- .../Pages/Index.cshtml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Pages/Index.cshtml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Pages/Index.cshtml index 62ead393a5..3f37ed5a3e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Pages/Index.cshtml +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Pages/Index.cshtml @@ -2,6 +2,16 @@ @using Localization.Resources.AbpUi @using Microsoft.Extensions.Localization @using MyCompanyName.MyProjectName.Pages +@using Volo.Abp.Users @model IndexModel @inject IStringLocalizer Localizer -@Localizer["Login"] \ No newline at end of file +@inject ICurrentUser CurrentUser + +@if (!CurrentUser.IsAuthenticated) +{ + @Localizer["Login"] +} +else +{ + Welcome: @CurrentUser.UserName +} \ No newline at end of file From cbc61af768dd4ffc786df47db0038856bf3e6fcc Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 27 Jan 2021 11:22:13 +0300 Subject: [PATCH 3/4] Datatables pagination: use "col-auto" resolves https://github.com/abpframework/abp/issues/7183 --- .../datatables/datatables-extensions.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js index b0c4873b59..45dadb5441 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js @@ -30,7 +30,7 @@ var htmlEncode = function (html) { return $('
').text(html).html(); } - + var _createDropdownItem = function (record, fieldItem, tableInstance) { var $li = $('
  • '); var $a = $(''); @@ -90,15 +90,15 @@ } $button.append(htmlEncode(firstItem.text)); } - + if (firstItem.enabled && !firstItem.enabled({ record: record, table: tableInstance })) { $button.addClass('disabled'); } - + if (firstItem.action) { $button.click(function (e) { e.preventDefault(); - + if (!$(this).hasClass('disabled')) { if (firstItem.confirmMessage) { abp.message.confirm(firstItem.confirmMessage({ record: record, table: tableInstance })) @@ -217,7 +217,7 @@ var renderRowActions = function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) { var columns; - + if (tableInstance.aoColumns) { columns = tableInstance.aoColumns; } else { @@ -463,7 +463,7 @@ datatables.defaultConfigurations.scrollX = true; - datatables.defaultConfigurations.responsive = true; + datatables.defaultConfigurations.responsive = true; datatables.defaultConfigurations.language = function () { return { @@ -484,6 +484,6 @@ }; }; - datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col"p>>'; + datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col-auto"p>>'; })(jQuery); From afb9175e30c62b76fc2d7138e7d6211b3730e7ec Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 27 Jan 2021 11:28:15 +0300 Subject: [PATCH 4/4] Update datatables-extensions.js --- .../datatables/datatables-extensions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js index 45dadb5441..1808f267eb 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js @@ -484,6 +484,6 @@ }; }; - datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col-auto"p>>'; + datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto mr-auto"i><"col-auto"p>>'; })(jQuery);