Merge pull request #7484 from abpframework/auto-merge/rel-4-2/131

Merge branch dev with rel-4.2

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 $('<div/>').text(html).html();
         }
-        
+
         var _createDropdownItem = function (record, fieldItem, tableInstance) {
             var $li = $('<li/>');
             var $a = $('<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 mr-auto"i><"col-auto"p>>';
 
 })(jQuery);

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<AbpUiResource> Localizer
-<a href="~/Account/Login">@Localizer["Login"]</a>
+@inject ICurrentUser CurrentUser
+
+@if (!CurrentUser.IsAuthenticated)
+{
+    <a href="~/Account/Login">@Localizer["Login"]</a>
+}
+else
+{
+    <span>Welcome: @CurrentUser.UserName</span>
+}

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;
         }
     }

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";

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;
         }

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";