Merge branch 'OUR-316' of https://github.com/Aaen/OurUmbraco into Aaen-OUR-316

Conflicts: OurUmbraco.Site/Views/MacroPartials/Forum/Thread.cshtml
2015-10-30 11:23:48 +01:00
parent e102c32752 73ee5fdd8e
commit cc015f7dbf
2 changed files with 52 additions and 1 deletions
@@ -53,6 +53,14 @@
 		}
 	}

+   .utility-actions.thread-bottom {
+        @media (min-width: $md) {
+			margin: 0 0 0 auto;
+            
+		}
+    }
+
+
 	.container {
 		padding: 0;

@@ -2,6 +2,7 @@
@using System.Web.Mvc.Html
@using OurUmbraco.Forum.Extensions
@using OurUmbraco.Forum.Services
+@using OurUmbraco.Forum.Extensions

@{
    var topicService = new TopicService(ApplicationContext.DatabaseContext);
@@ -84,7 +85,49 @@
    if (Members.IsLoggedIn())
    {
        if (Model.Content.NewTopicsAllowed())
-        {
+	{
+        <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>