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

This commit is contained in:
pixeldesu 2014-11-30 16:19:27 +01:00
commit af1d3cbb27
1 changed files with 7 additions and 6 deletions

View File

@ -9,11 +9,12 @@
%p.answerbox-question-text= a.question.content %p.answerbox-question-text= a.question.content
.panel-body .panel-body
%p= a.content %p= a.content
%p.text-muted - if @user.nil?
Answered by %p.text-muted
%a{href: show_user_profile_path(a.user.screen_name)} Answered by
%img.img-rounded.img-answerbox-small{src: gravatar_url(a.user)} %a{href: show_user_profile_path(a.user.screen_name)}
%span= a.user.screen_name %img.img-rounded.img-answerbox-small{src: gravatar_url(a.user)}
%span= a.user.screen_name
- if privileged? a.user - if privileged? a.user
%button.btn.btn-danger{name: 'ab-destroy', 'data-a-id' => a.id} %button.btn.btn-sm.btn-danger{name: 'ab-destroy', 'data-a-id' => a.id}
Delete Delete