3 files changed, 28 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..1518dae9b
--- /dev/null
+++ b/app/views/user/_change_receive_email.rhtml
@@ -0,0 +1,10 @@
+<% form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %>
+ <% if @user.receive_email_alerts %>
+  You are currently receiving notification of new activity on your wall by email.
+  <%= hidden_field_tag 'receive_email_alerts', 'false' %>
+  <%= submit_tag "Turn off email alerts" %>
+ <% else %>
+  <%= hidden_field_tag 'receive_email_alerts', 'true' %>
+  <%= submit_tag "Send me alerts of new activity by email" %>
+ <% end %>
+<% end %>
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index f8b820f03..e2047f216 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -192,11 +192,13 @@
 </div>
 <% end %>
 <% if @show_profile && @is_you %>
+    <h2 id="email_subscriptions"> <%= _("Things you're following")%></h2>
+    <p>You can view everything you're following on <%= link_to "your wall", show_user_wall_path %>.</p>
+    <%= 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..b48169908
--- /dev/null
+++ b/app/views/user/wall.rhtml
@@ -0,0 +1,13 @@
+<% @title = h(@display_user.name) + _(" - wall") %>
+
+<p>This page lists your own activity, and activity you've followed.  You can change what you're following on <%= link_to "your profile page", show_user_profile_path %>.</p>
+ <%= render :partial => 'change_receive_email' %>
+<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>