Add ImJoy integration (#95)

* take out main.js * Use waitress as production server * Fix readme * Add initial plugin code * Support imjoy dialog * Bump version * Fix jquery warning * Fix mkdir bug
imjoy-team · Apr 23, 2020 · 75de7d1 · 75de7d1
1 parent 1b0cb18
commit 75de7d1
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 210 deletions.
diff --git a/imjoy_elfinder/VERSION b/imjoy_elfinder/VERSION
@@ -1,3 +1,3 @@
 {
-    "version": "0.1.49"
+    "version": "0.1.50"
 }
diff --git a/imjoy_elfinder/app.py b/imjoy_elfinder/app.py
@@ -1,4 +1,4 @@
-"""Provide a main module."""
+"""Provide the app module."""
 import argparse
 import json
 import os

diff --git a/imjoy_elfinder/elfinder.py b/imjoy_elfinder/elfinder.py
@@ -617,7 +617,7 @@ def __rename(self) -> None:
 
         if os.path.exists(new_name):
             self._response[R_ERROR] = (
-                "File or folder with the same name" + "already exists"
+                "File or folder with the same name " + new_name + " already exists"
             )
             return
 
@@ -675,9 +675,11 @@ def __mkdir(self) -> None:
                     return
 
                 new_subdir = os.path.join(path, subdir)
-                if os.path.exists(subdir):
+                if os.path.exists(new_subdir):
                     self._response[R_ERROR] = (
-                        "File or folder with the same name" + subdir + " already exists"
+                        "File or folder with the same name "
+                        + subdir
+                        + " already exists"
                     )
                     return
                 try:
@@ -998,7 +1000,9 @@ def __paste(self) -> None:
                         return
                     # TODO thumbs  # pylint: disable=fixme
                     if os.path.exists(new_dst):
-                        self._response[R_ERROR] = "Unable to move files"
+                        self._response[
+                            R_ERROR
+                        ] = "File or folder with the same name already exists"
                         self._set_error_data(
                             fil, "File or folder with the same name already exists"
                         )

diff --git a/imjoy_elfinder/templates/elfinder/elfinder.html b/imjoy_elfinder/templates/elfinder/elfinder.html
@@ -8,6 +8,7 @@
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script>
 		<script src="https://lib.imjoy.io/imjoy-loader.js"></script>
 		<script>{% include "elfinder/main.js" %}</script>
+		<style>{% include "elfinder/main.css" %}</style>
 	</head>
 	<body>
 

diff --git a/imjoy_elfinder/templates/elfinder/main.css b/imjoy_elfinder/templates/elfinder/main.css
@@ -0,0 +1,17 @@
+.elfinder-quicklook-titlebar-icon .ui-icon {
+    margin-top: -2px!important;
+}
+.ui-dialog-buttonset {
+    order: 4;
+    margin-left: 5px;
+    margin-right: 5px;
+    min-width: 100px;
+}
+.dialog-btn{
+    height: 20px;
+    font-size: 0.6rem!important;
+    width: 35px;
+    padding-top: 0px!important;
+    padding-bottom: 2px!important;
+    padding-left: 5px!important;
+}