diff --git a/CyberCP/settings.py b/CyberCP/settings.py index 20bb7c61e..4412d01a1 100644 --- a/CyberCP/settings.py +++ b/CyberCP/settings.py @@ -186,6 +186,7 @@ LANGUAGES = ( ('fr', _('French')), ('pl', _('Polish')), ('vi', _('Vietnamese')), + ('it', _('Italian')), ) MEDIA_URL = '/home/cyberpanel/media/' diff --git a/backup/templates/backup/index.html b/backup/templates/backup/index.html index 87b9b3ab2..f0cd19819 100644 --- a/backup/templates/backup/index.html +++ b/backup/templates/backup/index.html @@ -13,9 +13,9 @@

{% trans "Back up" %}

{% trans "Back up and restore sites." %}

-
+
-

+

{% trans "Available Functions" %}

@@ -24,13 +24,13 @@ {% if createBackup or admin %} -
+
{% trans "Back up" %}
- +
@@ -40,13 +40,13 @@ {% if restoreBackup or admin %} -
+
{% trans "Restore" %}
- +
@@ -56,13 +56,13 @@ {% if addDeleteDestinations or admin %} -
+
{% trans "Add/Delete Destinations" %}
- +
@@ -71,13 +71,13 @@ {% if scheDuleBackups or admin %} -
+
{% trans "Schedule Back up" %}
- +
@@ -86,13 +86,13 @@ {% if remoteBackups or admin %} -
+
{% trans "Remote Back ups" %}
- +
@@ -108,4 +108,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/baseTemplate/static/baseTemplate/assets/image-resources/logo-admin.png b/baseTemplate/static/baseTemplate/assets/image-resources/logo-admin.png index 80ca74a3c..03deb86e9 100644 Binary files a/baseTemplate/static/baseTemplate/assets/image-resources/logo-admin.png and b/baseTemplate/static/baseTemplate/assets/image-resources/logo-admin.png differ diff --git a/baseTemplate/templates/baseTemplate/homePage.html b/baseTemplate/templates/baseTemplate/homePage.html index 472141f1b..80282c078 100644 --- a/baseTemplate/templates/baseTemplate/homePage.html +++ b/baseTemplate/templates/baseTemplate/homePage.html @@ -16,25 +16,189 @@ - {% if admin %} -
+ +
-

- {% trans "Usage" %} +

+ {% trans "Available Functions" %} +

+ +
+
+
+ +
+ {% trans "Users" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Websites" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Packages" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Databases" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "DNS" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "FTP" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Back up" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Emails" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "SSL" %} +
+
+ +
+ +
+ + {% if admin %} + +
+ +
+ {% trans "Status" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "PHP" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Logs" %} +
+
+ +
+ +
+ +
+ +
+ {% trans "Security" %} +
+
+ +
+ +
+ + {% endif %} + + +
+
+ +
+ +
+ + + {% if admin %} +
+
+

+ {% trans "Resources" %}

-
- -
- -
-

+
+
+
+

{% trans "CPU Usage" %}

-
+
+
{$ cpuUsage $}%
@@ -42,25 +206,26 @@
- +
-
- -
-

+
+
+

{% trans "Ram Usage" %}

-
-
- {$ ramUsage $}% -
-
-
+
+
+
+ {$ ramUsage $}% +
+
+
+
@@ -68,18 +233,20 @@
-
-
-

+
+
+

{% trans "Disk Usage '/'" %}

-
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 8dce01542..8535e47ca 100644 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -347,19 +347,19 @@ - + {% trans "Dashboard" %} - {% trans "Version Management" %} - {% trans "Connect" %} @@ -408,7 +408,7 @@
  • -
    +
    {% trans "Websites" %}
    @@ -482,7 +482,7 @@
  • - + {% trans "DNS" %}
    @@ -507,7 +507,7 @@
  • - + {% trans "Email" %}
    @@ -538,7 +538,7 @@
  • - + {% trans "FTP" %}
    @@ -560,7 +560,7 @@
  • - + {% trans "Back up" %}
    @@ -589,7 +589,7 @@
  • - + {% trans "SSL" %}
    @@ -611,7 +611,6 @@
  • {% trans "Server" %}
    • -
  • @@ -631,7 +630,7 @@
  • - + {% trans "Docker Manager" %} {% trans "NEW" %} @@ -654,7 +653,7 @@
  • - + {% trans "Tuning" %}
    @@ -672,7 +671,7 @@
  • - + {% trans "Server Status" %}
    @@ -697,7 +696,7 @@
  • - + {% trans "PHP" %}
    @@ -716,7 +715,7 @@
  • - + {% trans "Logs" %}
    @@ -740,7 +739,7 @@
  • - + {% trans "Security" %}
    @@ -769,7 +768,7 @@
  • - + {% trans "Mail Settings" %} {% trans "NEW" %} @@ -795,7 +794,7 @@
  • - + {% trans "Manage Services" %}
    @@ -816,7 +815,7 @@
  • - + {% trans "Plugins" %}
    @@ -910,4 +909,5 @@
    - \ No newline at end of file + + diff --git a/containerization/models.py b/containerization/models.py index 28111e839..ae33028e0 100644 --- a/containerization/models.py +++ b/containerization/models.py @@ -6,7 +6,7 @@ from websiteFunctions.models import Websites # Create your models here. class ContainerLimits(models.Model): - owner = models.ForeignKey(Websites, on_delete=models.PROTECT) + owner = models.ForeignKey(Websites, on_delete=models.CASCADE) cpuPers = models.CharField(max_length=10) IO = models.CharField(max_length=10) IOPS = models.CharField(max_length=10) diff --git a/databases/templates/databases/createDatabase.html b/databases/templates/databases/createDatabase.html index 957435aef..65586485b 100644 --- a/databases/templates/databases/createDatabase.html +++ b/databases/templates/databases/createDatabase.html @@ -15,14 +15,12 @@
    -

    +

    {% trans "Create Database" %}

    - -
    - +
    @@ -65,7 +63,7 @@
    - +
    @@ -108,4 +106,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/databases/templates/databases/deleteDatabase.html b/databases/templates/databases/deleteDatabase.html index 24e3b4038..7156c5598 100644 --- a/databases/templates/databases/deleteDatabase.html +++ b/databases/templates/databases/deleteDatabase.html @@ -15,14 +15,12 @@
    -

    +

    {% trans "Delete Database" %}

    - - - +
    @@ -50,13 +48,11 @@
    - +
    - -
    @@ -93,4 +89,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/databases/templates/databases/index.html b/databases/templates/databases/index.html index c7eaf4aab..9a2fb85c7 100644 --- a/databases/templates/databases/index.html +++ b/databases/templates/databases/index.html @@ -13,61 +13,55 @@

    {% trans "Create, edit and delete databases on this page." %}

    -
    +
    -

    +

    {% trans "Available Functions" %}

    -
    +
    {% trans "Create Database" %}
    - +
    -
    +
    {% trans "Delete Database" %}
    - +
    - -
    - - -
    -
    +
    {% trans "List Databases" %}
    - +
    - -
    +
    {% trans "PHPMYAdmin" %}
    - +
    @@ -83,4 +77,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/databases/templates/databases/listDataBases.html b/databases/templates/databases/listDataBases.html index 99104f766..c51761a5f 100644 --- a/databases/templates/databases/listDataBases.html +++ b/databases/templates/databases/listDataBases.html @@ -15,14 +15,12 @@
    -

    +

    {% trans "List Databases" %}

    - - - +
    @@ -70,7 +68,7 @@
    - +
    @@ -119,4 +117,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dns/models.py b/dns/models.py index 2a84083fc..3a9e27305 100644 --- a/dns/models.py +++ b/dns/models.py @@ -91,3 +91,10 @@ class Tsigkeys(models.Model): class Meta: db_table = 'tsigkeys' unique_together = (('name', 'algorithm'),) + + + +class DNSMaster: + type = models.CharField(max_length=5, default='NATIVE') + allow_axfr_ips = models.CharField(max_length=500, default='') + also_notify = models.CharField(max_length=500, default='') diff --git a/dns/templates/dns/addDeleteDNSRecords.html b/dns/templates/dns/addDeleteDNSRecords.html index a5f90928d..725f676d0 100644 --- a/dns/templates/dns/addDeleteDNSRecords.html +++ b/dns/templates/dns/addDeleteDNSRecords.html @@ -15,7 +15,7 @@
    -

    +

    {% trans "Add Records" %}

    @@ -35,7 +35,7 @@ {% else %} - +
    @@ -404,4 +404,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dns/templates/dns/createDNSZone.html b/dns/templates/dns/createDNSZone.html index 38b2264ed..c07af37c6 100644 --- a/dns/templates/dns/createDNSZone.html +++ b/dns/templates/dns/createDNSZone.html @@ -14,7 +14,7 @@
    -

    +

    {% trans "Details" %}

    @@ -31,7 +31,7 @@ {% else %} - +
    @@ -40,7 +40,6 @@
    -
    example.com
    @@ -48,7 +47,7 @@
    - +
    @@ -95,4 +94,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dns/templates/dns/createNameServer.html b/dns/templates/dns/createNameServer.html index ff22dfe6c..ee37a9498 100644 --- a/dns/templates/dns/createNameServer.html +++ b/dns/templates/dns/createNameServer.html @@ -14,7 +14,7 @@
    -

    +

    {% trans "Details" %}

    @@ -28,11 +28,9 @@

    • - {% else %} - - +
    @@ -40,12 +38,10 @@
    -
    example.com
    -
    @@ -71,7 +67,6 @@
    -
    @@ -79,21 +74,17 @@
    - -
    - +
    - -
    -
    +

    {% trans "Nameserver cannot be created. Error message:" %} {$ errorMessage $}

    @@ -136,4 +127,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dns/templates/dns/deleteDNSZone.html b/dns/templates/dns/deleteDNSZone.html index dc5c96df6..197a90dc9 100644 --- a/dns/templates/dns/deleteDNSZone.html +++ b/dns/templates/dns/deleteDNSZone.html @@ -14,7 +14,7 @@
    -

    +

    {% trans "Delete DNS Zone" %}

    @@ -29,12 +29,9 @@

    - {% else %} - - - +
    @@ -50,7 +47,7 @@
    - +
    @@ -67,7 +64,7 @@
    -
    +

    {% trans "Cannot delete zone. Error message: " %}{$ errorMessage $}

    @@ -101,4 +98,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dns/templates/dns/index.html b/dns/templates/dns/index.html index f15906d16..a751768c1 100644 --- a/dns/templates/dns/index.html +++ b/dns/templates/dns/index.html @@ -13,9 +13,9 @@

    {% trans "Create, edit and delete DNS zones on this page." %}

    -
    +
    -

    +

    {% trans "Available Functions" %}

    @@ -25,7 +25,7 @@
    -
    +
    {% trans "Create DNS Zone" %} @@ -37,7 +37,7 @@
    -
    +
    {% trans "Delete Zone" %} @@ -49,7 +49,7 @@
    -
    +
    {% trans "Add Delete/Records" %} @@ -68,49 +68,49 @@
    -
    +
    {% trans "Create Nameserver" %}
    - +
    -
    +
    {% trans "Create DNS Zone" %}
    - +
    -
    +
    {% trans "Delete Zone" %}
    - +
    -
    +
    {% trans "Add Delete/Records" %}
    - +
    @@ -131,4 +131,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dockerManager/static/dockerManager/dockerManager.js b/dockerManager/static/dockerManager/dockerManager.js index e77e55ed6..a89bcf670 100644 --- a/dockerManager/static/dockerManager/dockerManager.js +++ b/dockerManager/static/dockerManager/dockerManager.js @@ -169,9 +169,13 @@ app.controller('runContainer', function ($scope, $http) { }; - $.each($scope.portType, function (port, protocol) { - data[port + "/" + protocol] = $scope.eport[port]; - }); + try { + $.each($scope.portType, function (port, protocol) { + data[port + "/" + protocol] = $scope.eport[port]; + }); + } + catch (err) { + } var config = { headers: { diff --git a/dockerManager/templates/dockerManager/install.html b/dockerManager/templates/dockerManager/install.html index 802bde589..d93b6d18c 100644 --- a/dockerManager/templates/dockerManager/install.html +++ b/dockerManager/templates/dockerManager/install.html @@ -12,14 +12,13 @@

    {% trans "Install Docker" %}

    -
    -

    +

    {% trans "Install Docker" %}

    -
    +
    {% if conErr == 1 %} @@ -30,12 +29,12 @@ {% endif %} {% else %} -

    {% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}

    +

    {% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}

    - +
    -
    +
    +

    {% trans "SpamAssassin is not installed " %} +

    +
    - -
    + - - {% else %} +
    + +
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - - -
    - -
    - - -
    -
    - - - -
    - -
    - -
    -

    {% trans "Failed to save SpamAssassin configurations. Error message: " %} {$ errorMessage $}

    -
    - -
    -

    {% trans "SpamAssassin configurations successfully saved." %}

    +
    +

    {% trans "Failed to start installation, Error message: " %} {$ errorMessage + $}

    -

    {% trans "Could not connect. Please refresh this page." %}

    +

    {% trans "Could not connect. Please refresh this page." %}

    +
    +

    {% trans "Installation failed." %} {$ errorMessage $}

    +
    + +
    +

    {% trans "SpamAssassin successfully installed, refreshing page in 3 seconds.." %}

    +
    +
    -
    -
    -
    +
    - {% endif %} +
    +
    +
    +

    {% trans "Winter is coming, but so is SpamAssassin." %} + +

    +
    +
    + +
    +
    +
    +
    + + {% else %} +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    + +
    + + +
    +
    + + +
    + +
    + +
    +

    {% trans "Failed to save SpamAssassin configurations. Error message: " %} + {$ errorMessage $}

    +
    + +
    +

    {% trans "SpamAssassin configurations successfully saved." %}

    +
    + +
    +

    {% trans "Could not connect. Please refresh this page." %}

    +
    + +
    +
    + + +
    +
    + + {% endif %} + + +
    + +
    -
    - - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/emailPremium/templates/emailPremium/listDomains.html b/emailPremium/templates/emailPremium/listDomains.html index 9c3fe8826..013f99776 100644 --- a/emailPremium/templates/emailPremium/listDomains.html +++ b/emailPremium/templates/emailPremium/listDomains.html @@ -18,7 +18,7 @@
    -

    +

    {% trans "Domains" %}

    @@ -26,12 +26,14 @@
    -

    {% trans "Email Policy Server is not enabled " %} +

    {% trans "Email Policy Server is not enabled " %} +

    -

    + +
    {% else %} @@ -104,4 +106,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/emailPremium/templates/emailPremium/policyServer.html b/emailPremium/templates/emailPremium/policyServer.html index 4641f7db1..357fb1ab2 100644 --- a/emailPremium/templates/emailPremium/policyServer.html +++ b/emailPremium/templates/emailPremium/policyServer.html @@ -15,8 +15,8 @@
    -
    -

    +
    +

    {% trans "Email Policy Server" %}

    @@ -24,10 +24,10 @@
    -
    +
    - +
    @@ -37,7 +37,7 @@
    - +
    diff --git a/filemanager/static/filemanager/css/fileManager.css b/filemanager/static/filemanager/css/fileManager.css index 104fb0e6d..b69fd4538 100644 --- a/filemanager/static/filemanager/css/fileManager.css +++ b/filemanager/static/filemanager/css/fileManager.css @@ -2,12 +2,21 @@ width: 25%; } -#navBar{ +/*#navBar{ background: -moz-linear-gradient(#a4dbf5, #8cc5e0); background: -webkit-linear-gradient(#a4dbf5, #8cc5e0); background: -o-linear-gradient(#a4dbf5, #8cc5e0); +}*/ +#navBar { + background: #0daeff; /* Old browsers */ + background: -moz-linear-gradient(-45deg, #0daeff 0%,#3939ad 30%); /* FF3.6-15 */ + background: -webkit-linear-gradient(-45deg, #0daeff 0%,#3939ad 30%); /* Chrome10-25,Safari5.1-6 */ + background: linear-gradient(-45deg, #0daeff 0%,#3939ad 30%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3939ad', endColorstr='#0daeff',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ +} +.navbar-brand { + margin: 0 1rem 0 1rem; } - #mainRow{ margin: 1%; } @@ -41,4 +50,127 @@ #htmlEditorStyles{ margin-bottom: 2%; margin-top: 2%; -} \ No newline at end of file +} +.flex-wrap { + display: flex; + flex-wrap: wrap; +} +.mt-5 { + margin-top: 5px !important; +} +.mt-10 { + margin-top: 10px; +} +.mt-20 { + margin-top: 20px; +} +.mt-30 { + margin-top: 30px; +} +.mr-10 { + margin-right: 10px; +} +.mb-10 { + margin-bottom: 10px; +} +.ml-10 { + margin-left: 10px; +} +.my-10 { + margin-top: 10px; + margin-bottom: 10px; +} + +.mx-5 { + margin-left: 5px; + margin-right: 5px; +} +.mx-10 { + margin-left: 10px; + margin-right: 10px; +} +.header-logo { + width: 315px; +/* text-align: center;*/ + font-size: 16px; + float: left; + position: relative; +} + +a.nav-link { + color: #add8e6; +} +a.nav-link:hover { + color: #E4F2F7; +} + +.point-events { + pointer-events: all; +} + +.card-header { + padding: .75rem 1.25rem; + margin-bottom: 0; + background-color: transparent; + border-bottom: none; +} +.form-control { + padding: 0 .5rem; + border: 1px solid #eeeeee; + color: #777; + font-size: .95em; +} + .form-control[readonly] { + background-color: transparent; +} +a { + color: #6C6CA4; + text-decoration: none; + background-color: transparent; + -webkit-text-decoration-skip: objects; +} +a:hover { + color: #8989B6; + text-decoration: none; + background-color: transparent; + -webkit-text-decoration-skip: objects; +} + +#tableHead { + background: #8989B6; + color: #E1E1EC; +} +.table td, .table th { + padding: .15em; + vertical-align: top; + border-top: 1px solid #e9ecef; +} +.table thead th { + vertical-align: bottom; + border-bottom: 1px solid #e9ecef; + font-weight: 400; +} + +.table td { + font-size: 14px; + color: #666666; +} +.list-group-item { + padding: .2em 1.25rem; +} + +i.fa.fa-file { + color: #6C6CA4 !important; +} +i.fa.fa-minus { + color: #6C6CA4 !important; +} +i.fa.fa-plus { + color: #6C6CA4 !important; +} +.list-group-item { + background-color: transparent; +} +.bg-lightgray { + background: #F9F9FA; +} diff --git a/filemanager/static/filemanager/images/fileManager.png b/filemanager/static/filemanager/images/fileManager.png index eeb27580f..03deb86e9 100644 Binary files a/filemanager/static/filemanager/images/fileManager.png and b/filemanager/static/filemanager/images/fileManager.png differ diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index fe53df326..82e9410b7 100644 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -1569,6 +1569,4 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, }; -}); - - +}); \ No newline at end of file diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html index 8d7c772a7..3ef955cd1 100644 --- a/filemanager/templates/filemanager/index.html +++ b/filemanager/templates/filemanager/index.html @@ -40,11 +40,58 @@