undo composite keys change on old_ndoe

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

diff --git a/app/views/message/inbox.rhtml b/app/views/message/inbox.rhtml
index 1c17ae18f22572b33d9431170f4b3b6d2853e70f..2a64f2774788d7b81b0bfd343d82413a23bd3dce 100644 (file)
--- a/app/views/message/inbox.rhtml
+++ b/app/views/message/inbox.rhtml
@@ -1,8 +1,8 @@
-<h2>My inbox</h2>
+<h2>My inbox/<%= link_to "outbox", url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %></h2>

 
 <p>You have <%= @user.new_messages.size %> new messages and <%= @user.messages.size -  @user.new_messages.size %> old messages</p> 
 
 
 <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>
   <div id="messages">
     <table class="messages">
       <tr>


@@ -12,19 +12,9 @@
         <th></th>
         <th></th>
       </tr>
         <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>
     </table>
   </div>

-<% end %>
-
-<br />
-
-<% if params[:all] %>
-  <%= link_to 'Show new messages', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>

 <% else %>
 <% else %>

-  <%= link_to 'Show all messages', :controller => 'message', :action => 'inbox', :display_name => @user.display_name, :all => true %>
+         <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 %>
 <% end %>