diff --git a/plugins/spaminator/public/style.css b/plugins/spaminator/public/style.css index ae9c626..34255aa 100644 --- a/plugins/spaminator/public/style.css +++ b/plugins/spaminator/public/style.css @@ -4,6 +4,10 @@ width: 50%; } +.action-spaminator_plugin_admin-reports #spaminator-report-table { + width: 100%; +} + #spaminator-config-fields { float: left; width: 50%; diff --git a/plugins/spaminator/views/spaminator_plugin/mailer/inactive_person_notification.html.erb b/plugins/spaminator/views/spaminator_plugin/mailer/inactive_person_notification.html.erb index eef4600..17b616f 100644 --- a/plugins/spaminator/views/spaminator_plugin/mailer/inactive_person_notification.html.erb +++ b/plugins/spaminator/views/spaminator_plugin/mailer/inactive_person_notification.html.erb @@ -7,7 +7,7 @@

<%= _('Hi %s!') % @person.name %>

- <%= _('Due to the recent increase in the number of spams on %s, we decided to deactivate all inactive users on the network. It just happens that you are one of them! But there is no need to worry. Your account is completely preserved and if you want to reactivate it you just need to click on the following link and recover your password (since it was changed to a huge scramble of random characters ^^):') % @environment.name %> + <%= _('Due to the recent increase in the number of spams on %s, we decided to deactivate all inactive users on the network. It just happens that you are one of them! But there is no need to worry. Your account is completely preserved and if you want to reactivate it you just need to click on the following link and recover your password (since it was changed to a huge scramble of random characters:') % @environment.name %>

<%= @url %> diff --git a/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml b/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml index 79039e6..fe1700c 100644 --- a/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml +++ b/plugins/spaminator/views/spaminator_plugin_admin/index.rhtml @@ -3,7 +3,7 @@ <% form_for(:settings) do |f| %>

- <%= labelled_form_field _('Period (days)'), f.text_field(:period, :size => 4) %> + <%= labelled_form_field _('Period (days) for scanning spammers'), f.text_field(:period, :size => 4) %>

<% if @settings.deployed.nil? %> @@ -26,8 +26,8 @@ <% klass = @settings.scanning ? 'disabled' : '' %> <%= button(:search, content, {:action => 'scan'}, :class => klass, :disabled => @settings.scanning) %> <% if !@settings.scanning %> - <%= button(:right, _('Deploy'), :action => 'deploy') if !@settings.deployed %> - <%= button(:cancel, _('Withhold'), :action => 'withhold') if @settings.deployed %> + <%= button(:right, _('Deploy'), {:action => 'deploy'}, :title => _('Schedule next scan for the period defined')) if !@settings.deployed %> + <%= button(:cancel, _('Withhold'), {:action => 'withhold'}, :title => _('Cancel next scheduled scans')) if @settings.deployed %> <% end %> <% button_bar do %> @@ -44,8 +44,8 @@ <% @reports.each do |report| %> <%= report.formated_date %> - <%= "#{report.spams} / #{report.total_comments}" %> - <%= "#{report.spammers} / #{report.total_people}" %> + '><%= "#{report.spams} / #{report.total_comments}" %> + '><%= "#{report.spammers} / #{report.total_people}" %> <% end %> diff --git a/plugins/spaminator/views/spaminator_plugin_admin/reports.html.erb b/plugins/spaminator/views/spaminator_plugin_admin/reports.html.erb index 72cf1eb..853fee3 100644 --- a/plugins/spaminator/views/spaminator_plugin_admin/reports.html.erb +++ b/plugins/spaminator/views/spaminator_plugin_admin/reports.html.erb @@ -2,23 +2,27 @@ - - - - - - - + + + + + + + + + + + <% @reports.each do |report| %> - - - - - - + + + + + + <% end %>
<%= _('Date') %><%= _('Spams by content') %><%= _('Spams by author without network') %><%= _('Total Spams') %><%= _('Spammers by more than 2 spams')%><%= _('Spammers due to no network')%><%= _('Total Spammers')%><%= _('Date') %><%= _('Spams on comments') %><%= _('Spammers')%>
<%= _('On content') %><%= _('From spammers') %><%= _('Total') %><%= _('With spam comments')%><%= _('With no network')%><%= _('Total')%>
<%= report.created_at.strftime("%Y-%m-%d") %><%= "#{report.spams_by_content} / #{report.processed_comments}" %><%= "#{report.spams_by_no_network} / #{report.processed_comments}" %><%= "#{report.spams} / #{report.total_comments}" %><%= "#{report.spammers_by_comments} / #{report.processed_people}" %><%= "#{report.spammers_by_no_network} / #{report.processed_people}" %><%= "#{report.spammers} / #{report.total_people}" %>'><%= "#{report.spams_by_content} / #{report.processed_comments}" %>'><%= "#{report.spams_by_no_network} / #{report.processed_comments}" %>'><%= "#{report.spams} / #{report.total_comments}" %>'><%= "#{report.spammers_by_comments} / #{report.processed_people}" %>'><%= "#{report.spammers_by_no_network} / #{report.processed_people}" %>'><%= "#{report.spammers} / #{report.total_people}" %>
-- libgit2 0.21.2