Gravatar image fixes when gravatar unavailable

-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26) Conflicts: app/assets/stylesheets/themes/ui_bb.scss app/views/snippets/_snippet.html.haml Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033

Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26) Conflicts: app/assets/stylesheets/themes/ui_bb.scss app/views/snippets/_snippet.html.haml Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
Izaak Alpert
1 parent 579c0b97
Showing 18 changed files with 19 additions and 19 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
app/helpers/projects_helper.rb
app/views/admin/users/show.html.haml
app/views/events/_commit.html.haml
app/views/events/_event.html.haml
app/views/groups/people.html.haml
app/views/issues/_issues.html.haml
app/views/layouts/_head_panel.html.haml
app/views/notes/_discussion.html.haml
app/views/notes/_note.html.haml
app/views/profiles/show.html.haml
app/views/repositories/_branch.html.haml
app/views/repositories/_feed.html.haml
app/views/repositories/stats.html.haml
app/views/snippets/_snippet.html.haml
app/views/team_members/_team_member.html.haml
app/views/teams/members/_member.html.haml
app/views/users/show.html.haml
@@ -15,6 +15,7 @@
  
   &.s16 { width: 16px; height: 16px; margin-right: 6px; }
   &.s24 { width: 24px; height: 24px; margin-right: 8px; }
+  &.s26 { width: 26px; height: 26px; margin-right: 8px; }
   &.s32 { width: 32px; height: 32px; margin-right: 10px; }
   &.s90 { width: 90px; height: 90px; margin-right: 15px; }
 }
@@ -25,7 +25,7 @@ module ProjectsHelper
     author_html =  ""
  
     # 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
     author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name]
@@ -20,11 +20,12 @@
  
 .row
   .span6
+<<<<<<< HEAD
     .ui-box
       %h5.title
         Account:
         .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
         %li
           %span.light Name:
@@ -62,7 +63,6 @@
             %span.light Created by:
             %strong
               = link_to @admin_user.created_by.name, [:admin, @admin_user.created_by]
-
     %hr
     %h5
       Add User to Projects
 %li.commit
   %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]
     &ndash;
     = image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16
@@ -4,7 +4,7 @@
       #{time_ago_in_words(event.created_at)} ago.
  
     = 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?
         = render "events/event/push", event: event
@@ -12,7 +12,7 @@
       %ul.well-list
         - @users.each do |user|
           %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
             %span.cgray= user.email
             - if @group.owner == user
@@ -53,7 +53,7 @@
             - @project.users.sort_by(&:name).each do |user|
               %li
                 = 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
  
         .dropdown.inline.prepend-left-10
@@ -37,5 +37,4 @@
             %i.icon-signout
         %li
           = 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 @@
       = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
         %i.icon-eye-open
         Show discussion
-    = image_tag gravatar_icon(note.author.email), class: "avatar s32"
+    = image_tag gravatar_icon(note.author.email), class: "avatar s32", alt: ''
     %div
       = link_to_member(@project, note.author, avatar: false)
       - if note.for_merge_request?
@@ -8,7 +8,7 @@
       - 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
           %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)
     %span.note-last-update
       = time_ago_in_words(note.updated_at)
 .profile_avatar_holder
-  = image_tag gravatar_icon(@user.email, 90)
+  = image_tag gravatar_icon(@user.email, 90), alt: ''
 %h3.page_title
   = @user.name
   %br
@@ -12,7 +12,7 @@
   %td
     = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
       = 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
       = gfm escape_once(truncate(commit.title, length: 40))
     %span
@@ -11,7 +11,7 @@
     %div
       = link_to project_commits_path(@project, commit.id) do
         %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))
   %td
     %span.pull-right.cgray
@@ -19,7 +19,7 @@
     %ol.styled
       - @stats.authors[0...50].each do |author|
         %li
-          = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
+          = image_tag gravatar_icon(author.email, 16), class: 'avatar s16', alt: ''
           = author.name
           %small.light= author.email
           .pull-right
@@ -25,6 +25,6 @@
     = "##{snippet.id}"
     %span.light
       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
  
@@ -4,7 +4,7 @@
   .row
     .span4
       = 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)
         %br
         %small.cgray= user.username
@@ -4,7 +4,7 @@
   .row
     .span3
       = 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
         %strong= truncate(user.name, lenght: 40)
         %br
 .row
   .span8
     %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
       - if @user == current_user
         .pull-right
...	...	@@ -15,6 +15,7 @@
15	15
16	16	&.s16 { width: 16px; height: 16px; margin-right: 6px; }
17	17	&.s24 { width: 24px; height: 24px; margin-right: 8px; }
	18	+ &.s26 { width: 26px; height: 26px; margin-right: 8px; }
18	19	&.s32 { width: 32px; height: 32px; margin-right: 10px; }
19	20	&.s90 { width: 90px; height: 90px; margin-right: 15px; }
20	21	}
...	...
...	...	@@ -25,7 +25,7 @@ module ProjectsHelper
25	25	author_html = ""
26	26
27	27	# Build avatar image tag
28		- 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]
	28	+ 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]
29	29
30	30	# Build name span tag
31	31	author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name]
...	...
...	...	@@ -20,11 +20,12 @@
20	20
21	21	.row
22	22	.span6
	23	+<<<<<<< HEAD
23	24	.ui-box
24	25	%h5.title
25	26	Account:
26	27	.pull-right
27		- = image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32"
	28	+ = image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32", alt: ''
28	29	%ul.well-list
29	30	%li
30	31	%span.light Name:
...	...	@@ -62,7 +63,6 @@
62	63	%span.light Created by:
63	64	%strong
64	65	= link_to @admin_user.created_by.name, [:admin, @admin_user.created_by]
65		-
66	66	%hr
67	67	%h5
68	68	Add User to Projects
...	...
1	1	%li.commit
2	2	%p
3		- = link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id"
	3	+ = link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id", alt: ''
4	4	%span= commit[:author][:name]
5	5	–
6	6	= image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16
...	...
...	...	@@ -4,7 +4,7 @@
4	4	#{time_ago_in_words(event.created_at)} ago.
5	5
6	6	= cache event do
7		- = image_tag gravatar_icon(event.author_email), class: "avatar s24"
	7	+ = image_tag gravatar_icon(event.author_email), class: "avatar s24", alt:''
8	8
9	9	- if event.push?
10	10	= render "events/event/push", event: event
...	...
...	...	@@ -12,7 +12,7 @@
12	12	%ul.well-list
13	13	- @users.each do \|user\|
14	14	%li
15		- = image_tag gravatar_icon(user.email, 16), class: "avatar s16"
	15	+ = image_tag gravatar_icon(user.email, 16), class: "avatar s16" , alt: ''
16	16	%strong= user.name
17	17	%span.cgray= user.email
18	18	- if @group.owner == user
...	...
...	...	@@ -53,7 +53,7 @@
53	53	- @project.users.sort_by(&:name).each do \|user\|
54	54	%li
55	55	= link_to project_issues_with_filter_path(@project, assignee_id: user.id) do
56		- = image_tag gravatar_icon(user.email), class: "avatar s16"
	56	+ = image_tag gravatar_icon(user.email), class: "avatar s16", alt: ''
57	57	= user.name
58	58
59	59	.dropdown.inline.prepend-left-10
...	...
...	...	@@ -37,5 +37,4 @@
37	37	%i.icon-signout
38	38	%li
39	39	= link_to current_user, class: "profile-pic" do
40		- = image_tag gravatar_icon(current_user.email, 26)
41		-
	40	+ = image_tag(gravatar_icon(current_user.email, 26),alt: '',class: "avatar s26")
...	...
...	...	@@ -8,7 +8,7 @@
8	8	= link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
9	9	%i.icon-eye-open
10	10	Show discussion
11		- = image_tag gravatar_icon(note.author.email), class: "avatar s32"
	11	+ = image_tag gravatar_icon(note.author.email), class: "avatar s32", alt: ''
12	12	%div
13	13	= link_to_member(@project, note.author, avatar: false)
14	14	- if note.for_merge_request?
...	...
...	...	@@ -8,7 +8,7 @@
8	8	- if(note.author_id == current_user.id) \|\| can?(current_user, :admin_note, @project)
9	9	= 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
10	10	%i.icon-trash.cred
11		- = image_tag gravatar_icon(note.author.email), class: "avatar s32"
	11	+ = image_tag gravatar_icon(note.author.email), class: "avatar s32", alt: ''
12	12	= link_to_member(@project, note.author, avatar: false)
13	13	%span.note-last-update
14	14	= time_ago_in_words(note.updated_at)
...	...