jro_apps/redmine Commit - r1970:ba20a678737c

Added an option to turn user Gravatars on or off...

Eric Davis -

r1970:ba20a678737c

parent child

Context file:

r1970:ba20a678737c

app/helpers/application_helper.rb +6 0

                 (@has_content && @has_content[name]) || false
               end
+              def gravatar_for_mail(mail, options = { })
+                if Setting.gravatar_enabled?
+                  return gravatar(mail, options) rescue nil
+                end
+              end
               private
               def wiki_helper

app/views/account/show.rhtml +2 -2

             <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
             </div>
-            <h2><%= gravatar @user.mail unless @user.mail.empty? %> <%=h @user.name %></h2>
+            <h2><%= gravatar_for_mail @user.mail unless @user.mail.empty? %> <%=h @user.name %></h2>
             <p>
             <%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>
             <h3><%=l(:label_activity)%></h3>
             <p>
             <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
-            </p>
  No newline at end of file
+            </p>

app/views/issues/_history.rhtml +1 -1

                 <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
                 <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
                 <%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
-                <%= gravatar(journal.user.mail.blank? ? "" : journal.user.mail, :size => "32") %>
+                <%= gravatar_for_mail(journal.user.mail.blank? ? "" : journal.user.mail, :size => "32") %>
                 <ul>
                 <% for detail in journal.details %>
                    <li><%= show_detail(detail) %></li>

app/views/issues/show.rhtml +2 -2

             <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
             <div class="issue <%= "status-#{@issue.status.position} priority-#{@issue.priority.position}" %>">
-                    <%= gravatar(@issue.author.mail, :size => "64") rescue nil %>
+                    <%= gravatar_for_mail(@issue.author.mail, :size => "64") %>
                     <h3><%=h @issue.subject %></h3>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                 <td class="due-date"><b><%=l(:field_due_date)%>:</b></td><td class="due-date"><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
-                <td class="assigned-to"><b><%=l(:field_assigned_to)%>:</b></td><td><%= gravatar(@issue.assigned_to.mail, :size => "14") unless @issue.assigned_to.blank?%><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
+                <td class="assigned-to"><b><%=l(:field_assigned_to)%>:</b></td><td><%= gravatar_for_mail(@issue.assigned_to.mail, :size => "14") unless @issue.assigned_to.blank?%><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <td class="progress"><b><%=l(:field_done_ratio)%>:</b></td><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
             </tr>
             <tr>

app/views/projects/activity.rhtml +3 -3

             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
-            	<%= gravatar(e.user.mail, :size => "24") if e.respond_to?(:user) rescue nil%>
+            	<%= gravatar_for_mail(e.user.mail, :size => "24") if e.respond_to?(:user) %>
-            	<%= gravatar(e.author.mail, :size => "24") if e.respond_to?(:author) rescue nil%>
+            	<%= gravatar_for_mail(e.author.mail, :size => "24") if e.respond_to?(:author) %>
-            	<%= gravatar(e.committer.match('\\<.+?\\>')[0].gsub(/[<>]/, ''), :size => "24") if e.respond_to?(:committer) rescue nil%>
+            	<%= gravatar_for_mail(e.committer.match('\\<.+?\\>')[0].gsub(/[<>]/, ''), :size => "24") if e.respond_to?(:committer) rescue nil %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %></dt>

app/views/settings/_general.rhtml +3 0

             <p><label><%= l(:setting_feeds_limit) %></label>
             <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
+            <p><label><%= l(:setting_gravatar_enabled) %></label>
+            <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
             </div>
             <%= submit_tag l(:button_save) %>

app/views/users/list.rhtml +1 -1

               <tbody>
             <% for user in @users -%>
               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-            	<td class="username"><%= gravatar(user.mail.blank? ? "" : user.mail, :size => "24") %><%= link_to h(user.login), :action => 'edit', :id => user %></td>
+            	<td class="username"><%= gravatar_for_mail(user.mail.blank? ? "" : user.mail, :size => "24") %><%= link_to h(user.login), :action => 'edit', :id => user %></td>
             	<td class="firstname"><%= h(user.firstname) %></td>
             	<td class="lastname"><%= h(user.lastname) %></td>
             	<td class="email"><%= mail_to(h(user.mail)) %></td>

config/settings.yml +2 -1

               default: |-
                 You have received this notification because you have either subscribed to it, or are involved in it.
                 To change your notification preferences, please click here: http://hostname/my/account
+            gravatar_enabled:
+              default: 0

lang/en.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             setting_sequential_project_identifiers: Generate sequential project identifiers
+            setting_gravatar_enabled: Use Gravatar user icons
             permission_edit_project: Edit project
             permission_select_project_modules: Select project modules

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages