Commit d0779d61 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars

Gravatar image fixes when gravatar unavailable
parents 579c0b97 d1da45e1
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
&.s16 { width: 16px; height: 16px; margin-right: 6px; } &.s16 { width: 16px; height: 16px; margin-right: 6px; }
&.s24 { width: 24px; height: 24px; margin-right: 8px; } &.s24 { width: 24px; height: 24px; margin-right: 8px; }
&.s26 { width: 26px; height: 26px; margin-right: 8px; }
&.s32 { width: 32px; height: 32px; margin-right: 10px; } &.s32 { width: 32px; height: 32px; margin-right: 10px; }
&.s90 { width: 90px; height: 90px; margin-right: 15px; } &.s90 { width: 90px; height: 90px; margin-right: 15px; }
} }
......
...@@ -25,7 +25,7 @@ module ProjectsHelper ...@@ -25,7 +25,7 @@ module ProjectsHelper
author_html = "" author_html = ""
# Build avatar image tag # Build avatar image tag
author_html << image_tag(gravatar_icon(author.try(:email), opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}") if opts[:avatar] author_html << image_tag(gravatar_icon(author.try(:email), opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
# Build name span tag # Build name span tag
author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name] author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name]
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%h5.title %h5.title
Account: Account:
.pull-right .pull-right
= image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32" = image_tag gravatar_icon(@admin_user.email, 32), class:"avatar s32", alt:""
%ul.well-list %ul.well-list
%li %li
%span.light Name: %span.light Name:
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
%span.light Created by: %span.light Created by:
%strong %strong
= link_to @admin_user.created_by.name, [:admin, @admin_user.created_by] = link_to @admin_user.created_by.name, [:admin, @admin_user.created_by]
%hr %hr
%h5 %h5
Add User to Projects Add User to Projects
......
%li.commit %li.commit
%p %p
= link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id" = link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id", alt: ''
%span= commit[:author][:name] %span= commit[:author][:name]
&ndash; &ndash;
= image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16 = image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#{time_ago_in_words(event.created_at)} ago. #{time_ago_in_words(event.created_at)} ago.
= cache event do = cache event do
= image_tag gravatar_icon(event.author_email), class: "avatar s24" = image_tag gravatar_icon(event.author_email), class: "avatar s24", alt:''
- if event.push? - if event.push?
= render "events/event/push", event: event = render "events/event/push", event: event
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
%li %li
= image_tag gravatar_icon(user.email, 16), class: "avatar s16" = image_tag gravatar_icon(user.email, 16), class: "avatar s16" , alt: ''
%strong= user.name %strong= user.name
%span.cgray= user.email %span.cgray= user.email
- if @group.owner == user - if @group.owner == user
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
- @project.users.sort_by(&:name).each do |user| - @project.users.sort_by(&:name).each do |user|
%li %li
= link_to project_issues_with_filter_path(@project, assignee_id: user.id) do = link_to project_issues_with_filter_path(@project, assignee_id: user.id) do
= image_tag gravatar_icon(user.email), class: "avatar s16" = image_tag gravatar_icon(user.email), class: "avatar s16", alt: ''
= user.name = user.name
.dropdown.inline.prepend-left-10 .dropdown.inline.prepend-left-10
......
...@@ -37,5 +37,4 @@ ...@@ -37,5 +37,4 @@
%i.icon-signout %i.icon-signout
%li %li
= link_to current_user, class: "profile-pic" do = link_to current_user, class: "profile-pic" do
= image_tag gravatar_icon(current_user.email, 26) = image_tag(gravatar_icon(current_user.email, 26),alt: '',class: "avatar s26")
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
%i.icon-eye-open %i.icon-eye-open
Show discussion Show discussion
= image_tag gravatar_icon(note.author.email), class: "avatar s32" = image_tag gravatar_icon(note.author.email), class: "avatar s32", alt: ''
%div %div
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
- if note.for_merge_request? - if note.for_merge_request?
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
= link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
%i.icon-trash.cred %i.icon-trash.cred
= image_tag gravatar_icon(note.author.email), class: "avatar s32" = image_tag gravatar_icon(note.author.email), class: "avatar s32", alt: ''
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
%span.note-last-update %span.note-last-update
= time_ago_in_words(note.updated_at) = time_ago_in_words(note.updated_at)
......
.profile_avatar_holder .profile_avatar_holder
= image_tag gravatar_icon(@user.email, 90) = image_tag gravatar_icon(@user.email, 90), alt: ''
%h3.page_title %h3.page_title
= @user.name = @user.name
%br %br
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%td %td
= link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
= commit.short_id = commit.short_id
= image_tag gravatar_icon(commit.author_email), class: "avatar s16" = image_tag gravatar_icon(commit.author_email), class: "avatar s16", alt: ''
%span.light %span.light
= gfm escape_once(truncate(commit.title, length: 40)) = gfm escape_once(truncate(commit.title, length: 40))
%span %span
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%div %div
= link_to project_commits_path(@project, commit.id) do = link_to project_commits_path(@project, commit.id) do
%code= commit.short_id %code= commit.short_id
= image_tag gravatar_icon(commit.author_email), class: "", width: 16 = image_tag gravatar_icon(commit.author_email), class: "", width: 16, alt: ''
= gfm escape_once(truncate(commit.title, length: 40)) = gfm escape_once(truncate(commit.title, length: 40))
%td %td
%span.pull-right.cgray %span.pull-right.cgray
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%ol.styled %ol.styled
- @stats.authors[0...50].each do |author| - @stats.authors[0...50].each do |author|
%li %li
= image_tag gravatar_icon(author.email, 16), class: 'avatar s16' = image_tag gravatar_icon(author.email, 16), class: 'avatar s16', alt: ''
= author.name = author.name
%small.light= author.email %small.light= author.email
.pull-right .pull-right
......
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
= "##{snippet.id}" = "##{snippet.id}"
%span.light %span.light
by by
= image_tag gravatar_icon(snippet.author_email), class: "avatar avatar-inline s16" = image_tag gravatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
= snippet.author_name = snippet.author_name
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row .row
.span4 .span4
= link_to user, title: user.name, class: "dark" do = link_to user, title: user.name, class: "dark" do
= image_tag gravatar_icon(user.email, 32), class: "avatar s32" = image_tag gravatar_icon(user.email, 32), class: "avatar s32", alt: ''
%strong= truncate(user.name, lenght: 40) %strong= truncate(user.name, lenght: 40)
%br %br
%small.cgray= user.username %small.cgray= user.username
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row .row
.span3 .span3
= link_to user_path(user.username), title: user.name, class: "dark" do = link_to user_path(user.username), title: user.name, class: "dark" do
= image_tag gravatar_icon(user.email, 40), class: "avatar s32" = image_tag gravatar_icon(user.email, 40), class: "avatar s32", alt: ''
= link_to user_path(user.username), title: user.name, class: "dark" do = link_to user_path(user.username), title: user.name, class: "dark" do
%strong= truncate(user.name, lenght: 40) %strong= truncate(user.name, lenght: 40)
%br %br
......
.row .row
.span8 .span8
%h3.page_title %h3.page_title
= image_tag gravatar_icon(@user.email, 90), class: "avatar s90" = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
= @user.name = @user.name
- if @user == current_user - if @user == current_user
.pull-right .pull-right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment