From 73ee5fdd8e223f574c5d6b95887c2046125bd3b9 Mon Sep 17 00:00:00 2001 From: Dennis Aaen Date: Tue, 11 Aug 2015 13:30:20 +0200 Subject: [PATCH] Our-316: Fix make it easier to follow a forum thread --- .../src/scss/elements/_utilities.scss | 8 +++ .../Views/MacroPartials/Forum/Thread.cshtml | 54 +++++++++++++++++-- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/OurUmbraco.Client/src/scss/elements/_utilities.scss b/OurUmbraco.Client/src/scss/elements/_utilities.scss index cd9128e2..59053ac6 100644 --- a/OurUmbraco.Client/src/scss/elements/_utilities.scss +++ b/OurUmbraco.Client/src/scss/elements/_utilities.scss @@ -53,6 +53,14 @@ } } + .utility-actions.thread-bottom { + @media (min-width: $md) { + margin: 0 0 0 auto; + + } + } + + .container { padding: 0; diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml index 2eaaff08..cb663aa2 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml @@ -1,6 +1,7 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage -@using System.Web.Mvc.Html +@using System.Web.Mvc.Html @using OurUmbraco.Forum.Services +@using OurUmbraco.Forum.Extensions @{ var topicService = new TopicService(ApplicationContext.DatabaseContext); @@ -64,10 +65,53 @@ } } } - - - if (Members.IsLoggedIn()) - { + + + if (Members.IsLoggedIn()) + { + +
+
+ + @if (Members.IsLoggedIn()) + { + var mem = Members.GetCurrentMember(); + var subscribed = false; + if (mem != null) + { + subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id); + } + + if (Members.IsAdmin()) + { + + Delete thread + + } + + if (subscribed) + { + + } + else + { + + } + } + + @if (topic.Answer > 0) + { + + Go to solution + + } + +
+
Reply to topic