From b815d10600e09ce4276a69759aabe31c66e2de95 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 22 Oct 2020 16:15:40 +0500 Subject: [PATCH] update: file manager select color --- filemanager/filemanager.py | 14 +++++++++++--- .../static/filemanager/js/codeMirror.js | 4 ++++ .../static/filemanager/js/fileManager.js | 13 +++++-------- .../templates/filemanager/editFile.html | 18 +++++++----------- static/filemanager/js/codeMirror.js | 4 ++++ static/filemanager/js/fileManager.js | 13 +++++-------- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/filemanager/filemanager.py b/filemanager/filemanager.py index e50952fe1..e347a6ca8 100755 --- a/filemanager/filemanager.py +++ b/filemanager/filemanager.py @@ -11,7 +11,8 @@ from filemanager.models import Trash class FileManager: modes = {'php': 'application/x-httpd-php', 'javascript': 'javascript', 'python': 'text/x-python', - 'html': 'text/html', 'go': 'text/x-go', 'css': 'text/css', 'java': 'text/x-java', 'perl': 'text/x-perl'} + 'html': 'text/html', 'go': 'text/x-go', 'css': 'text/css', 'java': 'text/x-java', 'perl': 'text/x-perl', + 'scss': 'text/x-sass'} def __init__(self, request, data): self.request = request @@ -29,12 +30,14 @@ class FileManager: return FileManager.modes['html'] elif fileName.endswith('.go'): return FileManager.modes['go'] - elif fileName.endswith('.css') or fileName.endswith('.scss'): + elif fileName.endswith('.css'): return FileManager.modes['css'] elif fileName.endswith('.pl') or fileName.endswith('.PL'): return FileManager.modes['perl'] elif fileName.endswith('.java'): return FileManager.modes['java'] + elif fileName.endswith('.scss'): + return FileManager.modes['scss'] else: return "" @@ -123,7 +126,12 @@ class FileManager: """ elif mode == FileManager.modes['perl']: return """ - """ + +""" + elif mode == FileManager.modes['scss']: + return """ + +""" else: return '' diff --git a/filemanager/static/filemanager/js/codeMirror.js b/filemanager/static/filemanager/js/codeMirror.js index 975ca1ff5..9127fd04d 100755 --- a/filemanager/static/filemanager/js/codeMirror.js +++ b/filemanager/static/filemanager/js/codeMirror.js @@ -199,4 +199,8 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) { }; + $scope.closeWindow = function () { + window.close(); + }; + }); \ No newline at end of file diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index 38c26ef5d..834c16d11 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -310,7 +310,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var collectionOfA = tableBody.getElementsByTagName("tr"); for (var i = 0; i < collectionOfA.length; i++) { - collectionOfA[i].style.background = "aliceblue"; + collectionOfA[i].style.background = "#ccdbe8"; var getFileName = collectionOfA[i].getElementsByTagName('td')[0].innerHTML; allFilesAndFolders.push(getFileName); } @@ -340,7 +340,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var check = 1; var getFileName = nodeName.getElementsByTagName('td')[0].innerHTML; - if (nodeName.style.backgroundColor === "aliceblue") { + if (nodeName.style.backgroundColor === "rgb(204, 219, 232)") { var tempArray = []; nodeName.style.background = "None"; @@ -356,7 +356,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, return; } - nodeName.style.background = "aliceblue"; + nodeName.style.background = "#ccdbe8"; for (var j = 0; j < allFilesAndFolders.length; j++) { @@ -1179,7 +1179,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, }; - /// move $scope.moveLoading = true; @@ -1196,7 +1195,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, } - $scope.startMoving = function () { $scope.moveLoading = false; @@ -1340,7 +1338,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var check = 1; var getFileName = nodeName.getElementsByTagName('td')[0].innerHTML; - if (nodeName.style.backgroundColor === "aliceblue") { + if (nodeName.style.backgroundColor === "#ccdbe8") { var tempArray = []; nodeName.style.background = "None"; @@ -1356,7 +1354,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, return; } - nodeName.style.background = "aliceblue"; + nodeName.style.background = "#ccdbe8"; for (var j = 0; j < allFilesAndFolders.length; j++) { @@ -1372,7 +1370,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, // activating deactivating functions $scope.buttonActivator(); - }; // rename diff --git a/filemanager/templates/filemanager/editFile.html b/filemanager/templates/filemanager/editFile.html index c97e8c828..2598558be 100755 --- a/filemanager/templates/filemanager/editFile.html +++ b/filemanager/templates/filemanager/editFile.html @@ -148,6 +148,13 @@ {{ additionalOptions | safe }} + + @@ -166,17 +173,6 @@ -
-
-
-

Editing {{ fileName }} - -

-
-
-
- diff --git a/static/filemanager/js/codeMirror.js b/static/filemanager/js/codeMirror.js index 975ca1ff5..9127fd04d 100644 --- a/static/filemanager/js/codeMirror.js +++ b/static/filemanager/js/codeMirror.js @@ -199,4 +199,8 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) { }; + $scope.closeWindow = function () { + window.close(); + }; + }); \ No newline at end of file diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js index 38c26ef5d..834c16d11 100644 --- a/static/filemanager/js/fileManager.js +++ b/static/filemanager/js/fileManager.js @@ -310,7 +310,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var collectionOfA = tableBody.getElementsByTagName("tr"); for (var i = 0; i < collectionOfA.length; i++) { - collectionOfA[i].style.background = "aliceblue"; + collectionOfA[i].style.background = "#ccdbe8"; var getFileName = collectionOfA[i].getElementsByTagName('td')[0].innerHTML; allFilesAndFolders.push(getFileName); } @@ -340,7 +340,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var check = 1; var getFileName = nodeName.getElementsByTagName('td')[0].innerHTML; - if (nodeName.style.backgroundColor === "aliceblue") { + if (nodeName.style.backgroundColor === "rgb(204, 219, 232)") { var tempArray = []; nodeName.style.background = "None"; @@ -356,7 +356,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, return; } - nodeName.style.background = "aliceblue"; + nodeName.style.background = "#ccdbe8"; for (var j = 0; j < allFilesAndFolders.length; j++) { @@ -1179,7 +1179,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, }; - /// move $scope.moveLoading = true; @@ -1196,7 +1195,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, } - $scope.startMoving = function () { $scope.moveLoading = false; @@ -1340,7 +1338,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var check = 1; var getFileName = nodeName.getElementsByTagName('td')[0].innerHTML; - if (nodeName.style.backgroundColor === "aliceblue") { + if (nodeName.style.backgroundColor === "#ccdbe8") { var tempArray = []; nodeName.style.background = "None"; @@ -1356,7 +1354,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, return; } - nodeName.style.background = "aliceblue"; + nodeName.style.background = "#ccdbe8"; for (var j = 0; j < allFilesAndFolders.length; j++) { @@ -1372,7 +1370,6 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, // activating deactivating functions $scope.buttonActivator(); - }; // rename