summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-07-30 10:17:56 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-07-30 10:17:56 +0000
commitdb03907e8fa773af4e7d5934e65c3fd0da92d6f3 (patch)
tree97047cb2cf527b3e91d3753dea3d88fe82a5d664 /app
parent6ec3f9873a61449e50521face3a1b32b03eb9feb (diff)
parent9a595b9af735d713e86720c048b5fadba1db0f63 (diff)
downloadgitlab-ci-db03907e8fa773af4e7d5934e65c3fd0da92d6f3.tar.gz
Merge branch 'image-alt-text' into 'master'
Do not use image's file name as alternative text `image_tag` by default uses the image's file name for the img tag's alt attribute. This is not preferable in many cases. E.g. it clutters the UI with a long hash string if a gravatar could not be loaded. To fix this, the `alt` option is set for `image_tag` calls. ![gitlab-ci-img-alt](https://gitlab.com/dgerhardt/gitlab-ci/uploads/2699d149983912e458e2375fe9732b0d/gitlab-ci-img-alt.png) See merge request !214
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/layouts/_nav.html.haml2
-rw-r--r--app/views/user_sessions/show.html.haml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 069005f..8eeb409 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,6 @@
module ApplicationHelper
def loader_html
- image_tag 'loader.gif'
+ image_tag 'loader.gif', alt: 'Loading'
end
def gravatar_icon(user_email = '', size = nil)
diff --git a/app/views/layouts/_nav.html.haml b/app/views/layouts/_nav.html.haml
index ab2308a..d571716 100644
--- a/app/views/layouts/_nav.html.haml
+++ b/app/views/layouts/_nav.html.haml
@@ -21,7 +21,7 @@
%li
= link_to user_sessions_path do
.profile-holder
- = image_tag gravatar_icon(current_user.email, 64)
+ = image_tag gravatar_icon(current_user.email, 64), alt: ''
%span= current_user.name
%li
= link_to user_sessions_path, class: "logout", method: :delete do
diff --git a/app/views/user_sessions/show.html.haml b/app/views/user_sessions/show.html.haml
index 12aea2a..0faf2f7 100644
--- a/app/views/user_sessions/show.html.haml
+++ b/app/views/user_sessions/show.html.haml
@@ -1,4 +1,4 @@
-= image_tag gravatar_icon(current_user.email, 120), class: 'img-polaroid'
+= image_tag gravatar_icon(current_user.email, 120), class: 'img-polaroid', alt: ''
%h3
Hi, #{@user.name}