From 73ee5fdd8e223f574c5d6b95887c2046125bd3b9 Mon Sep 17 00:00:00 2001
From: Dennis Aaen <denaaen@gmail.com>
Date: Tue, 11 Aug 2015 13:30:20 +0200
Subject: [PATCH 1/2] 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 @@
 				}
 			}
 		}
-	</ul>
-
-	if (Members.IsLoggedIn())
-	{
+	</ul>
+
+    if (Members.IsLoggedIn())
+    {
+
+        <div class="utilities">
+            <div class="utility-actions thread-bottom">
+
+                @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())
+                    {
+                        <a href="#" class="delete-thread button" data-id="@topic.Id">
+                            <i class="icon-Delete-key"></i><span>Delete thread</span>
+                        </a>
+                    }
+
+                    if (subscribed)
+                    {
+                        <a href="#" class="follow button following" data-id="@topic.Id" data-controller="topic">
+                            <i class="icon-Bookmark"></i><span>Following</span>
+                        </a>
+                    }
+                    else
+                    {
+                        <a href="#" class="follow button transparent" data-id="@topic.Id" data-controller="topic">
+                            <i class="icon-Bookmark"></i><span>Follow</span>
+                        </a>
+                    }
+                }
+
+                @if (topic.Answer > 0)
+                {
+                    <a href="#comment-@topic.Answer.ToString()" class="go-to-solution button transparent">
+                        <i class="icon-Check"></i><span>Go to solution</span>
+                    </a>
+                }
+
+            </div>
+        </div>
 		<div class="replybutton">
 			<a href="#" class="button green large reply forum-reply" data-author="@topic.AuthorName" data-topic="@topic.Id" data-controller="comment">Reply to topic</a>
 		</div>

From 15c7ae9d5f21b8679fabe6401267bdac1b818db5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 30 Oct 2015 11:24:00 +0100
Subject: [PATCH 2/2] Formatting

---
 .../Views/MacroPartials/Forum/Thread.cshtml   | 87 +++++++++----------
 1 file changed, 43 insertions(+), 44 deletions(-)

diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml
index a2a54f45..264989ca 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml
@@ -2,7 +2,6 @@
 @using System.Web.Mvc.Html
 @using OurUmbraco.Forum.Extensions
 @using OurUmbraco.Forum.Services
-@using OurUmbraco.Forum.Extensions
 
 @{
     var topicService = new TopicService(ApplicationContext.DatabaseContext);
@@ -68,7 +67,7 @@
         {
             var comm = comment;
 
-            Html.RenderPartial("forum/comment", comm, new ViewDataDictionary {{"level", 1}, {"answer", topic.Answer}});
+            Html.RenderPartial("forum/comment", comm, new ViewDataDictionary { { "level", 1 }, { "answer", topic.Answer } });
 
             if (comm.HasChildren)
             {
@@ -76,7 +75,7 @@
 
                 foreach (var child in children.Where(c => c.ParentCommentId == comm.Id))
                 {
-                    Html.RenderPartial("forum/comment", child, new ViewDataDictionary {{"level", 2}, {"answer", topic.Answer}});
+                    Html.RenderPartial("forum/comment", child, new ViewDataDictionary { { "level", 2 }, { "answer", topic.Answer } });
                 }
             }
         }
@@ -85,49 +84,49 @@
     if (Members.IsLoggedIn())
     {
         if (Model.Content.NewTopicsAllowed())
-	{
-        <div class="utilities">
-            <div class="utility-actions thread-bottom">
+        {
+            <div class="utilities">
+                <div class="utility-actions thread-bottom">
 
-                @if (Members.IsLoggedIn())
-        	{
-                    var mem = Members.GetCurrentMember();
-                    var subscribed = false;
-                    if (mem != null)
+                    @if (Members.IsLoggedIn())
                     {
-                        subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id);
+                        var mem = Members.GetCurrentMember();
+                        var subscribed = false;
+                        if (mem != null)
+                        {
+                            subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id);
+                        }
+
+                        if (Members.IsAdmin())
+                        {
+                            <a href="#" class="delete-thread button" data-id="@topic.Id">
+                                <i class="icon-Delete-key"></i><span>Delete thread</span>
+                            </a>
+                        }
+
+                        if (subscribed)
+                        {
+                            <a href="#" class="follow button following" data-id="@topic.Id" data-controller="topic">
+                                <i class="icon-Bookmark"></i><span>Following</span>
+                            </a>
+                        }
+                        else
+                        {
+                            <a href="#" class="follow button transparent" data-id="@topic.Id" data-controller="topic">
+                                <i class="icon-Bookmark"></i><span>Follow</span>
+                            </a>
+                        }
                     }
 
-                    if (Members.IsAdmin())
+                    @if (topic.Answer > 0)
                     {
-                        <a href="#" class="delete-thread button" data-id="@topic.Id">
-                            <i class="icon-Delete-key"></i><span>Delete thread</span>
+                        <a href="#comment-@topic.Answer.ToString()" class="go-to-solution button transparent">
+                            <i class="icon-Check"></i><span>Go to solution</span>
                         </a>
                     }
 
-                    if (subscribed)
-                    {
-                        <a href="#" class="follow button following" data-id="@topic.Id" data-controller="topic">
-                            <i class="icon-Bookmark"></i><span>Following</span>
-                        </a>
-                    }
-                    else
-                    {
-                        <a href="#" class="follow button transparent" data-id="@topic.Id" data-controller="topic">
-                            <i class="icon-Bookmark"></i><span>Follow</span>
-                        </a>
-                    }
-                }
-
-                @if (topic.Answer > 0)
-                {
-                    <a href="#comment-@topic.Answer.ToString()" class="go-to-solution button transparent">
-                        <i class="icon-Check"></i><span>Go to solution</span>
-                    </a>
-                }
-
+                </div>
             </div>
-        </div>
             <div class="replybutton">
                 <a href="#" class="button green large reply forum-reply" data-author="@topic.AuthorName" data-topic="@topic.Id" data-controller="comment">Reply to topic</a>
             </div>
@@ -141,12 +140,12 @@
     }
     else
     {
-		<div class="replybutton notloggedin">
-			Please <a href="/member/login?redirectUrl=@(Server.UrlEncode(Request.Url.AbsoluteUri))">Sign in</a> or <a href="/member/signup">register</a> to post replies
-		</div>
-	}
-} 
-else 
+        <div class="replybutton notloggedin">
+            Please <a href="/member/login?redirectUrl=@(Server.UrlEncode(Request.Url.AbsoluteUri))">Sign in</a> or <a href="/member/signup">register</a> to post replies
+        </div>
+    }
+}
+else
 {
-	<p>This topic no longer exists.</p>
+    <p>This topic no longer exists.</p>
 }
\ No newline at end of file