diff --git a/mailing_lists/app/controllers/mailing_lists_controller.rb b/mailing_lists/app/controllers/mailing_lists_controller.rb index 53d441124..e02e46fe2 100644 --- a/mailing_lists/app/controllers/mailing_lists_controller.rb +++ b/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 diff --git a/mailing_lists/app/views/mailing_lists/messages.rhtml b/mailing_lists/app/views/mailing_lists/messages.rhtml index f9cccce6d..89f5e9de8 100644 --- a/mailing_lists/app/views/mailing_lists/messages.rhtml +++ b/mailing_lists/app/views/mailing_lists/messages.rhtml @@ -3,7 +3,10 @@ <% if @messages.empty? %>

<%= l(:label_no_data) %>

<% else %> +

<%= lwr(:label_thread, @messages.length) %>, <%= lwr(:label_message, @message_count) %>

+
<%= render :partial => 'thread', :locals => {:messages => @messages} %> +
<% end %> diff --git a/mailing_lists/lang/fr.yml b/mailing_lists/lang/fr.yml index 2a135670d..e8f5d652e 100644 --- a/mailing_lists/lang/fr.yml +++ b/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 diff --git a/mailing_lists/public/stylesheets/application.css b/mailing_lists/public/stylesheets/application.css index bc17ce4f5..14eec4413 100644 --- a/mailing_lists/public/stylesheets/application.css +++ b/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;