Put the option to delete GPS traces back. Fixes #405.

[rails.git] / app / views / message / inbox.rhtml

diff --git a/app/views/message/inbox.rhtml b/app/views/message/inbox.rhtml
index 1c17ae18f22572b33d9431170f4b3b6d2853e70f..aa20327e3f18a1dd717878e4e198884c618eb1d6 100644 (file)
--- a/app/views/message/inbox.rhtml
+++ b/app/views/message/inbox.rhtml
@@ -2,7 +2,7 @@
 
 <p>You have <%= @user.new_messages.size %> new messages and <%= @user.messages.size -  @user.new_messages.size %> old messages</p> 
 
-<% if (params[:all] and @user.messages.size > 0) or (@user.new_messages.size > 0) %>
+<% if @user.messages.size > 0 %>
   <div id="messages">
     <table class="messages">
       <tr>
@@ -12,19 +12,9 @@
         <th></th>
         <th></th>
       </tr>
-      <% if params[:all] %>
-        <%= render :partial => "message_summary", :collection => @user.messages %>
-      <% else %>
-        <%= render :partial => "message_summary", :collection => @user.new_messages %>
-      <% end %>
+      <%= render :partial => "message_summary", :collection => @user.messages %>
     </table>
   </div>
-<% end %>
-
-<br />
-
-<% if params[:all] %>
-  <%= link_to 'Show new messages', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
 <% else %>
-  <%= link_to 'Show all messages', :controller => 'message', :action => 'inbox', :display_name => @user.display_name, :all => true %>
-<% end %>
+         <div id="messages">You have no messages yet. Why not get in touch with some of the <%= link_to 'people mapping nearby', :controller => 'user', :action => 'view', :display_name => @user.display_name %>?</div>
+<% end %>
\ No newline at end of file