diff --git a/ApachController/ApacheController.py b/ApachController/ApacheController.py old mode 100755 new mode 100644 diff --git a/ApachController/ApacheVhosts.py b/ApachController/ApacheVhosts.py old mode 100755 new mode 100644 diff --git a/ApachController/__init__.py b/ApachController/__init__.py old mode 100755 new mode 100644 diff --git a/ApachController/phpApache.xml b/ApachController/phpApache.xml old mode 100755 new mode 100644 diff --git a/CLManager/CLPackages.py b/CLManager/CLPackages.py old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/cloudLinux.html b/CLManager/templates/CLManager/cloudLinux.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/createPackage.html b/CLManager/templates/CLManager/createPackage.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/listPackages.html b/CLManager/templates/CLManager/listPackages.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/listWebsites.html b/CLManager/templates/CLManager/listWebsites.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/monitorUsage.html b/CLManager/templates/CLManager/monitorUsage.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/notAvailable.html b/CLManager/templates/CLManager/notAvailable.html old mode 100755 new mode 100644 diff --git a/CLManager/templates/CLManager/websiteContainerLimit.html b/CLManager/templates/CLManager/websiteContainerLimit.html old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxAdmins.py b/CLScript/CloudLinuxAdmins.py old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxDB.py b/CLScript/CloudLinuxDB.py old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxDomains.py b/CLScript/CloudLinuxDomains.py old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxPackages.py b/CLScript/CloudLinuxPackages.py old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxResellers.py b/CLScript/CloudLinuxResellers.py old mode 100755 new mode 100644 diff --git a/CLScript/CloudLinuxUsers.py b/CLScript/CloudLinuxUsers.py old mode 100755 new mode 100644 diff --git a/CLScript/UserInfo.py b/CLScript/UserInfo.py old mode 100755 new mode 100644 diff --git a/CLScript/panel_info.py b/CLScript/panel_info.py old mode 100755 new mode 100644 diff --git a/CyberCP/__init__.py b/CyberCP/__init__.py old mode 100755 new mode 100644 diff --git a/CyberCP/secMiddleware.py b/CyberCP/secMiddleware.py old mode 100755 new mode 100644 diff --git a/CyberCP/settings.py b/CyberCP/settings.py old mode 100755 new mode 100644 index a7268ff35..e50b5abce --- a/CyberCP/settings.py +++ b/CyberCP/settings.py @@ -104,25 +104,25 @@ WSGI_APPLICATION = 'CyberCP.wsgi.application' # Database # https://docs.djangoproject.com/en/1.11/ref/settings/#databases + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'cyberpanel', 'USER': 'cyberpanel', - 'PASSWORD': 'JjWbFBFDxMI8D8', + 'PASSWORD': 'SLTUIUxqhulwsh', 'HOST': 'localhost', - 'PORT': '' + 'PORT':'' }, 'rootdb': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'mysql', 'USER': 'root', - 'PASSWORD': 'JjWbFBFDxMI8D8', + 'PASSWORD': 'SLTUIUxqhulwsh', 'HOST': 'localhost', 'PORT': '', }, } - DATABASE_ROUTERS = ['backup.backupRouter.backupRouter'] # Password validation diff --git a/CyberCP/urls.py b/CyberCP/urls.py old mode 100755 new mode 100644 diff --git a/CyberCP/wsgi.py b/CyberCP/wsgi.py old mode 100755 new mode 100644 diff --git a/IncBackups/static/IncBackups/IncBackups.js b/IncBackups/static/IncBackups/IncBackups.js index 07815a432..a3b5e4634 100644 --- a/IncBackups/static/IncBackups/IncBackups.js +++ b/IncBackups/static/IncBackups/IncBackups.js @@ -4,7 +4,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { $scope.destination = true; $scope.backupButton = true; - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.runningBackup = true; $scope.restoreSt = true; @@ -48,7 +48,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { $scope.destination = false; $scope.runningBackup = false; $scope.backupButton = false; - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.fileName = response.data.fileName; $scope.status = response.data.status; $scope.populateCurrentRecords(); @@ -66,7 +66,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { } else { $timeout.cancel(); $scope.cyberpanelLoadingBottom = true; - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.backupButton = false; } @@ -157,7 +157,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { $scope.tempPath = response.data.tempPath; getBackupStatus(); } else { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; new PNotify({ title: 'Operation Failed!', text: response.data.error_message, @@ -295,7 +295,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { function ListInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; if (response.data.status === 1) { $scope.jobs = response.data.data; } else { @@ -367,7 +367,7 @@ app.controller('createIncrementalBackups', function ($scope, $http, $timeout) { app.controller('incrementalDestinations', function ($scope, $http) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.sftpHide = true; $scope.awsHide = true; @@ -386,7 +386,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { $scope.populateCurrentRecords = function () { - $scope.cyberpanelLoading = false; + $scope.cyberpanelLoading = true; url = "/IncrementalBackups/populateCurrentRecords"; @@ -413,7 +413,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { function ListInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; if (response.data.status === 1) { $scope.records = response.data.data; } else { @@ -427,7 +427,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { } function cantLoadInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; new PNotify({ title: 'Operation Failed!', text: 'Could not connect to server, please refresh this page', @@ -438,7 +438,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { }; $scope.addDestination = function (type) { - $scope.cyberpanelLoading = false; + $scope.cyberpanelLoading = true; url = "/IncrementalBackups/addDestination"; @@ -469,7 +469,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { function ListInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.populateCurrentRecords(); if (response.data.status === 1) { new PNotify({ @@ -488,7 +488,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { } function cantLoadInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; new PNotify({ title: 'Operation Failed!', text: 'Could not connect to server, please refresh this page', @@ -499,7 +499,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { }; $scope.removeDestination = function (type, ipAddress) { - $scope.cyberpanelLoading = false; + $scope.cyberpanelLoading = true; url = "/IncrementalBackups/removeDestination"; @@ -520,7 +520,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { function ListInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.populateCurrentRecords(); if (response.data.status === 1) { new PNotify({ @@ -539,7 +539,7 @@ app.controller('incrementalDestinations', function ($scope, $http) { } function cantLoadInitialDatas(response) { - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; new PNotify({ title: 'Operation Failed!', text: 'Could not connect to server, please refresh this page', @@ -1073,7 +1073,7 @@ app.controller('restoreRemoteBackupsInc', function ($scope, $http, $timeout) { $scope.destination = false; $scope.runningBackup = false; $scope.backupButton = false; - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.fileName = response.data.fileName; $scope.status = response.data.status; $scope.populateCurrentRecords(); @@ -1096,7 +1096,7 @@ app.controller('restoreRemoteBackupsInc', function ($scope, $http, $timeout) { } else { $timeout.cancel(); $scope.cyberpanelLoadingBottom = true; - $scope.cyberpanelLoading = true; + $scope.cyberpanelLoading = false; $scope.backupButton = false; } diff --git a/IncBackups/templates/IncBackups/backupSchedule.html b/IncBackups/templates/IncBackups/backupSchedule.html old mode 100755 new mode 100644 diff --git a/IncBackups/templates/IncBackups/createBackup.html b/IncBackups/templates/IncBackups/createBackup.html old mode 100755 new mode 100644 index 04e99d1fc..4e03be62e --- a/IncBackups/templates/IncBackups/createBackup.html +++ b/IncBackups/templates/IncBackups/createBackup.html @@ -1,227 +1,593 @@ {% extends "baseTemplate/index.html" %} {% load i18n %} {% block title %}{% trans "Create Incremental Backup" %}{% endblock %} + +{% block header_scripts %} + +{% endblock %} + {% block content %} +{% load static %} +{% get_current_language as LANGUAGE_CODE %} - {% load static %} - - {% get_current_language as LANGUAGE_CODE %} - - -
{% trans "This page can be used to create incremental backups for your websites." %}
+{% trans "Create incremental backups for your websites with efficient storage usage and quick restore capabilities." %}
+ + + {% trans "View Documentation" %} + +
-