From c0dd888e6150a9dede0e3362ede73601ccb0053a Mon Sep 17 00:00:00 2001
From: Asphyxia <dario.cavuotti@gmail.com>
Date: Mon, 14 Jan 2013 02:27:20 -0300
Subject: [PATCH] Issue #3832: Logged-out users stream options

---
 Changelog.md                                    | 1 +
 app/assets/templates/stream-element_tpl.jst.hbs | 4 ++--
 features/logged_out_browsing.feature            | 1 +
 features/step_definitions/custom_web_steps.rb   | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 11eb8daf3..325d46cda 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -27,6 +27,7 @@
 * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
 * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
 * Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
+* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834).
 
 ## Bug Fixes
 
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index f0cfa73b5..82126bdab 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -1,10 +1,10 @@
 <div class="media">
 
-  {{#if current_user}}
+  {{#if loggedIn}}
     <div class="controls">
       {{#unless authorIsCurrentUser}}
         <a href="#" rel="nofollow" class="block_user">
-          <img src="{{imageUrl "icons/ignoreuser.png"}}"" alt="Ignoreuser" class="control_icon" title="{{t "ignore"}}" />
+          <img src="{{imageUrl "icons/ignoreuser.png"}}" alt="Ignoreuser" class="control_icon" title="{{t "ignore"}}" />
         </a>
         <a href="#" rel="nofollow" class="hide_post">
           <img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" />
diff --git a/features/logged_out_browsing.feature b/features/logged_out_browsing.feature
index c49a98441..9ef0562ed 100644
--- a/features/logged_out_browsing.feature
+++ b/features/logged_out_browsing.feature
@@ -12,6 +12,7 @@ Feature: Browsing Diaspora as a logged out user
     Scenario: Visiting a profile page
       When I am on "bob@bob.bob"'s page
       Then I should see "public stuff" within "body"
+      And page should not have ".media .controls"
 
     Scenario: Clicking Last Post
       When I am on "bob@bob.bob"'s page
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index 79716e12f..fac961d1e 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -175,6 +175,10 @@ Then /^(?:|I )should not see a "([^\"]*)"(?: within "([^\"]*)")?$/ do |selector,
   end
 end
 
+Then /^page should (not )?have "([^\"]*)"$/ do |negate, selector|
+  page.has_css?(selector).should ( negate ? be_false : be_true )
+end
+
 When /^I wait for the ajax to finish$/ do
   wait_for_ajax_to_finish
 end