From 9c983fe04b21c2eadd9bbe78da86b62a163bd878 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Sun, 3 Feb 2019 13:37:14 +0500 Subject: [PATCH] design overhaul --- CyberCP/settings.py | 1 + backup/templates/backup/index.html | 26 +- .../assets/image-resources/logo-admin.png | Bin 5708 -> 2598 bytes .../templates/baseTemplate/homePage.html | 406 +- .../templates/baseTemplate/index.html | 40 +- containerization/models.py | 2 +- .../templates/databases/createDatabase.html | 10 +- .../templates/databases/deleteDatabase.html | 12 +- databases/templates/databases/index.html | 28 +- .../templates/databases/listDataBases.html | 10 +- dns/models.py | 7 + dns/templates/dns/addDeleteDNSRecords.html | 6 +- dns/templates/dns/createDNSZone.html | 9 +- dns/templates/dns/createNameServer.html | 19 +- dns/templates/dns/deleteDNSZone.html | 13 +- dns/templates/dns/index.html | 28 +- .../static/dockerManager/dockerManager.js | 10 +- .../templates/dockerManager/install.html | 11 +- .../static/emailMarketing/checklist.png | Bin 2961 -> 1755 bytes .../static/emailMarketing/compose.png | Bin 2557 -> 1842 bytes .../static/emailMarketing/mailing.png | Bin 2124 -> 1950 bytes .../static/emailMarketing/paper-plane.png | Bin 3260 -> 2226 bytes .../static/emailMarketing/post-office.png | Bin 2511 -> 1548 bytes .../emailMarketing/emailMarketing.html | 6 +- .../templates/emailPremium/SpamAssassin.html | 259 +- .../templates/emailPremium/listDomains.html | 16 +- .../templates/emailPremium/policyServer.html | 10 +- .../static/filemanager/css/fileManager.css | 138 +- .../static/filemanager/images/fileManager.png | Bin 11191 -> 2598 bytes .../static/filemanager/js/fileManager.js | 4 +- filemanager/templates/filemanager/index.html | 137 +- firewall/templates/firewall/csf.html | 11 +- firewall/templates/firewall/firewall.html | 58 +- firewall/templates/firewall/index.html | 14 +- firewall/templates/firewall/modSecurity.html | 21 +- .../templates/firewall/modSecurityRules.html | 13 +- .../firewall/modSecurityRulesPacks.html | 18 +- firewall/templates/firewall/secureSSH.html | 32 +- firewall/templates/firewall/spamassassin.html | 2 +- ftp/templates/ftp/createFTPAccount.html | 231 +- ftp/templates/ftp/deleteFTPAccount.html | 2 +- ftp/templates/ftp/index.html | 21 +- ftp/templates/ftp/listFTPAccounts.html | 261 +- install/lscp.tar.gz | Bin 9829615 -> 9833871 bytes locale/br/LC_MESSAGES/django.mo | Bin 78018 -> 77824 bytes locale/br/LC_MESSAGES/django.po | 2951 +++++---- locale/bs/LC_MESSAGES/django.mo | Bin 29275 -> 29115 bytes locale/bs/LC_MESSAGES/django.po | 2949 +++++---- locale/cn/LC_MESSAGES/cyberpanel.mo | Bin 35666 -> 35625 bytes locale/cn/LC_MESSAGES/django.mo | Bin 36933 -> 36805 bytes locale/cn/LC_MESSAGES/django.po | 2955 +++++---- locale/es/LC_MESSAGES/django.mo | Bin 12723 -> 12575 bytes locale/es/LC_MESSAGES/django.po | 2950 +++++---- locale/fr/LC_MESSAGES/django.mo | Bin 64117 -> 63944 bytes locale/fr/LC_MESSAGES/django.po | 2951 +++++---- locale/gr/LC_MESSAGES/django.mo | Bin 55331 -> 55167 bytes locale/gr/LC_MESSAGES/django.po | 2957 +++++---- locale/id/LC_MESSAGES/django.mo | Bin 414 -> 373 bytes locale/id/LC_MESSAGES/django.po | 2817 ++++---- locale/it/LC_MESSAGES/django.mo | Bin 0 -> 57230 bytes locale/it/LC_MESSAGES/django.po | 5841 +++++++++++++++++ locale/ja/LC_MESSAGES/django.mo | Bin 76396 -> 76259 bytes locale/ja/LC_MESSAGES/django.po | 2949 +++++---- locale/pl/LC_MESSAGES/django.mo | Bin 69521 -> 69417 bytes locale/pl/LC_MESSAGES/django.po | 2950 +++++---- locale/pt/LC_MESSAGES/django.mo | Bin 37674 -> 37542 bytes locale/pt/LC_MESSAGES/django.po | 2951 +++++---- locale/ru/LC_MESSAGES/django.mo | Bin 55419 -> 55253 bytes locale/ru/LC_MESSAGES/django.po | 2957 +++++---- locale/tr/LC_MESSAGES/django.mo | Bin 45262 -> 45129 bytes locale/tr/LC_MESSAGES/django.po | 2951 +++++---- locale/ur-PK/LC_MESSAGES/django.mo | Bin 378 -> 337 bytes locale/vi/LC_MESSAGES/django.mo | Bin 71048 -> 70903 bytes locale/vi/LC_MESSAGES/django.po | 2943 +++++---- loginSystem/templates/loginSystem/login.html | 1 + loginSystem/views.py | 5 + .../mailServer/changeEmailPassword.html | 226 +- .../mailServer/createEmailAccount.html | 218 +- .../mailServer/deleteEmailAccount.html | 225 +- .../templates/mailServer/dkimManager.html | 12 +- .../templates/mailServer/emailForwarding.html | 9 +- mailServer/templates/mailServer/index.html | 103 +- .../templates/managePHP/editPHPConfig.html | 23 +- managePHP/templates/managePHP/index.html | 15 +- .../managePHP/installExtensions.html | 6 +- manageSSL/static/manageSSL/manageSSL.js | 2 - manageSSL/templates/manageSSL/index.html | 18 +- manageSSL/templates/manageSSL/manageSSL.html | 10 +- .../templates/manageSSL/sslForHostName.html | 10 +- .../templates/manageSSL/sslForMailServer.html | 10 +- .../manageServices/managePostfix.html | 13 +- .../manageServices/managePowerDNS.html | 13 +- .../manageServices/managePureFtpd.html | 13 +- .../templates/packages/createPackage.html | 12 +- .../templates/packages/deletePackage.html | 17 +- packages/templates/packages/index.html | 107 +- .../templates/packages/modifyPackage.html | 8 +- plogical/mailUtilities.py | 1 + plogical/upgrade.py | 8 +- s3Backups/s3Backups.py | 193 +- .../templates/serverLogs/accessLogs.html | 27 +- .../templates/serverLogs/emailLogs.html | 16 +- .../templates/serverLogs/errorLogs.html | 20 +- serverLogs/templates/serverLogs/ftplogs.html | 21 +- serverLogs/templates/serverLogs/index.html | 130 +- .../templates/serverLogs/modSecAuditLog.html | 25 +- serverStatus/static/images/change-license.png | Bin 0 -> 1669 bytes serverStatus/static/images/license-status.png | Bin 0 -> 1420 bytes .../serverStatus/cybercpmainlogfile.html | 11 +- .../templates/serverStatus/index.html | 86 +- .../serverStatus/litespeedStatus.html | 100 +- .../templates/serverStatus/services.html | 17 +- .../templates/serverStatus/topProcesses.html | 66 +- .../userManagment/changeUserACL.html | 8 +- .../templates/userManagment/createACL.html | 10 +- .../templates/userManagment/createUser.html | 35 +- .../templates/userManagment/deleteACL.html | 12 +- .../templates/userManagment/deleteUser.html | 10 +- .../templates/userManagment/index.html | 40 +- .../templates/userManagment/modifyACL.html | 8 +- .../templates/userManagment/modifyUser.html | 10 +- .../userManagment/resellerCenter.html | 11 +- .../templates/userManagment/userProfile.html | 70 +- .../static/images/icons/add-ssl.png | Bin 0 -> 1376 bytes .../static/images/icons/change-php.png | Bin 0 -> 1720 bytes .../static/images/icons/checklist.png | Bin 0 -> 1755 bytes .../static/images/icons/compose.png | Bin 0 -> 1842 bytes .../static/images/icons/delete-ftp.png | Bin 1523 -> 2155 bytes .../static/images/icons/domains.png | Bin 3206 -> 2419 bytes websiteFunctions/static/images/icons/file.png | Bin 1044 -> 1878 bytes .../static/images/icons/ftp-upload.png | Bin 1824 -> 2036 bytes .../static/images/icons/git-logo.png | Bin 1879 -> 877 bytes .../static/images/icons/joomla-logo.png | Bin 2072 -> 1276 bytes .../static/images/icons/laptop.png | Bin 834 -> 1965 bytes .../static/images/icons/locked.png | Bin 888 -> 1878 bytes .../static/images/icons/log-file-format.png | Bin 1631 -> 1636 bytes .../static/images/icons/mailing.png | Bin 0 -> 1950 bytes .../static/images/icons/office-material.png | Bin 1708 -> 1038 bytes .../static/images/icons/open_basedir.png | Bin 1741 -> 2159 bytes .../static/images/icons/paper-plane.png | Bin 0 -> 2226 bytes .../static/images/icons/pencilcase.png | Bin 3951 -> 1593 bytes .../static/images/icons/post-office.png | Bin 0 -> 1548 bytes .../static/images/icons/prestashop.png | Bin 4314 -> 2501 bytes .../static/images/icons/repeat.png | Bin 2865 -> 2986 bytes websiteFunctions/static/images/icons/sort.png | Bin 1908 -> 1426 bytes .../static/images/icons/warning.png | Bin 2429 -> 1519 bytes .../static/images/icons/web-domain.png | Bin 2832 -> 1652 bytes .../static/images/icons/wordpress.png | Bin 1797 -> 1525 bytes .../static/images/not-available-preview.png | Bin 0 -> 9295 bytes .../websiteFunctions/websiteFunctions.css | 229 +- .../websiteFunctions/websiteFunctions.js | 54 +- .../websiteFunctions/createWebsite.html | 13 +- .../websiteFunctions/deleteWebsite.html | 12 +- .../templates/websiteFunctions/index.html | 51 +- .../websiteFunctions/launchChild.html | 248 +- .../websiteFunctions/listWebsites.html | 152 +- .../websiteFunctions/modifyWebsite.html | 6 +- .../websiteFunctions/suspendWebsite.html | 10 +- .../templates/websiteFunctions/website.html | 426 +- 159 files changed, 31749 insertions(+), 17427 deletions(-) create mode 100644 locale/it/LC_MESSAGES/django.mo create mode 100644 locale/it/LC_MESSAGES/django.po create mode 100644 serverStatus/static/images/change-license.png create mode 100644 serverStatus/static/images/license-status.png create mode 100644 websiteFunctions/static/images/icons/add-ssl.png create mode 100644 websiteFunctions/static/images/icons/change-php.png create mode 100644 websiteFunctions/static/images/icons/checklist.png create mode 100644 websiteFunctions/static/images/icons/compose.png create mode 100644 websiteFunctions/static/images/icons/mailing.png create mode 100644 websiteFunctions/static/images/icons/paper-plane.png create mode 100644 websiteFunctions/static/images/icons/post-office.png create mode 100644 websiteFunctions/static/images/not-available-preview.png 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 80ca74a3c1fab36f0e6ea0684fe219eaa90d10f4..03deb86e9d9794705e1bac6b03682c5f5f010f1a 100644 GIT binary patch literal 2598 zcmV+>3fc9EP)@c8kX)slFnIX*Sm=RozlghLv?gogk}$N z*udX_enD4)CmCJc0RA9{3;gdvuLAgkycGHAPq3M+2gGJz1PO8&jQ{I@f7eW({qo0Z z>|p)C{6P)}_yY7A=<@*nAO{V63+PnC@GWhi`C(|{!Hz3!-K)<3Z-q)C) z>is}h8esHd`eQ=Z;#q+20lf?S*}v5F@x#OEz2e+{SnvkfC&sS`dL7Or1pW&KKLLLD z&xe1r-YYP^3g8d&obvMyK|iPK<1c^v>#cnF@Ezz-$p3GfkJGrFDOQJ=1n+8kw27Vx*m{N!)^T(LN8B@J~`v~6v@E&OGhaozrJ zq9=75=p{|t)h3-Cfj%=>o*U>!=yW@OSId&!T^$}ZW`1-EhgLn|8$VmpHI_bNL3Bya zmKDmJX?)IjbiJkf*L1D;JA-u!G_X&&(_^EKx=muk)?0vT z;bJ&?J_C5U6FYRVeh0JRdq;+X>-HY?;{os*dVP=Y>?gBy4}?ynkcXf&M-RTQeBu@;l5t z-E~4>0{|PKm?pGn>+Lh3>uqHnF-t)a_tH&V3XTsV30s=3uPo25w_UyG57d-ZPDX8FFktWie%Lc z_?1Ba$I7OgQNE4iE~NgTLpnT?K?+jM*;%YZt!G zCENP_WgFQH*9>DJt+<2;6LWA_vU6s?Rsud4JTi#TC0QwyZ0Y$6{JZ(dmzwYekfQ#9}=0+TP)^Gcn;^Qt7nqS=-|?>)e; zE4q(o81!Y5G@bpb0AC+4iyWZ$0dgoZEb9sp_%i~3Zeh-=63{D8+}?)pEO5b#Ib%i` zArxv;@``0%R%E}nB{CMbGx*YXq&rVqwtrcp9oq*!rrWN1++j6AzXAT&yBM*$$@)0~ z{Z@cE!u`aE^Cw8}xj;WOcY$lpQkB90@?oyy`I_-~?OD^eZ?FTY6Ayp0WM(GM=xf#> zW7Td}2MdX=1N6#~wb0p}f$?2t15pLgS6y6j`Cj(nbRuGUTey>oT|(btxeAz0j4&f> zx+vRLDkcaL&7@-B&!59TK?cb#?fg{3A^t^Gu8bV-lW@S;Y$DJn#`_F--nGqk1bQ9E z_A0zLGFVLxaxP;e7PVy=hJRGB)ic7CCF0KCh)nf24$dz&BW6;EdhT6 z{;UN2DY3o|gLE2{-#a#UY;jnrZP4p<-4LKUcYt1>x5*u4%rVtZJ#4QR#5XqZ!~WD^ zYmByWZP`x&wze15OPfs`uG8nK#+E^PVbO_jK4#QrD1`Q(E5~sU^x?%e$&O~nk{SGb zbognuN6Qyt`w6CZZe$zF_W+2vP0-7RBO3+4KN2hd82<7??aEUOv;N5A#}e5ZC9eWj!+n(AdwVu@=xo zm^#|WH)9pbl4j-O3}ovYNTsm!;n>nQ{LZT??XcZ%Zol3o2Ka9u9!@{t*(Cvf0+1&n z9!@=3m#si=VTVN8tC~px`|0yGO>7lar(t7LsFrRG-?-fuI9O)0nfo@k!1!?;ofdsp zb^CC4!2cfneF8pbFjk$;UAzYR(dp0=((DZMTQoHL{u|gYR|g;_@PBmK{>SD|WBv;Q z{71UZFoh2|=Eo_#`96Ri!oDvL1@uAMit)>1elz{X;MXymaxnj&4tm7BG8{V&@Cb~* zZMLV3`CkI)W!%aK%8n0^?eiUEi1t?6kN3V`@Jg8*G5<>nZ-NBiKMVMKHO}4y39<*k z_k+Jr;NL6IfBN)ky&3oJ-MgIb2lP3o&mMi=(q}BzE=zj0q-QDC3hNCZdR7?arFd^0 zW^uWA&gI0=$%XCpu?LGirQbEmjOaeo&rpum%h`WR9VfC5!Z!Pti85?uYrpy3iLB#c z$N1G_{^7oX9>VqL0nqx_RQfPn46sZ@N2dTluIy)rQlT3Q@D$LypuaU~Oz|vY;4#QG zxL`B4lsScdDs1v56mQ(+8qlVoTzO8WXZ-CdJBBY4OC5h8;6DX_4&X4;?`2F6aPj{X zz<~J(;K)O6XUv!w7?MF5G&a^d5#Rs63}$rP%ip51y(yTs>Y|%B63^uf1AjGOZ8Py3 z!~Y2V_D#=Bwz7rpM9dmLNLHr|{70v6>3Y4VOfThLJ)T^g8i2kw7+f}5X819fx+;t6Ur6a$iSJ*D*`ll*y<0s{kN=m=prmY;Zx+UXvGTJDQb(4U z(iwo6j(Y)wGk{XZ$GKoX+knr7u9ho=IQNL>^*fO$>&jAwwM@kO?{Qzy{R%V3y~C%K z8Iy~6{oGZyxkeD+e}iY%HARphL4pJc5+q2FAVGq(CI1s(03{iRe@Q0%aR2}S07*qo IM6N<$f|be-&j0`b literal 5708 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 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 eeb27580ffcf809f57e8d38e8940a4186df3fafe..03deb86e9d9794705e1bac6b03682c5f5f010f1a 100644 GIT binary patch literal 2598 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 IM6N<$f|be-&j0`b literal 11191 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 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 @@