summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-27 09:46:18 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-27 09:46:18 +0000
commitbf2547db20ee70171b460b110229fde36997adc6 (patch)
treecf24af98fa498896b6dd20b9abc1829b9b108d6d /app
parentbc9ca5fcfd74ea699ea816aaf9e38edadd37b784 (diff)
downloadredmine-bf2547db20ee70171b460b110229fde36997adc6.tar.gz
redmine-bf2547db20ee70171b460b110229fde36997adc6.zip
Add avatar and edit link to "My account" page (#5418).
git-svn-id: http://svn.redmine.org/redmine/trunk@14377 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb8
-rw-r--r--app/views/my/account.html.erb6
2 files changed, 13 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e59f63ed..688e3d235 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1251,6 +1251,14 @@ module ApplicationHelper
end
end
+ # Returns a link to edit user's avatar if avatars are enabled
+ def avatar_edit_link(user, options={})
+ if Setting.gravatar_enabled?
+ url = "http://gravatar.com"
+ link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank'
+ end
+ end
+
def sanitize_anchor_name(anchor)
anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
end
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index cadf0e830..2d7aa9a51 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -4,7 +4,11 @@
<%= call_hook(:view_my_account_contextual, :user => @user)%>
</div>
-<h2><%=l(:label_my_account)%></h2>
+<h2>
+ <%= avatar_edit_link(@user, :size => "50") %>
+ <%=l(:label_my_account)%>
+</h2>
+
<%= error_messages_for 'user' %>
<%= labelled_form_for :user, @user,