Profile image in admin sidebar, labels to use "new" for consistency

Author: rxtur

BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs

@@ -19,5 +19,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 [assembly: AllowPartiallyTrustedCallers]
-[assembly: AssemblyVersion("3.1.3.6")]
+[assembly: AssemblyVersion("3.1.3.7")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]

BlogEngine/BlogEngine.Core/Web/BlogCulture.cs

@@ -555,6 +555,7 @@ void AddJavaScriptResources()
             AddResource("moveWidgetTo");
             AddResource("myProfile");
             AddResource("name");
+            AddResource("theNew");
             AddResource("never");
             AddResource("newAndConfirmPasswordMismatch");
             AddResource("newCategory");

BlogEngine/BlogEngine.NET/App_Data/labels.txt

@@ -665,6 +665,7 @@ theComment
 theme
 themeCookieName
 themes
+theNew
 thePost
 thereAreXDrafts
 theValuesSaved

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

@@ -2543,4 +2543,7 @@
   <data name="userNewsletter" xml:space="preserve">
     <value>Members</value>
   </data>
+  <data name="theNew" xml:space="preserve">
+    <value>New</value>
+  </data>
 </root>

BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx

@@ -1,20 +1,20 @@
 @using BlogEngine.Core
-@using BlogEngine.Core.Data.Services
 @{
     var name = Security.CurrentUser.Identity.Name;
-    var email = Membership.Provider.GetUser(name, true).Email;
-    var profile = AuthorProfile.GetProfile(name);
+    var src = Utils.ApplicationRelativeWebRoot + "Content/images/blog/noavatar.jpg";
+    var displayName = "Anonymous";
 
-    var src = profile.PhotoUrl;
-    if (string.IsNullOrEmpty(src))
+    var profile = AuthorProfile.GetProfile(name);
+    if (profile != null && !string.IsNullOrEmpty(profile.PhotoUrl))
     {
-        src = Avatar.GetSrc(email);
+        src = profile.PhotoUrl;
+        displayName = profile.DisplayName;
     }
 }
 <div class="user-nav">
     <img src="@src" />
     <div class="user-nav-info">
-        <div class="user-nav-name"><a href="~/admin/#/security/profile">@profile.DisplayName</a></div>
+        <div class="user-nav-name"><a href="~/admin/#/security/profile">@displayName</a></div>
         <ul class="user-nav-options">
             <li><a href="~/" target="_blank"><i class="fa fa-globe"></i> View Blog</a></li>
             <li><a href="~/Account/login.aspx?logoff"><i class="fa fa-sign-out"></i> Sign Out</a></li>

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

@@ -36,7 +36,7 @@ <h2 class="page-title pull-left">
             <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
             {{lbl.categories}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
         </h2>
-        <a data-ng-click="addNew()" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</a>
+        <a data-ng-click="addNew()" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
         <div class="btn-group befdv pull-left">
             <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>
         </div>

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

@@ -3,7 +3,7 @@
         <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
             {{lbl.pages}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
         </h2>
-        <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>
+        <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>
         <div class="btn-group befdv pull-left">
             <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>
             <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/pages.html

@@ -6,7 +6,7 @@ <h2 class="page-title pull-left">
             <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
             {{lbl.posts}}
         </h2>
-        <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>
+        <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>
         <div class="btn-group befdv pull-left">
             <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>
             <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

@@ -76,7 +76,7 @@ <h2 class="page-title pull-left">
             <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
             Plugins <i ng-if="spin" class="fa fa-spinner fa-spin"></i>
         </h2>
-        <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>
+        <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>
         <div ng-if="IsPrimary" class="btn-group befdv pull-left">
             <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>
             <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>

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

@@ -80,7 +80,7 @@ <h2 class="page-title pull-left">
             <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
             {{lbl.themes}} <i ng-if="spin" class="fa fa-spinner fa-spin"></i>
         </h2>
-        <a ng-if="IsPrimary" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/gallery?ftr=theme" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>Add from Gallery</a>
+        <a ng-if="IsPrimary" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/gallery?ftr=theme" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
         <div ng-if="IsPrimary" class="btn-group befdv pull-left">
             <button ng-click="processChecked('uninstall')" ng-disabled="itemsChecked() === false" angular-tooltip tooltip="lbl.doDelete" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></button>
         </div>

BlogEngine/BlogEngine.NET/admin/views/custom/themes.html

@@ -33,7 +33,7 @@ <h2 class="page-title pull-left">
                 <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
                 {{lbl.roles}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
             </h2>
-            <button data-ng-click="loadRightsForm()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-plus"></i>{{lbl.createRole}}</button>
+            <button data-ng-click="loadRightsForm()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-plus"></i>{{lbl.theNew}}</button>
             <div class="btn-group pull-left">
                 <button data-ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i></button>
             </div>

BlogEngine/BlogEngine.NET/admin/views/security/roles.html

@@ -47,7 +47,7 @@ <h2 class="page-title pull-left">
                 <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
                 {{lbl.users}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
             </h2>
-            <button data-ng-click="loadEditForm()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-plus"></i>{{lbl.createUser}}</button>
+            <button data-ng-click="loadEditForm()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-plus"></i>{{lbl.theNew}}</button>
             <div class="btn-group pull-left">
                 <button data-ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" title="{{lbl.doDelete}}"><i class="fa fa-trash"></i></button>
             </div>