diff --git a/baseTemplate/static/baseTemplate/newBase.js b/baseTemplate/static/baseTemplate/newBase.js index d59d14d7a..93f88ee7d 100644 --- a/baseTemplate/static/baseTemplate/newBase.js +++ b/baseTemplate/static/baseTemplate/newBase.js @@ -205,8 +205,6 @@ newapp.config(['$interpolateProvider', function ($interpolateProvider) { }]); newapp.controller('dashboardV2', function ($scope, $http, $timeout) { - alert('dashboardV2'); - function getStuff() { diff --git a/dns/static/dns/dnsV2.js b/dns/static/dns/dnsV2.js index 912795d77..f2ca60231 100644 --- a/dns/static/dns/dnsV2.js +++ b/dns/static/dns/dnsV2.js @@ -271,8 +271,6 @@ newapp.controller('configureDefaultNameserversV2', function ($scope, $http) { newapp.controller('addModifyDNSRecordsCloudFlareV2', function ($scope, $http, $window) { - alert('Hello'); - $scope.saveCFConfigs = function () { $scope.recordsLoading = false; @@ -1279,14 +1277,19 @@ newapp.controller('addModifyDNSRecordsV2', function ($scope, $http) { ); var dnsTabButton = document.getElementById("dns_tab_button"); var apiTabButton = document.getElementById("api_tab_button"); + function changeBackgroundColor(button) { - var allButtons = document.querySelectorAll('.flex li'); - allButtons.forEach(function (btn) { - btn.classList.remove('bg-orange-400','text-white', 'show'); + // Select only the dnsTabButton and apiTabButton + var specificButtons = [dnsTabButton, apiTabButton]; + + specificButtons.forEach(function (btn) { + if (btn === button) { + btn.classList.add('bg-orange-400', 'text-white', 'show'); + } else { + btn.classList.remove('bg-orange-400', 'text-white', 'show'); + } btn.classList.add('bg-white'); }); - - button.classList.add('bg-orange-400','text-white', 'show'); } dnsTabButton.addEventListener("click", function () { diff --git a/filemanager/static/filemanager/js/fileManagerV2.js b/filemanager/static/filemanager/js/fileManagerV2.js index 9f7e237c6..a3139de06 100644 --- a/filemanager/static/filemanager/js/fileManagerV2.js +++ b/filemanager/static/filemanager/js/fileManagerV2.js @@ -35,13 +35,13 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w var allFilesAndFolders = []; $scope.showUploadBox = function () { - $('#uploadBox').modal('show'); + // $('#uploadBox').modal('show'); }; $scope.showHTMLEditorModal = function (MainFM = 0) { $scope.htmlEditorLoading = false; $scope.errorMessageEditor = true; - $('#showHTMLEditor').modal('show'); + // $('#showHTMLEditor').modal('show'); $scope.fileInEditor = allFilesAndFolders[0]; $scope.getFileContents(MainFM); }; @@ -446,14 +446,9 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w } - - - $scope.fetchForTableSecondary = function (node, functionName) { - console.log("habbi.................run"); - allFilesAndFolders = []; $scope.buttonActivator(); url = "/filemanager/controller"; @@ -576,12 +571,10 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w }; - // Button Activator + // Button Activator $scope.buttonActivator = function () { - console.log("----------cal button activater------------"); - // for restore button if ($scope.currentPath === trashPath) { var restoreBTN = document.getElementById("restoreRight"); @@ -591,143 +584,142 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w restoreBTN.style.display = "none"; } - console.log("----------cal button activater-----------1-"); - // for edit button - if (allFilesAndFolders.length === 1) { - var editNode = document.getElementById("editFile"); - editNode.style.pointerEvents = "auto"; - - var editNotRight = document.getElementById("editOnRight"); - - var result = findFileExtension(allFilesAndFolders[0]); - - if (result !== undefined) { - if (result[0] === "js") { - aceEditorMode = "ace/mode/javascript"; - editNotRight.style.display = "Block"; - } else if (result[0] === "html") { - aceEditorMode = "ace/mode/html"; - editNotRight.style.display = "Block"; - } else if (result[0] === "css") { - aceEditorMode = "ace/mode/css"; - editNotRight.style.display = "Block"; - } else if (result[0] === "php") { - aceEditorMode = "ace/mode/php"; - editNotRight.style.display = "Block"; - } else if (result[0] === "py") { - aceEditorMode = "ace/mode/python"; - editNotRight.style.display = "Block"; - } else if (result[0] === "txt") { - aceEditorMode = ""; - editNotRight.style.display = "Block"; - } else if (result[0] === "htaccess") { - aceEditorMode = ""; - editNotRight.style.display = "Block"; - } else { - var editNode = document.getElementById("editFile"); - editNode.style.pointerEvents = "none"; - editNotRight.style.display = "None"; - } - } else { - var editNode = document.getElementById("editFile"); - editNode.style.pointerEvents = "none"; - editNotRight.style.display = "None"; - } - } else { - var editNode = document.getElementById("editFile"); - editNode.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length === 1) { + // var editNode = document.getElementById("editFile"); + // editNode.style.pointerEvents = "auto"; + // + // var editNotRight = document.getElementById("editOnRight"); + // + // var result = findFileExtension(allFilesAndFolders[0]); + // + // if (result !== undefined) { + // if (result[0] === "js") { + // aceEditorMode = "ace/mode/javascript"; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "html") { + // aceEditorMode = "ace/mode/html"; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "css") { + // aceEditorMode = "ace/mode/css"; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "php") { + // aceEditorMode = "ace/mode/php"; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "py") { + // aceEditorMode = "ace/mode/python"; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "txt") { + // aceEditorMode = ""; + // editNotRight.style.display = "Block"; + // } else if (result[0] === "htaccess") { + // aceEditorMode = ""; + // editNotRight.style.display = "Block"; + // } else { + // var editNode = document.getElementById("editFile"); + // editNode.style.pointerEvents = "none"; + // editNotRight.style.display = "None"; + // } + // } else { + // var editNode = document.getElementById("editFile"); + // editNode.style.pointerEvents = "none"; + // editNotRight.style.display = "None"; + // } + // } else { + // var editNode = document.getElementById("editFile"); + // editNode.style.pointerEvents = "none"; + // } // extraction button - if (allFilesAndFolders.length === 1) { - var extractFileNode = document.getElementById("extractFile"); - extractFileNode.style.pointerEvents = "auto"; - - var extractNodeRight = document.getElementById("extractOnRight"); - - var result = findFileExtension(allFilesAndFolders[0]); - - if (result !== undefined) { - if (result[0] === "gz") { - extractFileNode.style.pointerEvents = "auto"; - extractNodeRight.style.display = "Block"; - } else if (result[0] === "zip") { - extractFileNode.style.pointerEvents = "auto"; - extractNodeRight.style.display = "Block"; - } else { - extractFileNode.style.pointerEvents = "none"; - extractNodeRight.style.display = "None"; - } - } else { - extractFileNode.style.pointerEvents = "none"; - extractNodeRight.style.display = "None"; - } - } else { - var extractFileNode = document.getElementById("extractFile"); - extractFileNode.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length === 1) { + // var extractFileNode = document.getElementById("extractFile"); + // extractFileNode.style.pointerEvents = "auto"; + // + // var extractNodeRight = document.getElementById("extractOnRight"); + // + // var result = findFileExtension(allFilesAndFolders[0]); + // + // if (result !== undefined) { + // if (result[0] === "gz") { + // extractFileNode.style.pointerEvents = "auto"; + // extractNodeRight.style.display = "Block"; + // } else if (result[0] === "zip") { + // extractFileNode.style.pointerEvents = "auto"; + // extractNodeRight.style.display = "Block"; + // } else { + // extractFileNode.style.pointerEvents = "none"; + // extractNodeRight.style.display = "None"; + // } + // } else { + // extractFileNode.style.pointerEvents = "none"; + // extractNodeRight.style.display = "None"; + // } + // } else { + // var extractFileNode = document.getElementById("extractFile"); + // extractFileNode.style.pointerEvents = "none"; + // } // move button - if (allFilesAndFolders.length >= 1) { - - var moveFileNode = document.getElementById("moveFile"); - moveFileNode.style.pointerEvents = "auto"; - } else { - var moveFileNode = document.getElementById("moveFile"); - moveFileNode.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length >= 1) { + // + // var moveFileNode = document.getElementById("moveFile"); + // moveFileNode.style.pointerEvents = "auto"; + // } else { + // var moveFileNode = document.getElementById("moveFile"); + // moveFileNode.style.pointerEvents = "none"; + // } //copy button - if (allFilesAndFolders.length >= 1) { - - var copeFileNode = document.getElementById("copyFile"); - copeFileNode.style.pointerEvents = "auto"; - } else { - var copeFileNode = document.getElementById("copyFile"); - copeFileNode.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length >= 1) { + // + // var copeFileNode = document.getElementById("copyFile"); + // copeFileNode.style.pointerEvents = "auto"; + // } else { + // var copeFileNode = document.getElementById("copyFile"); + // copeFileNode.style.pointerEvents = "none"; + // } + // } // rename button - if (allFilesAndFolders.length === 1) { - - var renameFileNode = document.getElementById("renameFile"); - renameFileNode.style.pointerEvents = "auto"; - } else { - var renameFileNode = document.getElementById("renameFile"); - renameFileNode.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length === 1) { + // + // var renameFileNode = document.getElementById("renameFile"); + // renameFileNode.style.pointerEvents = "auto"; + // } else { + // var renameFileNode = document.getElementById("renameFile"); + // renameFileNode.style.pointerEvents = "none"; + // } // compress button - if (allFilesAndFolders.length >= 1) { - var compressFile = document.getElementById("compressFile"); - compressFile.style.pointerEvents = "auto"; - } else { - var compressFile = document.getElementById("compressFile"); - compressFile.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length >= 1) { + // var compressFile = document.getElementById("compressFile"); + // compressFile.style.pointerEvents = "auto"; + // } else { + // var compressFile = document.getElementById("compressFile"); + // compressFile.style.pointerEvents = "none"; + // } // move button - if (allFilesAndFolders.length >= 1) { - - var deleteFile = document.getElementById("deleteFile"); - deleteFile.style.pointerEvents = "auto"; - } else { - var deleteFile = document.getElementById("deleteFile"); - deleteFile.style.pointerEvents = "none"; - } + // if (allFilesAndFolders.length >= 1) { + // + // var deleteFile = document.getElementById("deleteFile"); + // deleteFile.style.pointerEvents = "auto"; + // } else { + // var deleteFile = document.getElementById("deleteFile"); + // deleteFile.style.pointerEvents = "none"; + // } }; @@ -915,7 +907,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.createSuccess = true; $scope.errorMessageFolder = true; $scope.newFolderName = ""; - $('#showCreateFolder').modal('show'); + // $('#showCreateFolder').modal('show'); }; $scope.createFolderEnter = function ($event) { @@ -966,7 +958,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w if (response.data.status === 1) { $scope.createSuccess = false; $scope.fetchForTableSecondary(null, 'refresh'); - $('#showCreateFolder').modal('hide'); + // $('#showCreateFolder').modal('hide'); } else { $scope.errorMessageFolder = false; $scope.error_message = response.data.error_message; @@ -988,7 +980,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.createSuccess = true; $scope.errorMessageFile = true; $scope.newFileName = ""; - $('#showCreateFile').modal('show'); + // $('#showCreateFile').modal('show'); }; $scope.createFileEnter = function ($event) { @@ -996,6 +988,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w if (keyCode === 13) { $scope.htmlEditorLoading = false; $scope.createNewFile(); + $scope.fetchForTableSecondary(null, 'refresh'); } }; @@ -1039,7 +1032,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w if (response.data.status === 1) { $scope.createSuccess = false; $scope.fetchForTableSecondary(null, 'refresh'); - $('#showCreateFile').modal('hide'); + // $('#showCreateFile').modal('hide'); } else { $scope.errorMessageFile = false; $scope.error_message = response.data.error_message; @@ -1060,7 +1053,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.deleteLoading = true; $scope.showDeleteModal = function () { - $('#showDelete').modal('show'); + // $('#showDelete').modal('show'); }; $scope.deleteFolderOrFile = function () { @@ -1099,7 +1092,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.deleteLoading = true; if (response.data.status === 1) { - $('#showDelete').modal('hide'); + // $('#showDelete').modal('hide'); var notification = alertify.notify('Successfully Deleted!', 'success', 5, function () { }); $scope.fetchForTableSecondary(null, 'refresh'); @@ -1122,7 +1115,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.compressionLoading = true; $scope.showCompressionModal = function () { - $('#showCompression').modal('show'); + // $('#showCompression').modal('show'); $scope.listOfFiles = ""; $scope.compressedFileName = ""; @@ -1167,7 +1160,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.compressionLoading = true; - $('#showCompression').modal('hide'); + // $('#showCompression').modal('hide'); if (response.data.status === 1) { var notification = alertify.notify('Successfully Compressed!', 'success', 5, function () { }); @@ -1190,7 +1183,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.showExtractionModal = function () { $scope.extractionLocation = $scope.currentPath; - $('#showExtraction').modal('show'); + // $('#showExtraction').modal('show'); $scope.fileToBeExtracted = allFilesAndFolders[0]; }; @@ -1239,7 +1232,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.extractionLoading = true; - $('#showExtraction').modal('hide'); + // $('#showExtraction').modal('hide'); if (response.data.status === 1) { var notification = alertify.notify('Successfully Extracted!', 'success', 5, function () { @@ -1264,7 +1257,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.moveLoading = true; $scope.showMoveModal = function () { - $('#showMove').modal('show'); + // $('#showMove').modal('show'); $scope.pathToMoveTo = $scope.currentPath; $scope.listOfFiles = ""; @@ -1309,7 +1302,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.moveLoading = true; - $('#showMove').modal('hide'); + // $('#showMove').modal('hide'); if (response.data.status === 1) { var notification = alertify.notify('Successfully Moved!', 'success', 5, function () { @@ -1332,7 +1325,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.copyLoading = true; $scope.showCopyModal = function () { - $('#showCopy').modal('show'); + // $('#showCopy').modal('show'); $scope.pathToCopyTo = $scope.currentPath; $scope.listOfFiles = ""; @@ -1378,7 +1371,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.copyLoading = true; - $('#showCopy').modal('hide'); + // $('#showCopy').modal('hide'); if (response.data.status === 1) { var notification = alertify.notify('Successfully Copied!', 'success', 5, function () { @@ -1472,7 +1465,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w $scope.renameLoading = true; $scope.showRenameModal = function () { - $('#showRename').modal('show'); + // $('#showRename').modal('show'); $scope.fileToRename = allFilesAndFolders[0]; $scope.newFileName = ""; }; @@ -1518,7 +1511,7 @@ newapp.controller('fileManagerCtrlV2', function ($scope, $http, FileUploader, $w function ListInitialDatas(response) { $scope.moveLoading = true; - $('#showRename').modal('hide'); + // $('#showRename').modal('hide'); $scope.renameLoading = true; if (response.data.status === 1) { diff --git a/filemanager/templates/filemanager/indexv2.html b/filemanager/templates/filemanager/indexv2.html index 84b25f81a..cc607b900 100644 --- a/filemanager/templates/filemanager/indexv2.html +++ b/filemanager/templates/filemanager/indexv2.html @@ -29,11 +29,25 @@ {##} {# #} + + + + + + + + + + +
- +
+ + {{ domainName }} +
-
+ @@ -66,8 +83,9 @@
    -
  • - + {% trans "Upload" %}
    {% trans "Upload queue" %}

    {% trans "Queue length:" %} {$ uploader.queue.length $}

    -
    +
    -

    {% trans "Drop" %}

    -

    {% trans "Drop Files here to upload them." %}

    +

    {% trans "Drop" %}

    +

    {% trans "Drop Files here to upload them." %}

    @@ -147,37 +166,63 @@ {$ item.file.size / 1024 / 1024 | number:2 $} MB -
    -
    +
    +
    +
    - - - - + + + + + + + + + + + + + - - - - + +
    + + + +
    @@ -186,15 +231,19 @@
    {% trans "Queue progress:" %} -
    -
    +
    +
    +
    -
    -
    • -
  • - + {% trans "New File" %} @@ -263,6 +314,7 @@ {% trans "File will be created in your current directory, if it already exists it will not overwirte." %}
@@ -287,8 +339,10 @@
-
  • - + {% trans "New Folder" %} @@ -321,6 +375,7 @@ {% trans "Folder will be created in your current directory" %}
    • @@ -346,7 +401,9 @@
  • - {% trans "Delete" %}
    - -
    @@ -388,8 +446,10 @@
    • -
  • - + {% trans "Copy" %}
    {% trans "Enter a path to copy your files to!" %}
    - -
    @@ -430,8 +491,10 @@
    • -
  • - + {% trans "Move" %}
    {% trans "Enter a path to move your files!" %}
    - -
    @@ -472,8 +536,10 @@
    • -
  • - + {% trans "Rename" %}
    - + data-modal-toggle="rename" + data-modal-hide="rename">{% trans "Close" %}
  • - {% trans "Edit" %}
    - @@ -570,7 +641,9 @@
  • - {% trans "Compress" %}
    -
    @@ -622,7 +697,9 @@
  • - {% trans "Extract" %} @@ -652,13 +729,22 @@ {% trans "You can enter . to extract in current directory!" %}
    -
    • +
  • + {% trans "Fix Permissions" %} +
    • + + +
    @@ -690,23 +776,23 @@
    -
    +
    - - + - - - - @@ -718,10 +804,10 @@ -
    -

    Selected Plugin

    +
    +
    + File Name + Size (KB) + Last Modified + Permissions
    @@ -91,17 +98,22 @@ - + style="text-transform: none"> + + + style="text-transform: none"> + - + @@ -111,6 +123,12 @@ +
    + +
    {% endblock %}
    + Issue SSL + style="text-transform: none"> + Issue SSL + style="text-transform: none">