deleting stuff is scary, lets move the button as far to the right as possible

it doesn't fit good currently in the column but will be fixed with using icons

diff --git a/files/css/files.css b/files/css/files.css
index 590c7bac364431f71f9554fd4f4ac3d5ed7cf489..37cb64bff0b34bd7ec9373f2af08dd098878808d 100644 (file)
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -88,7 +88,7 @@ table td.filesize, table td.date
 
 table td.date
 {
-    width: 11em;
+    width: 12em;
 }
 
 table td.selection, table th.selection, table td.fileaction

diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index a6891a5f82df4a514b0f110754978b2156d00cfb..4920e803b71e0a8bbd5f86461523979803901dd9 100644 (file)
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -54,7 +54,7 @@ FileActions={
                var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
                var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
                for(name in actions){
-                       if(actions[name]!=defaultAction){
+                       if(actions[name]!=defaultAction && name!='Delete'){
                                var html='<a href="#" alt="'+name+'">'+name+'</a>';
                                var element=$(html);
                                element.data('action',name);
@@ -69,12 +69,27 @@ FileActions={
                                $('#file_menu').append(element);
                        }
                }
+               if(actions['Delete']){
+                       var html='<a href="#" alt="Delete" id="action_delete">Delete</a>';
+                       var element=$(html);
+                       element.data('action','Delete');
+                       element.click(function(event){
+                               event.stopPropagation();
+                               event.preventDefault();
+                               var action=actions[$(this).data('action')];
+                               var currentFile=FileActions.getCurrentFile();
+                               FileActions.hide();
+                               action(currentFile);
+                       });
+                       parent.parent().children().last().append(element);
+               }
                $('#file_menu').show();
                return false;
        },
        hide:function(){
                $('#file_menu').hide();
                $('#file_menu').empty();
+               $('#action_delete').remove();
                $('body').append($('#file_menu'));
        },
        getCurrentFile:function(){