Fixed admin, orders, wiki views. Converted all erb to haml.
This commit is contained in:
parent
699fb9b233
commit
552c553b77
169 changed files with 1158 additions and 1307 deletions
|
|
@ -17,10 +17,10 @@
|
|||
= highlighted_required_users task
|
||||
%td
|
||||
- if !task.is_accepted?(current_user)
|
||||
= link_to "Aufgabe übernehmen", accept_task_path(task), method: :post, class: 'btn'
|
||||
= link_to "Aufgabe ablehnen", reject_task_path(task), method: :post, class: 'btn' if task.is_assigned?(current_user)
|
||||
= link_to "Aufgabe übernehmen", accept_task_path(task), method: :post, class: 'btn btn-small'
|
||||
= link_to "Aufgabe ablehnen", reject_task_path(task), method: :post, class: 'btn btn-small' if task.is_assigned?(current_user)
|
||||
- elsif !task.done
|
||||
= link_to set_done_task_path(task), method: :post, class: 'btn',
|
||||
= link_to set_done_task_path(task), method: :post, class: 'btn btn-small',
|
||||
title: 'Aufgabe als erledigt markieren' do
|
||||
%i.icon-ok
|
||||
Erledigt?
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
$('#tasks').html('<%= escape_javascript(render("archive_tasks")) %>');
|
||||
1
app/views/tasks/archive.js.haml
Normal file
1
app/views/tasks/archive.js.haml
Normal file
|
|
@ -0,0 +1 @@
|
|||
$('#tasks').html('#{escape_javascript(render("archive_tasks"))}');
|
||||
Loading…
Add table
Add a link
Reference in a new issue