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

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

This commit is contained in:
pixeldesu 2014-11-30 23:08:21 +01:00
parent ed307504b0 c159e3b5bc
commit be438f670f
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/shared/_answerbox.html.haml
View File

@ -23,29 +23,8 @@
%span= time_ago_in_words(a.created_at)
ago
.col-md-6.col-sm-8.col-xs-5.text-right
%span.hidden-xs.text-muted
%span{id: "ab-smile-count-#{a.id}"}= a.smile_count
users smiled this
- if user_signed_in?
- if current_user.smiled? a
%button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'unsmile'}
%i.fa.fa-frown-o
- else
%button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'smile'}
%i.fa.fa-smile-o
%a.btn.btn-primary.btn-sm
%i.fa.fa-comments
- if privileged? a.user
%button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
%i.fa.fa-trash-o
= render 'shared/answerbox_buttons', a: a
- else
.row
.col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right
%span.hidden-xs.text-muted x users smiled at this
%a.btn.btn-info.btn-sm
%i.fa.fa-smile-o
%a.btn.btn-primary.btn-sm
%i.fa.fa-comments
- if privileged? a.user
%button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
%i.fa.fa-trash-o
= render 'shared/answerbox_buttons', a: a

15
app/views/shared/_answerbox_buttons.html.haml Normal file
View File

@ -0,0 +1,15 @@
%span.hidden-xs.text-muted
%span{id: "ab-smile-count-#{a.id}"}= a.smile_count
users smiled this
- if user_signed_in?
- if current_user.smiled? a
%button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'unsmile'}
%i.fa.fa-frown-o
- else
%button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'smile'}
%i.fa.fa-smile-o
%a.btn.btn-primary.btn-sm
%i.fa.fa-comments
- if privileged? a.user
%button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
%i.fa.fa-trash-o