Skip to content

Commit 0b3600e

Browse files
rxturrxtur
committed
Profile image in admin sidebar, labels to use "new" for consistency
1 parent 9c8dd8a commit 0b3600e

13 files changed

Lines changed: 46 additions & 23 deletions

File tree

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.3.6")]
22+
[assembly: AssemblyVersion("3.1.3.7")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Web/BlogCulture.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ void AddJavaScriptResources()
555555
AddResource("moveWidgetTo");
556556
AddResource("myProfile");
557557
AddResource("name");
558+
AddResource("theNew");
558559
AddResource("never");
559560
AddResource("newAndConfirmPasswordMismatch");
560561
AddResource("newCategory");

‎BlogEngine/BlogEngine.NET/App_Data/labels.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@ theComment
665665
theme
666666
themeCookieName
667667
themes
668+
theNew
668669
thePost
669670
thereAreXDrafts
670671
theValuesSaved

‎BlogEngine/BlogEngine.NET/App_GlobalResources/labels.designer.cs‎

Lines changed: 26 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2543,4 +2543,7 @@
25432543
<data name="userNewsletter" xml:space="preserve">
25442544
<value>Members</value>
25452545
</data>
2546+
<data name="theNew" xml:space="preserve">
2547+
<value>New</value>
2548+
</data>
25462549
</root>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
@using BlogEngine.Core
2-
@using BlogEngine.Core.Data.Services
32
@{
43
var name = Security.CurrentUser.Identity.Name;
5-
var email = Membership.Provider.GetUser(name, true).Email;
6-
var profile = AuthorProfile.GetProfile(name);
4+
var src = Utils.ApplicationRelativeWebRoot + "Content/images/blog/noavatar.jpg";
5+
var displayName = "Anonymous";
76

8-
var src = profile.PhotoUrl;
9-
if (string.IsNullOrEmpty(src))
7+
var profile = AuthorProfile.GetProfile(name);
8+
if (profile != null && !string.IsNullOrEmpty(profile.PhotoUrl))
109
{
11-
src = Avatar.GetSrc(email);
10+
src = profile.PhotoUrl;
11+
displayName = profile.DisplayName;
1212
}
1313
}
1414
<div class="user-nav">
1515
<img src="@src" />
1616
<div class="user-nav-info">
17-
<div class="user-nav-name"><a href="~/admin/#/security/profile">@profile.DisplayName</a></div>
17+
<div class="user-nav-name"><a href="~/admin/#/security/profile">@displayName</a></div>
1818
<ul class="user-nav-options">
1919
<li><a href="~/" target="_blank"><i class="fa fa-globe"></i> View Blog</a></li>
2020
<li><a href="~/Account/login.aspx?logoff"><i class="fa fa-sign-out"></i> Sign Out</a></li>

‎BlogEngine/BlogEngine.NET/admin/views/content/categories.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2 class="page-title pull-left">
3636
<a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
3737
{{lbl.categories}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
3838
</h2>
39-
<a data-ng-click="addNew()" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</a>
39+
<a data-ng-click="addNew()" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
4040
<div class="btn-group befdv pull-left">
4141
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" angular-tooltip tooltip="lbl.doDelete" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i></a>
4242
</div>

‎BlogEngine/BlogEngine.NET/admin/views/content/pages.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
44
{{lbl.pages}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
55
</h2>
6-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpage.cshtml" class="btn btn-hasicon btn-sm btn-success pull-left"><i class="fa fa-plus"></i>Add</a>
6+
<a href="{{SiteVars.RelativeWebRoot}}admin/editpage.cshtml" class="btn btn-hasicon btn-sm btn-success pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
77
<div class="btn-group befdv pull-left">
88
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
99
<a ng-click="processChecked('unpublish')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-warning" angular-tooltip tooltip="lbl.unpublish"><i class="fa fa-archive"></i></a>

‎BlogEngine/BlogEngine.NET/admin/views/content/posts.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2 class="page-title pull-left">
66
<a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
77
{{lbl.posts}}
88
</h2>
9-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpost.cshtml" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</a>
9+
<a href="{{SiteVars.RelativeWebRoot}}admin/editpost.cshtml" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
1010
<div class="btn-group befdv pull-left">
1111
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
1212
<a ng-click="processChecked('unpublish')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-warning" angular-tooltip tooltip="lbl.unpublish"><i class="fa fa-archive"></i></a>

‎BlogEngine/BlogEngine.NET/admin/views/custom/plugins.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h2 class="page-title pull-left">
7676
<a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
7777
Plugins <i ng-if="spin" class="fa fa-spinner fa-spin"></i>
7878
</h2>
79-
<a ng-if="IsPrimary" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/gallery?ftr=plugin" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</a>
79+
<a ng-if="IsPrimary" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/gallery?ftr=plugin" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
8080
<div ng-if="IsPrimary" class="btn-group befdv pull-left">
8181
<a ng-click="processChecked('uninstall')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
8282
<a ng-click="processChecked('disable')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-warning" angular-tooltip tooltip="lbl.disable"><i class="fa fa-close"></i></a>

0 commit comments

Comments
 (0)