diff --git a/htdocs/files.html b/htdocs/files.html index 0125d0f4..f277b8ce 100644 --- a/htdocs/files.html +++ b/htdocs/files.html @@ -6,7 +6,6 @@ - ${header}
diff --git a/htdocs/files.js b/htdocs/files.js deleted file mode 100644 index a663729f..00000000 --- a/htdocs/files.js +++ /dev/null @@ -1,17 +0,0 @@ -function saveCanvas(canvas, name) { - var a = document.createElement('a'); - - canvas.toBlob(function(blob) { - a.href = window.URL.createObjectURL(blob); - }, 'image/png'); - - a.style = 'display: none'; - a.download = name; - document.body.appendChild(a); - a.click(); - - setTimeout(function() { - document.body.removeChild(a); - window.URL.revokeObjectURL(a.href); - }, 0); -} diff --git a/owrx/controllers/file.py b/owrx/controllers/file.py index 0589693d..36028e04 100644 --- a/owrx/controllers/file.py +++ b/owrx/controllers/file.py @@ -35,8 +35,9 @@ class FileController(ModificationAwareController): self.send_response("file '%s' not found" % file, code=404) def indexAction(self): + tmpDir = CoreConfig().get_temporary_directory() filename = self.request.matches.group(1) - self.serve_file("/tmp/" + filename) + self.serve_file("%s/%s" % (tmpDir, filename)) class FilesController(WebpageController): @@ -49,11 +50,19 @@ class FilesController(WebpageController): if i % 3 == 0: rows += '\n' # Print out individual tiles - rows += ('' % (files[i], files[i])) + ('

%s

\n' % files[i]) + rows += ('' + + ('' % (files[i], files[i])) + + ('' % (files[i], files[i])) + + ('

%s

' % files[i]) + + '
\n') # Finish a row if i % 3 == 2: rows += '\n' + # Finish final row + if len(files) > 0 and len(files) % 3 != 0: + rows += '\n' + variables = super().template_variables() variables["rows"] = rows return variables