display message count on mailing_lists/messages

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@273 e93f8b46-1217-0410-a6f0-8f06a7374b81

mailing_lists/app/controllers/mailing_lists_controller.rb

@@ -35,6 +35,7 @@ class MailingListsController < ApplicationController
     @date_from = Date.civil(@year, @month, 1)
     @date_to = (@date_from >> 1)-1
     
+    @message_count = @mailing_list.messages.count(:conditions => ["sent_on>=? and sent_on<=?", @date_from, @date_to])
     @messages = @mailing_list.messages.find(:all, :conditions => ["parent_id is null and sent_on>=? and sent_on<=?", @date_from, @date_to])
     render :layout => false if request.xhr?
   end

mailing_lists/app/views/mailing_lists/messages.rhtml

@@ -3,7 +3,10 @@
 <% if @messages.empty? %>
 <p><em><%= l(:label_no_data) %></em></p>
 <% else %>
+<p><em><%= lwr(:label_thread, @messages.length) %>, <%= lwr(:label_message, @message_count) %></em></p>
+<div id="messages-list">
 <%= render :partial => 'thread', :locals => {:messages => @messages} %>
+</div>
 <% end %>
 
 <table width="100%">

mailing_lists/lang/fr.yml

@@ -321,6 +321,10 @@ label_mailing_list_plural: Listes
 label_mailing_list_new: Nouvelle liste
 label_in_reply_to: En réponse à
 label_reply_plural: Réponses
+label_message: %d message
+label_message_plural: %d messages
+label_thread: %d fil de discussion
+label_thread_plural: %d fils de discussion
 
 button_login: Connexion
 button_submit: Soumettre

mailing_lists/public/stylesheets/application.css

@@ -493,6 +493,11 @@ img.calendar-trigger {
     margin-left: 34px;
 }
 
+
+#messages-list li { margin-bottom:8px; }
+#messages-list ul { margin-bottom:0px; }
+#messages-list li li { margin-bottom:0px; }
+
 /***** Contextual links div *****/
 .contextual {
 float: right;