flair is now only shown when viewing the actual subverse where submis…

…sion with flair attached is posted (#102)
voat · Jul 24, 2014 · 8b8ce7f · 8b8ce7f
1 parent ba79a8e
commit 8b8ce7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Whoaverse/Whoaverse/Views/Shared/_SubmissionLink.cshtml b/Whoaverse/Whoaverse/Views/Shared/_SubmissionLink.cshtml
@@ -16,17 +16,17 @@
 
 @{
     string ahrefTarget = "_self";
-    
+
     if (User.Identity.IsAuthenticated)
     {
         if (Whoaverse.Utils.User.LinksInNewWindow(User.Identity.Name))
         {
             ahrefTarget = "_blank";
-        }        
-    }    
-    
+        }
+    }
+
     var commentCount = Model.Comments.Where(c => c.Name != "deleted").Count();
-    
+
     bool ratedAdult = false;
     if (Model.Subverses != null)
     {
@@ -41,7 +41,7 @@
     string commentsUrl = "/v/" + Model.Subverse + "/comments/" + Model.Id;
 
     DateTime submissionDate = Model.Date;
-    string postAge = Submissions.CalcSubmissionAge(submissionDate);
+    string postAge = Submissions.CalcSubmissionAge(submissionDate);    
 
     //type 2 = urls
     if (Model.Type == 2)
@@ -91,7 +91,10 @@
             <p class="title">
                 @if (Model.FlairLabel != null && Model.FlairCss != null)
                 {
-                    <span class="@Model.FlairCss" title="@Model.FlairLabel">@Model.FlairLabel</span>
+                    if (routeActiveSubverse != "" && routeActiveSubverse != "all" && routeActiveSubverse != null)
+                    {
+                        <span class="@Model.FlairCss" title="@Model.FlairLabel">@Model.FlairLabel</span>
+                    }                    
                 }
                 <a class="title may-blank " href="@Model.MessageContent" tabindex="1" title="@Model.Linkdescription" target="@ahrefTarget">@Model.Linkdescription</a>
                 <span class="domain">(<a href="/domains/@submissionDomain/">@submissionDomain</a>)</span>

diff --git a/Whoaverse/Whoaverse/Views/Shared/_SubmissionSelf.cshtml b/Whoaverse/Whoaverse/Views/Shared/_SubmissionSelf.cshtml
@@ -17,6 +17,7 @@
 @{
     var commentCount = Model.Comments.Where(c => c.Name != "deleted").Count();
 
+    string routeActiveSubverse = (string)ViewContext.RouteData.Values["subversetoshow"];
     string commentsUrl = "/v/" + Model.Subverse + "/comments/" + Model.Id;
 
     DateTime submissionDate = Model.Date;
@@ -29,7 +30,10 @@
             <p class="title">
                 @if (Model.FlairLabel != null && Model.FlairCss != null)
                 {
-                    <span class="@Model.FlairCss" title="@Model.FlairLabel">@Model.FlairLabel</span>
+                    if (routeActiveSubverse != string.Empty && routeActiveSubverse != "all" && routeActiveSubverse != null)
+                    {   
+                        <span class="@Model.FlairCss" title="@Model.FlairLabel">@Model.FlairLabel</span>
+                    }                    
                 }                
                 <a class="title may-blank " href="@commentsUrl" tabindex="1" title="@Model.Title">@Model.Title</a>
                 <span class="domain">(<a href="/v/@Model.Subverse">self.@Model.Subverse</a>)</span>