diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-01 11:23:09 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-01 12:10:08 +0200 |
| commit | 91a7b9333b660abc866e52e1a614151cb529413d (patch) | |
| tree | c7ee15fd37e703229f6f197207304479251b5856 /app/views/award_emoji | |
| parent | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (diff) | |
| download | gitlab-ce-91a7b9333b660abc866e52e1a614151cb529413d.tar.gz | |
Incorportate feedback
Diffstat (limited to 'app/views/award_emoji')
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index 19d1275a926..f1f93c1375b 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -1,7 +1,7 @@ - grouped_emojis = awardable.grouped_awards(with_thumbs: inline) -.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } } +.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } } - awards_sort(grouped_emojis).each do |emoji, awards| - %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", title: award_user_list(awards, current_user) } } + %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } } = emoji_icon(emoji) %span.award-control-text.js-counter = awards.count @@ -12,7 +12,7 @@ .award-menu-holder.js-award-holder %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } } - = icon('smile-o', {class: "award-control-icon award-control-icon-normal"}) - = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"}) + = icon('smile-o', class: "award-control-icon award-control-icon-normal") + = icon('spinner spin', class: "award-control-icon award-control-icon-loading") %span.award-control-text Add |