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

Merge pull request #20 from skiprope/ans-delete-ux 

Rename 'delete answer' to 'return to inbox' for clarity
This commit is contained in:
Georg G. 2015-04-24 06:29:31 +02:00
parent 3a2bf6c2fc 4ad9916c7e
commit e4118c0013
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/answerbox/destroy.coffee
View File

@ -3,12 +3,13 @@ $(document).on "click", "a[data-action=ab-destroy]", (ev) ->
btn = $(this) btn = $(this)
aid = btn[0].dataset.aId aid = btn[0].dataset.aId
swal swal
title: "Really delete?" title: "Are you sure?"
text: "The question will be moved back to your inbox." text: "The question will be moved back to your inbox, but it won't delete any posts to social media."
type: "warning" type: "warning"
showCancelButton: true showCancelButton: true
confirmButtonColor: "#DD6B55" confirmButtonColor: "#DD6B55"
confirmButtonText: "Delete" confirmButtonText: "Yes"
cancelButtonText: "No"
closeOnConfirm: true closeOnConfirm: true
, -> , ->
$.ajax $.ajax

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

@ -36,7 +36,7 @@
%li.text-danger %li.text-danger
%a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }} %a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }}
%i.fa.fa-trash-o %i.fa.fa-trash-o
Delete Return to Inbox
- unless a.user == current_user - unless a.user == current_user
%li %li
%a{href: '#', data: { a_id: a.id, action: 'ab-report' }} %a{href: '#', data: { a_id: a.id, action: 'ab-report' }}