diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2024-12-10 23:31:14 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2024-12-10 23:31:14 +0000 |
| commit | 910842a157a9fa663b13ddc6eb95359fd60482a1 (patch) | |
| tree | 815a3db17a7cda823537f3ce040a48782ff85bcb /app | |
| parent | 4a74fcccae8099c17950340a6cfdbd54930cf495 (diff) | |
| download | redmine-910842a157a9fa663b13ddc6eb95359fd60482a1.tar.gz redmine-910842a157a9fa663b13ddc6eb95359fd60482a1.zip | |
Fixes group icons not displayed only using the SVG icon (#41853).
git-svn-id: https://svn.redmine.org/redmine/trunk@23379 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/application.css | 5 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/watchers_helper.rb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b442da7e3..1707bc172 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -435,7 +435,7 @@ tr.version:not(.shared) td.name { padding-left: 20px; } tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; } tr.member td.icon-user, #principals_for_new_member .icon-user {background:transparent;} -#principals_for_new_member svg {margin-right: 4px;} +#principals_for_new_member svg, #principals_for_new_member img {margin-right: 4px;} tr.user td {width:13%;white-space: nowrap;} td.username, td.firstname, td.lastname, td.email {text-align:left !important;} @@ -540,7 +540,10 @@ td.center {text-align:center;} #watchers select {width: 95%; display: block;} #watchers img.gravatar {margin: 0 4px 2px 0;} +#watchers svg.icon-svg {margin: 0 2px 2px 0;} #users_for_watcher img.gravatar {padding-bottom: 2px; margin-right: 4px;} +#users_for_watcher svg {margin-right: 4px;} +#users_for_watcher span.icon-user {display: inline;} span#watchers_inputs {overflow:auto; display:block;} span.search_for_watchers {display:block;} diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d708019c9..2db6ce7ee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -655,7 +655,7 @@ module ApplicationHelper content_tag( 'label', check_box_tag(name, principal.id, false, :id => nil) + - (avatar(principal, :size => 16).presence || + ((avatar(principal, :size => 16).presence if principal.is_a?(User)) || content_tag( 'span', principal_icon(principal), :class => "name icon icon-#{principal.class.name.downcase}" diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index f7763e41b..00afd30ae 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -49,7 +49,7 @@ module WatchersHelper content = ''.html_safe lis = object.watcher_users.sorted.collect do |user| s = ''.html_safe - s << avatar(user, :size => "16").to_s + s << avatar(user, :size => "16").to_s if user.is_a?(User) s << link_to_principal(user, class: user.class.to_s.downcase) if object.respond_to?(:visible?) && user.is_a?(User) && !object.visible?(user) s << content_tag('span', l(:notice_invalid_watcher), class: 'icon-only icon-warning', title: l(:notice_invalid_watcher)) |