From c05f526a573cf928e9a94850796da5c05d86fefb Mon Sep 17 00:00:00 2001 From: joshua stein Date: Wed, 2 Dec 2015 13:43:26 -0600 Subject: [PATCH] make story description icon a link to the story page, revert c1d1a44472 i don't like showing "discuss" to logged out users, and now that we have a story description icon that can link to the story text, back out the change that made logged out users see discuss when they can't discuss it. --- app/assets/stylesheets/application.css | 1 + app/views/stories/_listdetail.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index fac901f..3069e02 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -515,6 +515,7 @@ li .link a { li.story .description_present { color: gray; padding-left: 0.25em; + text-decoration: none; vertical-align: middle; } diff --git a/app/views/stories/_listdetail.html.erb b/app/views/stories/_listdetail.html.erb index 183e797..2b82666 100644 --- a/app/views/stories/_listdetail.html.erb +++ b/app/views/stories/_listdetail.html.erb @@ -27,8 +27,8 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %> <% end %> <% if story.markeddown_description.present? %> - + <% end %> <% if story.can_be_seen_by_user?(@user) %> @@ -163,7 +163,7 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %> (hidden by <%= pluralize(story.hider_count, "user") %>) <% end %> <% end %> - <% if !story.is_gone? %> + <% if !story.is_gone? && (@user || story.comments_count > 0) %> | <%= story.comments_count == 0 ?