consistent file menus: Upload - Download at the top of the menu, Properties is the...

diff --git a/gss/src/gr/ebs/gss/client/FileContextMenu.java b/gss/src/gr/ebs/gss/client/FileContextMenu.java
index edcdd51..8265559 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FileContextMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileContextMenu.java
@@ -149,17 +149,16 @@ public class FileContextMenu extends PopupPanel implements ClickListener {
                        trashItem = new MenuItem("<span>" + newImages.emptyTrash().getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(this));
                        deleteItem = new MenuItem("<span>" + newImages.delete().getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(this, images));
 
-                       contextMenu.addItem(cutItem);
-                       contextMenu.addItem(copyItem);
                        contextMenu.addItem(updateItem);
-
-                       contextMenu.addItem(propItem);
-                       contextMenu.addItem(trashItem);
-                       contextMenu.addItem(deleteItem);
                        String[] link = {"", ""};
                        GSS.get().getTopPanel().getFileMenu().createDownloadLink(link);
                        downloadItem = new MenuItem("<span>" + link[0] + newImages.download().getHTML() + " Download" + link[1] + "</span>", true, downloadCmd);
                        contextMenu.addItem(downloadItem);
+                       contextMenu.addItem(cutItem);
+                       contextMenu.addItem(copyItem);
+                       contextMenu.addItem(trashItem);
+                       contextMenu.addItem(deleteItem);
+                       contextMenu.addItem(propItem);
 
                }
 

diff --git a/gss/src/gr/ebs/gss/client/FileMenu.java b/gss/src/gr/ebs/gss/client/FileMenu.java
index 9e3066b..0f4b38d 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FileMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileMenu.java
@@ -189,14 +189,14 @@ public class FileMenu extends PopupPanel implements ClickListener {
                boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);\r
                contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));\r
                contextMenu.addItem("<span>" + images.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));\r
-               contextMenu     .addItem("<span>" + images.viewText().getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images))\r
-                                       .setVisible(!propertiesNotVisible);\r
-               contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));\r
                if (downloadVisible) {\r
                        String[] link = {"", ""};\r
                        createDownloadLink(link);\r
                        contextMenu.addItem("<span>" + link[0] + images.download().getHTML() + "&nbsp;Download" + link[1] + "</span>", true, downloadCmd);\r
                }\r
+               contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));\r
+               contextMenu     .addItem("<span>" + images.viewText().getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images))\r
+                                       .setVisible(!propertiesNotVisible);\r
                return contextMenu;\r
        }\r
 \r