Resolved #38: Don't use absolute path for actions in MVC template. Minor improvements.

Author: hikalkan

src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

@@ -449,6 +449,7 @@
     <Compile Include="Models\Layout\TopMenuViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\AbpProjectNameWebViewPageBase.cs" />
+    <Compile Include="Views\UrlChecker.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\web.config" />

src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/AbpProjectNameNavigationProvider.cs

@@ -19,31 +19,31 @@ public override void SetNavigation(INavigationProviderContext context)
                     new MenuItemDefinition(
                         "Home",
                         L("HomePage"),
-                        url: "/",
+                        url: "",
                         icon: "fa fa-home",
                         requiresAuthentication: true
                         )
                 ).AddItem(
                     new MenuItemDefinition(
                         "Tenants",
                         L("Tenants"),
-                        url: "/Tenants",
+                        url: "Tenants",
                         icon: "fa fa-globe",
                         requiredPermissionName: PermissionNames.Pages_Tenants
                         )
                 ).AddItem(
                     new MenuItemDefinition(
                         "Users",
                         L("Users"),
-                        url: "/Users",
+                        url: "Users",
                         icon: "fa fa-users",
                         requiredPermissionName: PermissionNames.Pages_Users
                         )
                 ).AddItem(
                     new MenuItemDefinition(
                         "About",
                         L("About"),
-                        url: "/About",
+                        url: "About",
                         icon: "fa fa-info"
                         )
                 );

src/AbpCompanyName.AbpProjectName.WebMpa/Views/Layout/_TopMenu.cshtml

@@ -1,11 +1,28 @@
 @using Abp.Collections.Extensions
+@using AbpCompanyName.AbpProjectName.WebMpa.Views
 @model AbpCompanyName.AbpProjectName.WebMpa.Models.Layout.TopMenuViewModel
+@{
+    var calculateMenuUrl = new Func<string, string>((url) =>
+    {
+        if (string.IsNullOrEmpty(url))
+        {
+            return ApplicationPath;
+        }
+
+        if (UrlChecker.IsRooted(url))
+        {
+            return url;
+        }
+
+        return ApplicationPath + url;
+    });
+}
 @foreach (var menuItem in Model.MainMenu.Items)
 {
     <li class="@(Model.ActiveMenuItemName == menuItem.Name ? "active" : "")">
         @if (menuItem.Items.IsNullOrEmpty())
         {
-            <a href="@menuItem.Url">
+            <a href="@calculateMenuUrl(menuItem.Url)">
                 @if (!string.IsNullOrWhiteSpace(menuItem.Icon))
                 {
                     <i class="@menuItem.Icon"></i>
@@ -26,7 +43,7 @@
                 @foreach (var subMenuItem in menuItem.Items)
                 {
                     <li>
-                        <a href="@subMenuItem.Url">
+                        <a href="@calculateMenuUrl(subMenuItem.Url)">
                             @if (!string.IsNullOrWhiteSpace(subMenuItem.Icon))
                             {
                                 <i class="@subMenuItem.Icon"></i>

src/AbpCompanyName.AbpProjectName.WebMpa/Views/UrlChecker.cs

@@ -0,0 +1,24 @@
+using System.Text.RegularExpressions;
+
+namespace AbpCompanyName.AbpProjectName.WebMpa.Views
+{
+    public static class UrlChecker
+    {
+        private static readonly Regex UrlWithProtocolRegex = new Regex("^.{1,10}://.*$");
+
+        public static bool IsRooted(string url)
+        {
+            if (url.StartsWith("/"))
+            {
+                return true;
+            }
+            
+            if (UrlWithProtocolRegex.IsMatch(url))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.WebMpa/js/main.js

@@ -1,13 +1,11 @@
 (function($) {
 
-    if (!$) {
-        return;
-    }
-   
+    //Notification handler
     abp.event.on('abp.notifications.received', function (userNotification) {
-        console.log(userNotification);
+        abp.notifications.showUiNotifyForUserNotification(userNotification);
     });
 
+    //serializeFormToObject plugin for jQuery
     $.fn.serializeFormToObject = function () {
         //serialize to array
         var data = $(this).serializeArray();
@@ -24,4 +22,11 @@
         return obj;
     }
 
+    //Configure blockUI
+    (function ($) {
+        if ($.blockUI) {
+            $.blockUI.defaults.baseZ = 2000;
+        }
+    })(jQuery);
+
 })(jQuery);

src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

@@ -310,6 +310,7 @@
     <Content Include="App\Main\views\users\index.js" />
     <Content Include="App\Main\views\tenants\createModal.js" />
     <Content Include="App\Main\views\tenants\index.js" />
+    <Content Include="App\Main\_libconfig.js" />
     <Content Include="Common\Scripts\helpers.js" />
     <Content Include="Content\bootstrap-cosmo.min.css" />
     <Content Include="Content\bootstrap-theme.css" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/_libconfig.js

@@ -0,0 +1,5 @@
+(function ($) {
+    if ($.blockUI) {
+        $.blockUI.defaults.baseZ = 2000;
+    }
+})(jQuery);

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/layout/header.js

@@ -28,7 +28,7 @@
             };
 
             abp.event.on('abp.notifications.received', function (userNotification) {
-                console.log(userNotification);
+                abp.notifications.showUiNotifyForUserNotification(userNotification);
             });
         }
     ]);