FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.rrerr.net:justask/justask 

Conflicts:
	app/views/shared/_answerbox.html.haml
This commit is contained in:
nilsding 2014-12-27 00:40:02 +01:00
parent c817f32b18 20c173442d
commit 9fe8be1db8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/shared/_answerbox_buttons.html.haml
View File

@ -12,7 +12,8 @@
%button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', data: { a_id: a.id, action: :smile }} %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', data: { a_id: a.id, action: :smile }}
%i.fa.fa-smile-o %i.fa.fa-smile-o
%span{id: "ab-smile-count-#{a.id}"}= a.smile_count %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
%button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }} - unless @display_all
%button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }}
%i.fa.fa-comments %i.fa.fa-comments
%span{id: "ab-comment-count-#{a.id}"}= a.comment_count %span{id: "ab-comment-count-#{a.id}"}= a.comment_count
- if privileged? a.user - if privileged? a.user