Skip to content

Commit 058e899

Browse files
rxturrxtur
committed
Tweaks to sidebar and sitemap
1 parent 72c21bb commit 058e899

7 files changed

Lines changed: 29 additions & 30 deletions

File tree

‎BlogEngine/BlogEngine.NET/Web.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<appSettings>
2222
<!-- Override default application settings here -->
2323
<!-- Configure blog for a use by single user removing multi-site features -->
24-
<add key="BlogEngine.SingleUserBlog" value="true" />
24+
<add key="BlogEngine.SingleUserBlog" value="false" />
2525
</appSettings>
2626
<system.serviceModel>
2727
<services>

‎BlogEngine/BlogEngine.NET/Web.sitemap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" >
33
<siteMapNode url="default.aspx" title="Blog Engine" description="">
44
<siteMapNode url="~/admin/index.cshtml" title="dashboard" description="" rights="ViewDashboard" />
5-
<siteMapNode url="~/admin/#/content" title="content" description="" rightsAuthorizationCheck="HasAny" rights="CreateNewPosts, EditOwnPosts, EditOtherUsersPosts, PublishOwnPosts, PublishOtherUsersPosts" />
6-
<siteMapNode url="~/admin/#/custom" title="custom" description="" rightsAuthorizationCheck="HasAny" rights="ManageExtensions, ManageWidgets, ManageThemes, ManagePackages" />
7-
<siteMapNode url="~/admin/#/settings" title="settings" rights="AccessAdminSettingsPages" description="" />
5+
<siteMapNode url="~/admin/#/content/posts" title="content" description="" rightsAuthorizationCheck="HasAny" rights="CreateNewPosts, EditOwnPosts, EditOtherUsersPosts, PublishOwnPosts, PublishOtherUsersPosts" />
6+
<siteMapNode url="~/admin/#/custom/extensions" title="custom" description="" rightsAuthorizationCheck="HasAny" rights="ManageExtensions, ManageWidgets, ManageThemes, ManagePackages" />
7+
<siteMapNode url="~/admin/#/settings/basic" title="settings" rights="AccessAdminSettingsPages" description="" />
88
</siteMapNode>
99
</siteMap>

‎BlogEngine/BlogEngine.NET/admin/app.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
$routeProvider
66
.when("/", { templateUrl: "views/dashboard.html" })
77

8-
.when("/content", { templateUrl: "views/content/posts.html" })
8+
.when("/content/posts", { templateUrl: "views/content/posts.html" })
99
.when("/content/blogs", { templateUrl: "views/content/blogs.html" })
1010
.when("/content/comments", { templateUrl: "views/content/comments.html" })
1111
.when("/content/pages", { templateUrl: "views/content/pages.html" })
1212
.when("/content/categories", { templateUrl: "views/content/categories.html" })
1313
.when("/content/tags", { templateUrl: "views/content/tags.html" })
1414
.when("/content/filters", { templateUrl: "views/content/filters.html" })
1515

16-
.when("/custom", { templateUrl: "views/custom/index.html" })
16+
.when("/custom/extensions", { templateUrl: "views/custom/index.html" })
1717
.when("/custom/themes", { templateUrl: "views/custom/themes.html" })
1818
.when("/custom/widgets", { templateUrl: "views/custom/widgets.html" })
1919
.when("/shared/package", { templateUrl: "views/shared/package.html" })
2020

21-
.when("/security", { templateUrl: "views/security/profile.html" })
21+
.when("/security/profile", { templateUrl: "views/security/profile.html" })
2222
.when("/security/roles", { templateUrl: "views/security/roles.html" })
2323
.when("/security/users", { templateUrl: "views/security/users.html" })
2424

25-
.when("/settings", { templateUrl: "views/settings/basic.html" })
25+
.when("/settings/basic", { templateUrl: "views/settings/basic.html" })
2626
.when("/settings/feed", { templateUrl: "views/settings/feed.html" })
2727
.when("/settings/email", { templateUrl: "views/settings/email.html" })
2828
.when("/settings/comments", { templateUrl: "views/settings/comments.html" })

‎BlogEngine/BlogEngine.NET/admin/app/controllers/common.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
angular.module('blogAdmin').controller('NavController', ["$scope", "$location", "$rootScope", function ($scope, $location, $rootScope) {
2-
$scope.isActive = function (viewLocation) {
3-
return viewLocation === $location.path() || $location.path().startsWith(viewLocation + "/");
4-
};
52
$scope.IsPrimary = $rootScope.SiteVars.IsPrimary;
63
$scope.security = $rootScope.security;
74
$scope.UserVars = UserVars;
85

6+
$scope.isActive = function (viewLocation) {
7+
return viewLocation === $location.path() || $location.path().startsWith(viewLocation + "/");
8+
};
99
$(".nav-primary > li").removeClass("active");
1010

11-
if ($location.path().indexOf("blogs") > -1) {
12-
$("#mu-blogs").addClass("active");
13-
}
14-
else if ($location.path().indexOf("content") > -1) {
11+
if ($location.path().indexOf("content") > -1) {
1512
$("#mu-content").addClass("active");
1613
}
1714
else if ($location.path().indexOf("custom") > -1) {
@@ -29,14 +26,16 @@
2926
else {
3027
$("#mu-dashboard").addClass("active");
3128
}
32-
if ($location.$$absUrl.indexOf("editpost.cshtml") > -1 || $location.$$absUrl.indexOf("editpage.cshtml") > -1) {
33-
$(".nav-primary > li").removeClass("active");
34-
$("#mu-content").addClass("active");
35-
}
29+
3630
$(".nav-primary > li > a").click(function () {
3731
$(".nav-primary > li").removeClass("active");
3832
$(this).parent().addClass("active");
3933
});
34+
35+
if ($location.$$absUrl.indexOf("editpost.cshtml") > -1 || $location.$$absUrl.indexOf("editpage.cshtml") > -1) {
36+
$(".nav-primary > li").removeClass("active");
37+
$("#mu-content").addClass("active");
38+
}
4039
}]);
4140

4241
if (typeof String.prototype.startsWith != 'function') {

‎BlogEngine/BlogEngine.NET/admin/menu.ascx.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var adminNode in root.ChildNodes.Cast<SiteMapNode>().Where(
9898

9999
if (Security.IsAuthenticated)
100100
{
101-
AddItem(labels.myProfile, string.Format("{0}admin/#/security", Utils.RelativeWebRoot));
101+
AddItem(labels.myProfile, string.Format("{0}admin/#/security/profile", Utils.RelativeWebRoot));
102102
AddItem(labels.changePassword, string.Format("{0}Account/change-password.aspx", Utils.RelativeWebRoot));
103103
}
104104
}

‎BlogEngine/BlogEngine.NET/admin/themes/standard/layout.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<div class="user-nav">
4242
<img src="http://www.gravatar.com/avatar/c892488508c53d9f039aca7d02afa7b2.jpg?d=identicon" />
4343
<ul>
44-
<li><a href="~/admin/#/security"><i class="fa fa-user"></i> Profile</a></li>
44+
<li><a href="~/admin/#/security/profile"><i class="fa fa-user"></i> Profile</a></li>
4545
<li><a href="~/Account/login.aspx?logoff"><i class="fa fa-sign-out"></i> Sign Out</a></li>
4646
</ul>
4747
</div>

‎BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</li>
1717
<li id="mu-content" class="hasul">
1818
<i class="fa fa-align-justify"></i>
19-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content"><span>@Resources.labels.content</span></a>
19+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/posts"><span>@Resources.labels.content</span></a>
2020
<ul>
21-
<li data-ng-class="{ active: isActive('/content')}">
22-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content">@Resources.labels.posts</a></li>
21+
<li data-ng-class="{ active: isActive('/content/posts')}">
22+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/posts">@Resources.labels.posts</a></li>
2323
@if (BlogSettings.Instance.CommentProvider == BlogSettings.CommentsBy.BlogEngine)
2424
{
2525
<li data-ng-class="{ active: isActive('/content/comments')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments">@Resources.labels.comments</a></li>
@@ -35,18 +35,18 @@
3535
</li>
3636
<li id="mu-custom" class="hasul">
3737
<i class="fa fa-sliders"></i>
38-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/custom"><span>@Resources.labels.custom</span></a>
38+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/custom/extensions"><span>@Resources.labels.custom</span></a>
3939
<ul>
40-
<li data-ng-class="{ active: isActive('/custom')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/custom">@Resources.labels.extensions</a></li>
40+
<li data-ng-class="{ active: isActive('/custom/extensions')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/extensions">@Resources.labels.extensions</a></li>
4141
<li data-ng-class="{ active: isActive('/custom/themes')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/themes">@Resources.labels.themes</a></li>
4242
<li data-ng-class="{ active: isActive('/custom/widgets')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/widgets">@Resources.labels.widgets</a></li>
4343
</ul>
4444
</li>
4545
<li id="mu-users" class="hasul">
4646
<i class="fa fa-user"></i>
47-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/security"><span>@Resources.labels.users</span></a>
47+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/security/profile"><span>@Resources.labels.users</span></a>
4848
<ul>
49-
<li data-ng-class="{ active: isActive('/security')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/security">@Resources.labels.profile</a></li>
49+
<li data-ng-class="{ active: isActive('/security/profile')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/security/profile">@Resources.labels.profile</a></li>
5050
@if (!BlogConfig.SingleUserBlog)
5151
{
5252
<li data-ng-class="{ active: isActive('/security/roles')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/security/roles">@Resources.labels.roles</a></li>
@@ -56,9 +56,9 @@
5656
</li>
5757
<li id="mu-settings" class="hasul">
5858
<i class="fa fa-cog"></i>
59-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/settings"><span>@Resources.labels.settings</span></a>
59+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/settings/basic"><span>@Resources.labels.settings</span></a>
6060
<ul>
61-
<li data-ng-class="{ active: isActive('/settings')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/settings">@Resources.labels.basic</a></li>
61+
<li data-ng-class="{ active: isActive('/settings/basic')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/settings/basic">@Resources.labels.basic</a></li>
6262
<li data-ng-class="{ active: isActive('/settings/email')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/settings/email">@Resources.labels.email</a></li>
6363
<li data-ng-class="{ active: isActive('/settings/feed')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/settings/feed">@Resources.labels.feed</a></li>
6464
<li data-ng-class="{ active: isActive('/settings/comments')}"><a class="ng-binding" href="{{SiteVars.RelativeWebRoot}}admin/#/settings/comments">@Resources.labels.comments</a></li>

0 commit comments

Comments
 (0)