3 files changed, 36 insertions, 3 deletions
diff --git a/app/views/user/_change_receive_email.rhtml b/app/views/user/_change_receive_email.rhtml
new file mode 100644
index 000000000..83e5d8601
--- /dev/null
+++ b/app/views/user/_change_receive_email.rhtml
@@ -0,0 +1,16 @@
+<% form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %>
+ <div>
+ <% if @user.receive_email_alerts %>
+  <%= _('You are currently receiving notification of new activity on your wall by email.', :wall_url => show_user_wall_path) %><br><br>
+  <%= hidden_field_tag 'receive_email_alerts', 'false' %>
+  <%= hidden_field_tag 'came_from', request.url %>
+  <%= submit_tag _("Turn off email alerts") %>
+ <% else %>
+  <%= _('Items matching the following conditions are currently displayed on your wall.') %><br><br>
+  <%= hidden_field_tag 'receive_email_alerts', 'true' %>
+  <%= hidden_field_tag 'came_from', request.url %>
+  <%= submit_tag _("Also send me alerts by email") %>
+ <% end %>
+ </div>
+<% end %>
+
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index f8b820f03..d723196d3 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -192,11 +192,12 @@
 </div>
 <% end %>
 <% if @show_profile && @is_you %>
+    <h2 id="email_subscriptions"> <%= _("Things you're following")%></h2>
+    <%= render :partial => 'change_receive_email' %>
+    <br>
     <% if @track_things.empty? %>
-        <h2 id="email_subscriptions"> <%= _('Your email subscriptions')%></h2>
-        <p><%= _('None made.')%></p>
+        <p><%= _("You're not following anything.")%></p>
     <% else %>
-        <h2 id="email_subscriptions"> Your <%=pluralize(@track_things.size, _('email subscription')) %> </h2>
         <% if @track_things_grouped.size == 1 %>
             <% form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %>
                 <h3>
diff --git a/app/views/user/wall.rhtml b/app/views/user/wall.rhtml
new file mode 100644
index 000000000..190cc0a6d
--- /dev/null
+++ b/app/views/user/wall.rhtml
@@ -0,0 +1,16 @@
+<% @title = h(@display_user.name) + _(" - wall") %>
+<% if @is_you %>
+<div class="medium_column">
+ <p><%= _('You can change the requests and users you are following on <a href="{{profile_url}}">your profile page</a>.', :profile_url => show_user_profile_path) %>
+ <%= render :partial => 'change_receive_email' %>
+</div>
+<% end %>
+<div id="user_profile_search">
+    <% if !@feed_results.nil? %>
+            <% for result in @feed_results %>
+                <%= render :partial => 'request/wall_listing', :locals => { :event => result, :info_request => result.info_request } %>
+        <% end %>
+    <% end %> 
+
+
+</div>