From 53a8666827150c5d1a6dbb685ef4521c13400d42 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 21 Feb 2019 10:03:25 +0300
Subject: [PATCH 1/4] Basic theme #830 :  added partialview for recursion

---
 .../Basic/Components/Menu/Default.cshtml      | 36 ++++++++----------
 .../Basic/Components/Menu/_MenuItem.cshtml    | 37 +++++++++++++++++++
 2 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
index 2e7e7f3f4c..bddc2dcea5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
@@ -1,43 +1,39 @@
 @using Volo.Abp.UI.Navigation
 @model ApplicationMenu
+
 @foreach (var menuItem in Model.Items)
 {
     var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
     var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
     var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
-
     if (menuItem.IsLeaf)
     {
-        if (menuItem.Url == null)
+        @if (menuItem.Url != null)
         {
-            continue;
-        }
-
-        <li class="nav-item @cssClass @disabled" @elementId>
-            <a class="nav-link" href="@(menuItem.Url ?? "#")">
-                @if (menuItem.Icon != null)
-                {
-                    if (menuItem.Icon.StartsWith("fa"))
+            <li class="nav-item @cssClass @disabled" @elementId>
+                <a class="nav-link" href="@(menuItem.Url ?? "#")">
+                    @if (menuItem.Icon != null)
                     {
-                        <i class="@menuItem.Icon"></i>
+                        if (menuItem.Icon.StartsWith("fa"))
+                        {
+                            <i class="@menuItem.Icon"></i>
+                        }
                     }
-                }
-                @menuItem.DisplayName
-            </a> @*<span class="sr-only">(current)</span>*@
-        </li>
+                    @menuItem.DisplayName
+                </a>
+            </li>
+        }
     }
     else
     {
-        <li class="nav-item dropdown">
+        <nav-item class="dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@menuItem.DisplayName</a>
             <div class="dropdown-menu" aria-labelledby="Menu_@(menuItem.Name)">
                 @foreach (var childMenuItem in menuItem.Items)
                 {
-                    <a class="dropdown-item @cssClass @disabled" href="@(childMenuItem.Url ?? "#")" @Html.Raw(elementId)>
-                        @childMenuItem.DisplayName
-                    </a>
+                    @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
                 }
             </div>
-        </li>
+        </nav-item>
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
new file mode 100644
index 0000000000..60dab4fd76
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
@@ -0,0 +1,37 @@
+@using Volo.Abp.UI.Navigation
+@model ApplicationMenuItem
+@{
+    var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\"";
+    var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass;
+    var disabled = Model.IsDisabled ? "disabled" : string.Empty;
+}
+@if (Model.IsLeaf)
+{
+    @if (Model.Url != null)
+    {
+        <a class="dropdown-item @cssClass @disabled" href="@(Model.Url ?? "#")" @Html.Raw(elementId)>
+            @Model.DisplayName
+        </a>
+    }
+}
+else
+{
+    @*<li class="dropdown-submenu">
+        <a role="button" class="btn dropdown-toggle" data-toggle="dropdown"
+                aria-haspopup="true" aria-expanded="false">
+            <span class="lp-icon">
+                <i class="@(Model.Icon ?? "")"></i>
+            </span>
+            <span class="lp-text">
+                @Model.DisplayName
+            </span>
+        </a>
+        <div class="dropdown-menu">
+            @foreach (var childMenuItem in Model.Items)
+            {
+                @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
+            }
+        </div>
+    </li>*@
+
+}

From 25ab9008cbc30a7c2f2e68d08f089d36d16e26d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C4=9Fan=20=C3=9Cnl=C3=BC?=
 <36102404+armgnunlu@users.noreply.github.com>
Date: Fri, 22 Feb 2019 16:01:52 +0300
Subject: [PATCH 2/4] Abp multilevel dropdown menu

D:\GitHub\abp\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Themes\Basic\Components\Menu
---
 .../Basic/Components/Menu/Default.cshtml      | 61 ++++++++++++++++---
 .../Basic/Components/Menu/_MenuItem.cshtml    |  5 +-
 .../AbpIdentityWebMainMenuContributor.cs      |  6 ++
 3 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
index bddc2dcea5..dd0d74b29e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
@@ -26,14 +26,59 @@
     }
     else
     {
-        <nav-item class="dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@menuItem.DisplayName</a>
-            <div class="dropdown-menu" aria-labelledby="Menu_@(menuItem.Name)">
-                @foreach (var childMenuItem in menuItem.Items)
-                {
-                    @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
-                }
+        <li class="nav-item">
+            <div class="dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@menuItem.DisplayName</a>
+                <div class="dropdown-menu" aria-labelledby="Menu_@(menuItem.Name)">
+                    @foreach (var childMenuItem in menuItem.Items)
+                    {
+                        @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
+                    }
+                </div>
             </div>
-        </nav-item>
+        </li>
     }
 }
+
+<!-- Test yapılabilmesi için çağırıldı. Silinecek. ÖNEMLİ -->
+<script src="https://code.jquery.com/jquery-3.3.1.js" integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60=" crossorigin="anonymous"></script>
+
+
+<!-- Olması gereken yere bu stiller yazılacak. -->
+<style type="text/css">
+    .navbar .dropdown-submenu {
+        position: relative;
+    }
+
+        .navbar .dropdown-submenu a::after {
+            transform: rotate(-90deg);
+            position: absolute;
+            right: 6px;
+            top: .8em;
+        }
+
+        .navbar .dropdown-submenu .dropdown-menu {
+            top: 0;
+            left: 100%;
+            margin-left: .1rem;
+            margin-right: .1rem;
+        }
+</style>
+
+<!-- Olması gereken yere bu script yazılacak. -->
+<script type="text/javascript">
+    $(document).ready(function () {
+        $('.dropdown-menu a.dropdown-toggle').on('click', function (e) {
+            if (!$(this).next().hasClass('show')) {
+                $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
+            }
+            var $subMenu = $(this).next(".dropdown-menu");
+            $subMenu.toggleClass('show');
+
+            $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function (e) {
+                $('.dropdown-submenu .show').removeClass("show");
+            });
+            return false;
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
index 60dab4fd76..fb8feb2ad8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
@@ -16,7 +16,7 @@
 }
 else
 {
-    @*<li class="dropdown-submenu">
+    <div class="dropdown-submenu">
         <a role="button" class="btn dropdown-toggle" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">
             <span class="lp-icon">
@@ -32,6 +32,5 @@ else
                 @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
             }
         </div>
-    </li>*@
-
+    </div> 
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
index 22581401be..0f15bd6906 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@@ -31,6 +31,12 @@ namespace Volo.Abp.Identity.Web.Navigation
             {
                 identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/Identity/Users"));
             }
+
+            var identityMenuItem2 = new ApplicationMenuItem("asdasd", "Dropdown", icon: "fa fa-id-card-o");
+            identityMenuItem2.AddItem(new ApplicationMenuItem("qweqew", "Link 2", url: "/Identity/Users"));
+            identityMenuItem2.AddItem(new ApplicationMenuItem("qweqeww", "Link 1", url: "/Identity/Roles"));
+
+            identityMenuItem.AddItem(identityMenuItem2);
         }
     }
 }
\ No newline at end of file

From fa1b718fd31a989d029eed1170431fdc4b49704c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C4=9Fan=20=C3=9Cnl=C3=BC?=
 <36102404+armgnunlu@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:36:25 +0300
Subject: [PATCH 3/4] Update Default.cshtml

---
 .../Themes/Basic/Components/Menu/Default.cshtml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
index dd0d74b29e..6e13ae01a0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
@@ -53,8 +53,8 @@
         .navbar .dropdown-submenu a::after {
             transform: rotate(-90deg);
             position: absolute;
-            right: 6px;
-            top: .8em;
+            right: 16px;
+            top: 18px;
         }
 
         .navbar .dropdown-submenu .dropdown-menu {

From ad3ffb7b3c39e2b0c1c67caed7fa7b12b232d9e8 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Sat, 23 Feb 2019 16:13:42 +0300
Subject: [PATCH 4/4] Move css & js to their own files. cleanup.

---
 .../AbpAspNetCoreMvcUIBasicThemeModule.cs     |  4 +-
 .../BasicThemeGlobalScriptContributor.cs      | 12 +++++
 .../Basic/Components/Menu/Default.cshtml      | 46 +------------------
 .../wwwroot/themes/basic/layout.css           | 24 ++++++++++
 .../wwwroot/themes/basic/layout.js            | 16 +++++++
 .../AbpIdentityWebMainMenuContributor.cs      |  6 ---
 6 files changed, 56 insertions(+), 52 deletions(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalScriptContributor.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.js

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
index 07f24165e3..08d04cfed2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
@@ -52,7 +52,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic
                     .ScriptBundles
                     .Add(BasicThemeBundles.Scripts.Global, bundle =>
                     {
-                        bundle.AddBaseBundles(StandardBundles.Scripts.Global);
+                        bundle
+                            .AddBaseBundles(StandardBundles.Scripts.Global)
+                            .AddContributors(typeof(BasicThemeGlobalScriptContributor));
                     });
             });
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalScriptContributor.cs
new file mode 100644
index 0000000000..76ce8b2c05
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalScriptContributor.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
+{
+    public class BasicThemeGlobalScriptContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.Add("/themes/basic/layout.js");
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
index 6e13ae01a0..7bfe8f1730 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
@@ -1,6 +1,5 @@
 @using Volo.Abp.UI.Navigation
 @model ApplicationMenu
-
 @foreach (var menuItem in Model.Items)
 {
     var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
@@ -38,47 +37,4 @@
             </div>
         </li>
     }
-}
-
-<!-- Test yapılabilmesi için çağırıldı. Silinecek. ÖNEMLİ -->
-<script src="https://code.jquery.com/jquery-3.3.1.js" integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60=" crossorigin="anonymous"></script>
-
-
-<!-- Olması gereken yere bu stiller yazılacak. -->
-<style type="text/css">
-    .navbar .dropdown-submenu {
-        position: relative;
-    }
-
-        .navbar .dropdown-submenu a::after {
-            transform: rotate(-90deg);
-            position: absolute;
-            right: 16px;
-            top: 18px;
-        }
-
-        .navbar .dropdown-submenu .dropdown-menu {
-            top: 0;
-            left: 100%;
-            margin-left: .1rem;
-            margin-right: .1rem;
-        }
-</style>
-
-<!-- Olması gereken yere bu script yazılacak. -->
-<script type="text/javascript">
-    $(document).ready(function () {
-        $('.dropdown-menu a.dropdown-toggle').on('click', function (e) {
-            if (!$(this).next().hasClass('show')) {
-                $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
-            }
-            var $subMenu = $(this).next(".dropdown-menu");
-            $subMenu.toggleClass('show');
-
-            $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function (e) {
-                $('.dropdown-submenu .show').removeClass("show");
-            });
-            return false;
-        });
-    });
-</script>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css
index ffcc7a2dae..3b5cc467fc 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css
@@ -10,3 +10,27 @@ body {
     text-decoration: none;
     color: #fff;
 }
+
+/* Main Menu */
+
+.navbar .dropdown-submenu {
+    position: relative;
+}
+
+    .navbar .dropdown-submenu a {
+        padding: 0.25rem 1.4rem;
+    }
+
+        .navbar .dropdown-submenu a::after {
+            transform: rotate(-90deg);
+            position: absolute;
+            right: 16px;
+            top: 18px;
+        }
+
+    .navbar .dropdown-submenu .dropdown-menu {
+        top: 0;
+        left: 100%;
+        margin-left: .1rem;
+        margin-right: .1rem;
+    }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.js
new file mode 100644
index 0000000000..8a5b94c7c6
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.js
@@ -0,0 +1,16 @@
+$(function () {
+    $('.dropdown-menu a.dropdown-toggle').on('click', function (e) {
+        if (!$(this).next().hasClass('show')) {
+            $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
+        }
+
+        var $subMenu = $(this).next(".dropdown-menu");
+        $subMenu.toggleClass('show');
+
+        $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function (e) {
+            $('.dropdown-submenu .show').removeClass("show");
+        });
+
+        return false;
+    });
+});
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
index 0f15bd6906..22581401be 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@@ -31,12 +31,6 @@ namespace Volo.Abp.Identity.Web.Navigation
             {
                 identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/Identity/Users"));
             }
-
-            var identityMenuItem2 = new ApplicationMenuItem("asdasd", "Dropdown", icon: "fa fa-id-card-o");
-            identityMenuItem2.AddItem(new ApplicationMenuItem("qweqew", "Link 2", url: "/Identity/Users"));
-            identityMenuItem2.AddItem(new ApplicationMenuItem("qweqeww", "Link 1", url: "/Identity/Roles"));
-
-            identityMenuItem.AddItem(identityMenuItem2);
         }
     }
 }
\ No newline at end of file