Remove now-obsolete partials in app/views/messages/*

diff --git a/app/views/messages/_inbox_count.html.erb b/app/views/messages/_inbox_count.html.erb
deleted file mode 100644 (file)
index 86bb2c4..0000000
--- a/app/views/messages/_inbox_count.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<h4 id="inbox-count">
-<%= t "messages.inbox.messages",
-      :new_messages => t("messages.inbox.new_messages",
-                         :count => current_user.new_messages.size),
-      :old_messages => t("messages.inbox.old_messages",
-                         :count => current_user.messages.size - current_user.new_messages.size) %>
-</h4>

diff --git a/app/views/messages/_muted_count.html.erb b/app/views/messages/_muted_count.html.erb
deleted file mode 100644 (file)
index 207973d..0000000
--- a/app/views/messages/_muted_count.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<h4 id="muted-count">
-<%= t "messages.muted.messages", :count => current_user.muted_messages.size %>
-</h4>

diff --git a/app/views/messages/_outbox_count.html.erb b/app/views/messages/_outbox_count.html.erb
deleted file mode 100644 (file)
index 5b27f1d..0000000
--- a/app/views/messages/_outbox_count.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<h4 id="outbox-count">
-<%= t "messages.outbox.messages", :count => current_user.sent_messages.size %>
-</h4>

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 611b0b1c972e02272fbedecbd84fc5683cf368aa..835d70a74cd8ee1f7d4c4af4c0ddf381b156f89b 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %>
 
 
 <%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %>
 

-<%= render :partial => "inbox_count" %>
+<h4><%= t "messages.inbox.messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %></h4>

 
 <% if current_user.messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %>
 
 <% if current_user.messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %>

diff --git a/app/views/messages/muted.html.erb b/app/views/messages/muted.html.erb
index 8e97abc7f2ff701d4cd9f67d266856cf7d36bc49..40c74e915762cb918a76233ff6faec6943528cdd 100644 (file)
--- a/app/views/messages/muted.html.erb
+++ b/app/views/messages/muted.html.erb
@@ -4,6 +4,6 @@
 
 <%= render :partial => "heading", :locals => { :active_link_path => muted_messages_path } %>
 
 
 <%= render :partial => "heading", :locals => { :active_link_path => muted_messages_path } %>
 

-<%= render :partial => "muted_count" %>
+<h4><%= t ".messages", :count => current_user.muted_messages.size %></h4>

 
 <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.muted_messages, :inner_partial => "message_summary" } %>
 
 <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.muted_messages, :inner_partial => "message_summary" } %>

diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 096427e8d4534ab507135169cefb77461a647a7b..5cb357f6fa19c899e88eb4970ca7caeb0844816e 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
 
 
 <%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
 

-<%= render :partial => "outbox_count" %>
+<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

 
 <% if current_user.sent_messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>
 
 <% if current_user.sent_messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>