diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index 80a1792d..a03282c9 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -303,7 +303,6 @@ - diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css index 8733915c..907bbf46 100644 --- a/Bootstrap.Admin/Content/css/site.css +++ b/Bootstrap.Admin/Content/css/site.css @@ -514,10 +514,6 @@ a, a:hover, a:focus { margin-bottom: 14px; } - .dropdown-menu.menu .menu-submenu li p.active { - color: #FF6C60; - } - .dropdown-menu.menu .menu-submenu li a { margin-bottom: 15px; display: inline-block; @@ -525,12 +521,12 @@ a, a:hover, a:focus { font-size: 13px; } - .dropdown-menu.menu .menu-submenu li a.active { - color: #FF6C60; + .dropdown-menu.menu .menu-submenu li a.active, .dropdown-menu.menu .menu-submenu li p.active { + color: #0376d8; } .dropdown-menu.menu .menu-submenu li a:hover { - color: #FF6C60; + color: #2e6da4; } .dropdown-menu.menu .menu-submenu li a i { diff --git a/Bootstrap.Admin/Scripts/Content.js b/Bootstrap.Admin/Scripts/Content.js index a862f746..e3d37df5 100644 --- a/Bootstrap.Admin/Scripts/Content.js +++ b/Bootstrap.Admin/Scripts/Content.js @@ -1,6 +1,5 @@ $(function () { $('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle'); - function iframeResposive() { try { var fra = $('iframe').get(0); @@ -12,13 +11,22 @@ $(window).on('load', iframeResposive); $(window).on('resize', iframeResposive); - $('.menu-submenu a').click(function (event) { - var act = $(this).attr("data-act"); + var $subMenu = $('#submenu'); + $subMenu.on('click', 'a', function (event) { + var $this = $(this); + var act = $this.attr("data-act"); if (act === "True") return true; event.preventDefault(); - $('.menu-submenu a, .menu-submenu p').removeClass('active'); - $(this).addClass('active'); - $(this).parents("ul").first().find('p').addClass('active'); - $('iframe').attr('src', $(this).attr('href')); + $subMenu.find('p, a').removeClass('active'); + setActive($this); + $('iframe').attr('src', $this.attr('href')); }); + $subMenu.find('a').each(function (index, ele) { + var $this = $(this); + if ($this.attr('href') == window.location.pathname) setActive($this); + }); + function setActive(ele) { + ele.addClass('active'); + ele.parents("ul").first().find('p').addClass('active'); + } }); \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Home/Index.cshtml b/Bootstrap.Admin/Views/Home/Index.cshtml index 4227683a..4cef9b0e 100644 --- a/Bootstrap.Admin/Views/Home/Index.cshtml +++ b/Bootstrap.Admin/Views/Home/Index.cshtml @@ -8,4 +8,6 @@ @section header { @Html.Partial("Header", Model) } -@Html.Partial("Content", Model) \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/Bootstrap.Admin/Views/Shared/Content.cshtml b/Bootstrap.Admin/Views/Shared/Content.cshtml deleted file mode 100644 index c4551d53..00000000 --- a/Bootstrap.Admin/Views/Shared/Content.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@model ContentModel -
- -
diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/Bootstrap.Admin/Views/Shared/Header.cshtml index f66ce9c6..15cb3c1d 100644 --- a/Bootstrap.Admin/Views/Shared/Header.cshtml +++ b/Bootstrap.Admin/Views/Shared/Header.cshtml @@ -9,10 +9,10 @@ @if (Model.Menus.Count() > 0 && Model.ShowMenu) { -