diff --git a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml index 13eb87b6..fd5476dc 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml @@ -14,18 +14,22 @@ @if (showNotification) { -
+
@Html.Raw(notificationText)
} - -@* - @if (Request.Cookies["dismissAvatar"] == null && CurrentPage.Id != home.Id && avatarImage != null && (avatarImage.Width < 400 || avatarImage.Height < 400)) - { -
- Your profile image is a little on the small side, it would look
- much nicer if you could update it to be at least 400x400pixels!
- Neh, I like my blurry avatar, stop notifying me please. + +@if (Request.Cookies["dismissAvatar"] == null && CurrentPage.Id != home.Id && avatarImage != null && (avatarImage.Width < 400 || avatarImage.Height < 400)) +{ +
+
+

+ Your profile picture is a little on the small side, it would look much nicer if you could update it to be larger image. +

- } -*@ \ No newline at end of file +
+ Neh, I like my blurry avatar! +
+ +
+} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml index b2adbc9b..5d4f7c5f 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml @@ -1,9 +1,15 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage +@using System.Drawing +@using our @using uForum @using uForum.Services @{ - var topicService = new TopicService(ApplicationContext.DatabaseContext); + Image avatarImage = null; + if (Members.IsLoggedIn()) + { + avatarImage = Utils.GetMemberAvatarImage(Members.GetCurrentMember()); + } }
@@ -63,7 +69,24 @@
+ if (avatarImage != null && (avatarImage.Width < 400 || avatarImage.Height < 400)) + { + Notifications + +
+
+
+

Your profile picture is a little on the small side.

+

+ It would look much nicer if you could update it to be larger image. +

+
+
+
+
+ } + Activity in threads you participated in @@ -83,14 +106,14 @@

@topic.Title

@{ - if (topic.Replies != 0 && !string.IsNullOrEmpty(topic.LastReplyAuthorName)) - { - last edited by @topic.LastReplyAuthorName - } - else - { - created by @topic.AuthorName - } + if (topic.Replies != 0 && !string.IsNullOrEmpty(topic.LastReplyAuthorName)) + { + last edited by @topic.LastReplyAuthorName + } + else + { + created by @topic.AuthorName + } } @topic.Updated.ConvertToRelativeTime()

diff --git a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml index cf075464..7bfb3cbd 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml @@ -1,8 +1,15 @@ +@using System.Drawing +@using our @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ @* Get the root of the website *@ var root = CurrentPage.AncestorOrSelf(1); + Image avatarImage = null; + if (Members.IsLoggedIn()) + { + avatarImage = Utils.GetMemberAvatarImage(Members.GetCurrentMember()); + } }