Tasks: Add delete action

diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index 596e2e2515223f34f150ba69c66f80d8a70fb1f6..f6333f57b8a0a3677f096ccebfc866362ffc9dd6 100644 (file)
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -57,3 +57,5 @@
 .task .due{position:absolute;right:0.3em;}
 .task .due .date{width:6em;}
 .task .due .time{width:6em;}
+
+.task_delete{position:absolute;bottom:2px;right:5px}

diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index 6547b80981c816d17007bc1250db0362dcc1d17d..bc92965bb0b9802d47ed9ef179f7413659690f85 100644 (file)
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -97,8 +97,10 @@ OC.Tasks = {
                                due.find('.time').timepicker('setTime', date.getHours()+':'+date.getMinutes());
                        }
                }
+               var delete_action = task_container.find('.task_delete').click(OC.Tasks.deleteClickHandler);
                $('<div>')
                        .addClass('more')
+                       .append(delete_action)
                        .append(description)
                        .append(due)
                        .appendTo(task_container);
@@ -273,6 +275,19 @@ OC.Tasks = {
                $task.find('div.location').show();
                $task.find('input.location').hide();
        },
+       deleteClickHandler:function(event){
+               var $task = $(this).closest('.task'),
+                       task = $task.data('task');
+               $.post(OC.filePath('tasks', 'ajax', 'delete.php'),{'id':task.id},function(jsondata){
+                       if(jsondata.status == 'success'){
+                               $task.remove();
+                       }
+                       else{
+                               alert(jsondata.data.message);
+                       }
+               });
+               return false;
+       },
        complete_task:function() {
                var $task = $(this).closest('.task'),
                        task = $task.data('task'),
@@ -441,21 +456,6 @@ $(document).ready(function(){
                });
        });
 
-       $('#tasks_delete').live('click',function(){
-               var id = $('#task_details').data('id');
-               $.post('ajax/delete.php',{'id':id},function(jsondata){
-                       if(jsondata.status == 'success'){
-                               $('#tasks [data-id="'+jsondata.data.id+'"]').remove();
-                               $('#task_details').data('id','');
-                               $('#task_details').html('');
-                       }
-                       else{
-                               alert(jsondata.data.message);
-                       }
-               });
-               return false;
-       });
-
        $('#tasks_addtask').click(function(){
                var input = $('#tasks_newtask').val();
                $.post(OC.filePath('tasks', 'ajax', 'addtask.php'),{text:input},function(jsondata){

diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
index c0e2f8d4e23b8099cf7ed0b61fd53a9677de3fd3..8c0c89e49702f0740a462d26850ed5c47b047cba 100644 (file)
--- a/apps/tasks/templates/tasks.php
+++ b/apps/tasks/templates/tasks.php
@@ -25,6 +25,9 @@
        <span class="task_less">
                <img title="<?php echo $l->t('Less') ?>" src="<?php echo OCP\image_path('core', 'actions/triangle-n.svg') ?>" class="svg"><?php echo $l->t('Less') ?>
        </span>
+       <span class="task_delete">
+               <img title="<?php echo $l->t('Delete') ?>" src="<?php echo OCP\image_path('core', 'actions/delete.svg') ?>" class="svg"><?php echo $l->t('Delete') ?>
+       </span>
 </p>
 <script type='text/javascript'>
 var categories = <?php echo json_encode($_['categories']); ?>;