Merged r3282 to r3284 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3287 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 files changed, 19 insertions, 8 deletions

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 389d7fbf1..4f21b30db 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -32,7 +32,6 @@ module JournalsHelper
     content << textilizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
-    css_classes << " gravatar-margin" if Setting.gravatar_enabled?
     content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
   end
   
diff --git a/app/models/query.rb b/app/models/query.rb
index afbb68772..788f34e40 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -232,7 +232,7 @@ class Query < ActiveRecord::Base
   
   def add_short_filter(field, expression)
     return unless expression
-    parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
+    parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
     add_filter field, (parms[0] || "="), [parms[1] || ""]
   end
   
diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml
index a29a177c7..6e8b4d7db 100644
--- a/app/views/auth_sources/list.rhtml
+++ b/app/views/auth_sources/list.rhtml
@@ -22,6 +22,7 @@
     <td class="buttons">
     	<%= link_to l(:button_test), :action => 'test_connection', :id => source %>
     	<%= link_to l(:button_delete), { :action => 'destroy', :id => source },
+    																										:method => :post,
                                                         :confirm => l(:text_are_you_sure),
                                                         :class => 'icon icon-del',
                                                         :disabled => source.users.any? %>
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 267263b72..ffbb29399 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -2,9 +2,10 @@
 <% for journal in journals %>
   <div id="change-<%= journal.id %>" class="journal">
     <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
+    <%= avatar(journal.user, :size => "24") %>
     <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
 		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
-    <%= avatar(journal.user, :size => "32") %>
+    
     <ul>
     <% for detail in journal.details %>
        <li><%= show_detail(detail) %></li>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 914e55729..90a9d963d 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -3,7 +3,7 @@
 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
 
 <div class="<%= @issue.css_classes %> details">
-        <%= avatar(@issue.author, :size => "64") %>
+        <%= avatar(@issue.author, :size => "50") %>
         <h3><%=h @issue.subject %></h3>
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 5ddc083e5..079b9887e 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -8,7 +8,7 @@
     <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
 </div>
 
-<h2><%=h @topic.subject %></h2>
+<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
 
 <div class="message">
 <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
@@ -29,6 +29,7 @@
       <%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
     </div>
   <h4>
+  	<%= avatar(message.author, :size => "24") %>
     <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %>
     -
     <%= authoring message.created_on, message.author %>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 69c0eab32..485bd6f3a 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -7,7 +7,7 @@
 <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
 </div>
 
-<h2><%=h @news.title %></h2>
+<h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
 
 <% if authorize_for('news', 'edit') %>
 <div id="edit-news" style="display:none;">
@@ -42,7 +42,7 @@
     <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
                                                        :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
     </div>
-    <h4><%= authoring comment.created_on, comment.author %></h4>
+    <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
     <%= textilizable(comment.comments) %>
 <% end if @comments.any? %>
 </div>
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index c3ad2bed7..c9cd88bb8 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -17,27 +17,32 @@
 <tr class="<%= cycle("odd", "even") %>">
   <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id %></td>
   <% for status in @statuses %>
     <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, 
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "status_id" => status.id, 
                                                 "#{field_name}" => row.id %></td>
   <% end %>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "*" %></td>  
 </tr>
diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 7f799f325..e82f376a1 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -13,20 +13,24 @@
 <tr class="<%= cycle("odd", "even") %>">
   <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "*" %></td>  
 </tr>
diff --git a/app/views/users/show.rhtml b/app/views/users/show.rhtml
index 8816f108e..82634b010 100644
--- a/app/views/users/show.rhtml
+++ b/app/views/users/show.rhtml
@@ -2,7 +2,7 @@
 <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
 </div>
 
-<h2><%= avatar @user %> <%=h @user.name %></h2>
+<h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
 
 <div class="splitcontentleft">
 <ul>