Merged in dev (pull request #110)

Dev

coco/httpd/elfinder/connector.py

 import logging
-import json
 
 logger = logging.getLogger(__name__)
 

coco/httpd/elfinder/volumes/sftp.py

@@ -51,9 +51,9 @@ class SFTPVolume(BaseVolume):
             "name": attr.filename,
             "hash": self._hash(path),
             "phash": self._hash(parent_path),
-            "ts": 0,
-            "size": 'unknown',
-            "mime": "directory" if stat.S_ISDIR(attr.st_mode) else "file",
+            "ts": attr.st_mtime,
+            "size": attr.st_size,
+            "mime": "directory" if stat.S_ISDIR(attr.st_mode) else "",
             "locked": 0,
             "hidden": 0,
             "read": 1,
@@ -151,7 +151,7 @@ class SFTPVolume(BaseVolume):
 
         with self.sftp.open(remote_path, mode='w'):
             pass
-        return self._info(parent_path)
+        return self._info(path)
 
     def rename(self, name, target):
         """ Renames a file or directory. """

coco/httpd/static/plugins/elfinder/css/theme-gray.css

@@ -505,7 +505,8 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
   margin-right: 5px;
 }
 div.elfinder-cwd-wrapper-list .ui-icon-grip-dotted-vertical {
-  margin: 2px;
+  margin: 1px;
+  float: right;
 }
 .elfinder-cwd-view-list .elfinder-navbar-root-local td .elfinder-cwd-icon,
 .elfinder-navbar-root-local .elfinder-cwd-icon,

coco/httpd/templates/elfinder/file_manager.html

@@ -27,7 +27,8 @@
                         ['rm'],
                         ['rename'],
                         ['view']
-                    ]
+                    ],
+                    cwd : {oldSchool: true}
 	    		},
                 customData: {'sid': sid},
                 height: '100%',
@@ -41,7 +42,7 @@
                         'rm'
                     ],
                     cwd: [
-                        'reload', 'back', '|', 'mkdir', 'mkfile', '|',
+                        'reload', 'back', 'up', '|', 'mkdir', 'mkfile', '|',
                         'upload', 'paste'
                     ],
                     files: [

coco/sftp.py

@@ -150,7 +150,7 @@ class SFTPServer(paramiko.SFTPServerInterface):
             request['su'] = su
             request['su_unique'] = True
         else:
-            request['su'] = path.pop() if path else ''
+            request['su'], path = (path[0], path[1:]) if path else ('', path)
         request['dpath'] = '/'.join(path)
         return request