design overhaul

This commit is contained in:
usmannasir
2019-02-03 13:37:14 +05:00
parent 7f47715043
commit 9c983fe04b
159 changed files with 31749 additions and 17427 deletions

View File

@@ -186,6 +186,7 @@ LANGUAGES = (
('fr', _('French')),
('pl', _('Polish')),
('vi', _('Vietnamese')),
('it', _('Italian')),
)
MEDIA_URL = '/home/cyberpanel/media/'

View File

@@ -13,9 +13,9 @@
<h2>{% trans "Back up" %}</h2>
<p>{% trans "Back up and restore sites." %}</p>
</div>
<div class="panel">
<div class="panel col-md-11">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
@@ -24,13 +24,13 @@
{% if createBackup or admin %}
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'backupSite' %}" title="{% trans 'Back up Site' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Back up" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-clone"></i>
</div>
</a>
</div>
@@ -40,13 +40,13 @@
{% if restoreBackup or admin %}
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'restoreSite' %}" title="{% trans 'Restore Back up' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Restore" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-undo"></i>
</div>
</a>
</div>
@@ -56,13 +56,13 @@
{% if addDeleteDestinations or admin %}
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'backupDestinations' %}" title="{% trans 'Add/Delete Destinations' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Add/Delete Destinations" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-map-pin"></i>
</div>
</a>
</div>
@@ -71,13 +71,13 @@
{% if scheDuleBackups or admin %}
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'scheduleBackup' %}" title="{% trans 'Schedule Back up' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Schedule Back up" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-refresh"></i>
</div>
</a>
</div>
@@ -86,13 +86,13 @@
{% if remoteBackups or admin %}
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'remoteBackups' %}" title="{% trans 'Remote Back ups' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Remote Back ups" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-cloud-upload"></i>
</div>
</a>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@@ -16,25 +16,189 @@
<!--- Hide statistics for non-admins--->
{% if admin %}
<div ng-controller="homePageStatus" class="panel">
<div class="mx-10 col-lg-9 panel col-md-push-50">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Usage" %}
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper mt-5">
<div class="row mx-5">
<div class="col-md-4">
<a href="{% url 'loadUsersHome' %}" title="{% trans 'User Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Users" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-users"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Website Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Websites" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-globe"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'packagesHome' %}" title="{% trans 'Add/Modify Packages' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Packages" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-cubes"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadDatabaseHome' %}" title="{% trans 'Database Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Databases" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-database"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'dnsHome' %}" title="{% trans 'Control DNS' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "DNS" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-sitemap"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadFTPHome' %}" title="{% trans 'FTP Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "FTP" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-cloud-upload"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Back up" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-clone"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadEmailHome' %}" title="{% trans 'Emails' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Emails" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-envelope"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadSSLHome' %}" title="{% trans 'SSL' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "SSL" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-expeditedssl"></i>
</div>
</a>
</div>
{% if admin %}
<div class="col-md-4">
<a href="{% url 'serverStatusHome' %}" title="{% trans 'Server Status' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Status" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-server"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadPHPHome' %}" title="{% trans 'PHP Configurations' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "PHP" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-code"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'logsHome' %}" title="{% trans 'Logs' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Logs" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-file"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'securityHome' %}" title="{% trans 'Security' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Security" %}
</div>
<div class="tile-content-wrapper">
<i class="fa fa-shield"></i>
</div>
</a>
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% if admin %}
<div ng-controller="homePageStatus" class="">
<div class="mx-10 col-md-2 panel panel-body col-md-pull-50">
<h3 class="content-box-header">
{% trans "Resources" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<div class="content-box border-top border-red">
<h3 class="content-box-header clearfix text-center">
<div class="row mx-5">
<div class="">
<div class="mb-10">
<h3 class="title-hero clearfix text-center text-muted">
{% trans "CPU Usage" %}
</h3>
<div class="content-box-wrapper">
<div class="row progress-center">
<div class="row flex">
<div class="align-center">
<div id="redcircle" class="c100 red cpu">
<span>{$ cpuUsage $}%</span>
<div class="slice">
@@ -42,20 +206,20 @@
<div class="fill"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="content-box border-top border-green">
<h3 class="content-box-header clearfix text-center">
<div class="">
<div class="mb-10">
<h3 class="title-hero clearfix text-center text-muted">
{% trans "Ram Usage" %}
</h3>
<div class="content-box-wrapper">
<div class="row progress-center">
<div class="row flex">
<div class="align-center">
<div id="greencircle" class="c100 p0 green ram">
<span>{$ ramUsage $}%</span>
<div class="slice">
@@ -67,14 +231,16 @@
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="content-box border-top border-red">
<h3 class="content-box-header clearfix text-center">
<div class="">
<div class="mb-10">
<h3 class="title-hero clearfix text-center text-muted">
{% trans "Disk Usage '/'" %}
</h3>
<div class="content-box-wrapper">
<div class="row progress-center">
<div class="row flex">
<div class="align-center">
<div id="pinkcircle" class="c100 pink disk">
<span>{$ diskUsage $}%</span>
<div class="slice">
@@ -86,6 +252,7 @@
</div>
</div>
</div>
</div>
</div>
@@ -94,184 +261,9 @@
</div>
{% endif %}
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<a href="{% url 'loadUsersHome' %}" title="{% trans 'User Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">9</span>
<div class="tile-header">
{% trans "Users" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Website Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">5</span>
<div class="tile-header">
{% trans "Websites" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'packagesHome' %}" title="{% trans 'Add/Modify Packages' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">3</span>
<div class="tile-header">
{% trans "Packages" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadDatabaseHome' %}" title="{% trans 'Database Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">3</span>
<div class="tile-header">
{% trans "Databases" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'dnsHome' %}" title="{% trans 'Control DNS' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "DNS" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadFTPHome' %}" title="{% trans 'FTP Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">3</span>
<div class="tile-header">
{% trans "FTP" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">5</span>
<div class="tile-header">
{% trans "Back up" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadEmailHome' %}" title="{% trans 'Emails' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">6</span>
<div class="tile-header">
{% trans "Emails" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadSSLHome' %}" title="{% trans 'SSL' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">3</span>
<div class="tile-header">
{% trans "SSL" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
{% if admin %}
<div class="col-md-4">
<a href="{% url 'serverStatusHome' %}" title="{% trans 'Server Status' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">2</span>
<div class="tile-header">
{% trans "Server Status" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'loadPHPHome' %}" title="{% trans 'PHP Configurations' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">2</span>
<div class="tile-header">
{% trans "PHP" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'logsHome' %}" title="{% trans 'Logs' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "Logs" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'securityHome' %}" title="{% trans 'Security' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "Security" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>

View File

@@ -347,19 +347,19 @@
<span style="color: #db6868;font-weight: bold;" id="serverIPAddress"></span>
</a>
<a href="{% url 'index' %}" title="{% trans 'Dashboard' %}">
<i class="glyph-icon icon-linecons-tv"></i>
<i class="glyph-icon icon-dashboard"></i>
<span>{% trans "Dashboard" %}</span>
</a>
<a class="versionManagement" href="{% url 'versionManagment' %}"
title="{% trans 'Version Management' %}">
<i class="glyph-icon tooltip-button icon-cloud-upload"
<i class="glyph-icon tooltip-button icon-info"
title="{% trans 'Version Management' %}" data-original-title=".icon-cloud-upload"
aria-describedby="tooltip896208"></i>
<span>{% trans "Version Management" %}</span>
</a>
<a class="versionManagement" href="https://platform.cyberpanel.net"
title="{% trans 'Connect' %}">
<i class="glyph-icon tooltip-button icon-cloud" title="{% trans 'Connect' %}"
<i class="glyph-icon tooltip-button icon-link" title="{% trans 'Connect' %}"
data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
<span>{% trans "Connect" %}</span>
</a>
@@ -408,7 +408,7 @@
<li>
<a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Websites' %}">
<div class="glyph-icon icon-file-word-o" title="{% trans 'Websites' %}"></div>
<div class="glyph-icon icon-globe" title="{% trans 'Websites' %}"></div>
<span>{% trans "Websites" %}</span>
</a>
<div class="sidebar-submenu">
@@ -482,7 +482,7 @@
<li>
<a title="{% trans 'DNS' %}">
<i class="glyph-icon icon-linecons-lightbulb"></i>
<i class="glyph-icon icon-sitemap"></i>
<span>{% trans "DNS" %}</span>
</a>
<div class="sidebar-submenu">
@@ -507,7 +507,7 @@
<li>
<a href="{% url 'loadEmailHome' %}" title="{% trans 'Email' %}">
<i class="glyph-icon icon-linecons-mail"></i>
<i class="glyph-icon icon-paper-plane"></i>
<span>{% trans "Email" %}</span>
</a>
<div class="sidebar-submenu">
@@ -538,7 +538,7 @@
<li>
<a href="{% url 'packagesHome' %}" title="{% trans 'FTP' %}">
<i class="glyph-icon icon-paper-plane"></i>
<i class="glyph-icon icon-cloud-upload"></i>
<span>{% trans "FTP" %}</span>
</a>
<div class="sidebar-submenu">
@@ -560,7 +560,7 @@
<li>
<a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}">
<i class="glyph-icon tooltip-button icon-folder" title=".icon-folder"></i>
<i class="glyph-icon tooltip-button icon-copy" title=".icon-folder"></i>
<span>{% trans "Back up" %}</span>
</a>
<div class="sidebar-submenu">
@@ -589,7 +589,7 @@
<li>
<a href="{% url 'loadSSLHome' %}" title="{% trans 'Back up' %}">
<i class="glyph-icon tooltip-button icon-briefcase" title="{% trans 'SSL' %}"></i>
<i class="glyph-icon tooltip-button icon-lock" title="{% trans 'SSL' %}"></i>
<span>{% trans "SSL" %}</span>
</a>
<div class="sidebar-submenu">
@@ -611,7 +611,6 @@
<li class="header serverACL"><span>{% trans "Server" %}</span></li>
<li class="serverACL">
<a href="#" title="{% trans 'Containerization' %}">
<i class="glyph-icon icon-linecons-fire"></i>
@@ -631,7 +630,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Docker' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-cogs"></i>
<span>{% trans "Docker Manager" %}</span>
<span class="bs-label badge-yellow">{% trans "NEW" %}</span>
</a>
@@ -654,7 +653,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Tuning' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-adjust"></i>
<span>{% trans "Tuning" %}</span>
</a>
<div class="sidebar-submenu">
@@ -672,7 +671,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Server Status' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-cog"></i>
<span>{% trans "Server Status" %}</span>
</a>
<div class="sidebar-submenu">
@@ -697,7 +696,7 @@
<li class="serverACL">
<a href="{% url 'loadPHPHome' %}" title="{% trans 'PHP' %}">
<i class="files-icon glyph-icon icon-file-code-o"></i>
<i class="glyph-icon icon-code"></i>
<span>{% trans "PHP" %}</span>
</a>
<div class="sidebar-submenu">
@@ -716,7 +715,7 @@
<li class="serverACL">
<a href="{% url 'logsHome' %}" title="{% trans 'Server Status' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-file"></i>
<span>{% trans "Logs" %}</span>
</a>
<div class="sidebar-submenu">
@@ -740,7 +739,7 @@
<li class="serverACL">
<a href="{% url 'securityHome' %}" title="{% trans 'Security' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-shield"></i>
<span>{% trans "Security" %}</span>
</a>
<div class="sidebar-submenu">
@@ -769,7 +768,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Mail Settings' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-envelope"></i>
<span>{% trans "Mail Settings" %}</span>
<span class="bs-label badge-yellow">{% trans "NEW" %}</span>
</a>
@@ -795,7 +794,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Manage Services' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-folder-open"></i>
<span>{% trans "Manage Services" %}</span>
</a>
<div class="sidebar-submenu">
@@ -816,7 +815,7 @@
<li class="serverACL">
<a href="#" title="{% trans 'Plugins' %}">
<i class="glyph-icon icon-linecons-fire"></i>
<i class="glyph-icon icon-plug"></i>
<span>{% trans "Plugins" %}</span>
</a>
<div class="sidebar-submenu">
@@ -911,3 +910,4 @@
</div>
</body>
</html>

View File

@@ -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)

View File

@@ -15,14 +15,12 @@
<div ng-controller="createDatabase" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Create Database" %} <img ng-hide="createDatabaseLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form class="form-horizontal bordered-row">
<form class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Website" %}</label>
@@ -65,7 +63,7 @@
<div ng-hide="dbDetails" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createDatabase()" class="btn btn-primary btn-lg btn-block">{% trans "Create Database" %}</button>
<button type="button" ng-click="createDatabase()" class="btn btn-primary btn-lg">{% trans "Create Database" %}</button>
</div>
</div>

View File

@@ -15,14 +15,12 @@
<div ng-controller="deleteDatabase" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Delete Database" %} <img ng-hide="deleteDatabaseLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Website" %}</label>
@@ -50,13 +48,11 @@
<div ng-hide="fetchedDatabases" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deleteDatabase()" class="btn btn-primary btn-lg btn-block">{% trans "Delete Database" %}</button>
<button type="button" ng-click="deleteDatabase()" class="btn btn-primary btn-lg">{% trans "Delete Database" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">

View File

@@ -13,61 +13,55 @@
<p>{% trans "Create, edit and delete databases on this page." %}</p>
</div>
<div class="panel">
<div class="panel col-md-11">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createDatabase' %}" title="{% trans 'Create Database' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create Database" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-plus-square"></i>
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deleteDatabase' %}" title="{% trans 'Delete Database' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Database" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-edit"></i>
</div>
</a>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a href="{% url 'listDBs' %}" title="{% trans 'List Databases' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "List Databases" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-list-ul"></i>
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-md-3 btn-min-width">
<a target="_blank" href="/phpmyadmin/index.php" title="{% trans 'PHPMYAdmin' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "PHPMYAdmin" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-code"></i>
</div>
</a>
</div>

View File

@@ -15,14 +15,12 @@
</div>
<div ng-controller="listDBs" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "List Databases" %} <img ng-hide="dbLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Domain" %}</label>
@@ -70,7 +68,7 @@
</div>
<div style="margin-top: 1%" class="col-sm-6 col-md-offset-3">
<button type="button" ng-click="changePasswordBtn()" class="btn btn-primary btn-lg btn-block">{% trans "Change Password" %}</button>
<button type="button" ng-click="changePasswordBtn()" class="btn btn-primary btn-lg">{% trans "Change Password" %}</button>
</div>
</div>

View File

@@ -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='')

View File

@@ -15,7 +15,7 @@
</div>
<div ng-controller="addModifyDNSRecords" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Add Records" %} <img ng-hide="recordsLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -35,7 +35,7 @@
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">

View File

@@ -14,7 +14,7 @@
</div>
<div ng-controller="createDNSZone" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Details" %} <img ng-hide="createDNSZoneLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -31,7 +31,7 @@
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -40,7 +40,6 @@
<input name="dom" type="text" class="form-control" ng-model="zoneDomain" required>
</div>
<div class="current-pack">example.com</div>
</div>
@@ -48,7 +47,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createDNSZone()" class="btn btn-primary btn-lg btn-block">{% trans "Create DNS Zone" %}</button>
<button type="button" ng-click="createDNSZone()" class="btn btn-primary btn-lg">{% trans "Create DNS Zone" %}</button>
</div>
</div>

View File

@@ -14,7 +14,7 @@
</div>
<div ng-controller="createNameserver" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Details" %} <img ng-hide="createNameserverLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -28,11 +28,9 @@
</button></a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
@@ -40,12 +38,10 @@
<input name="dom" type="text" class="form-control" ng-model="domainForNS" required>
</div>
<div class="current-pack">example.com</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "First Nameserver" %}</label>
<div class="col-sm-6">
@@ -71,7 +67,6 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "IP Address" %}</label>
<div class="col-sm-6">
@@ -79,21 +74,17 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createNameserverFunc()" class="btn btn-primary btn-lg btn-block">{% trans "Create Nameserver" %}</button>
<button type="button" ng-click="createNameserverFunc()" class="btn btn-primary btn-lg">{% trans "Create Nameserver" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="nameserverCreationFailed" class="alert alert-danger">
<p>{% trans "Nameserver cannot be created. Error message:" %} {$ errorMessage $}</p>
</div>

View File

@@ -14,7 +14,7 @@
</div>
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Delete DNS Zone" %}
</h3>
<div ng-controller="deleteDNSZone" class="example-box-wrapper">
@@ -29,12 +29,9 @@
</button></a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Zone" %}</label>
@@ -50,7 +47,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deleteZone()" class="btn btn-primary btn-lg btn-block">{% trans "Delete Zone" %}</button>
<button type="button" ng-click="deleteZone()" class="btn btn-primary btn-lg">{% trans "Delete Zone" %}</button>
</div>
</div>
@@ -67,7 +64,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="deleteFailure" class="alert alert-danger">
<p>{% trans "Cannot delete zone. Error message: " %}{$ errorMessage $}</p>
</div>

View File

@@ -13,9 +13,9 @@
<p>{% trans "Create, edit and delete DNS zones on this page." %}</p>
</div>
<div class="panel">
<div class="panel col-md-11">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
@@ -25,7 +25,7 @@
<div class="row">
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createDNSZone' %}" title="{% trans 'Create DNS Zone' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create DNS Zone" %}
@@ -37,7 +37,7 @@
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deleteDNSZone' %}" title="{% trans 'Delete Zone' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Zone" %}
@@ -49,7 +49,7 @@
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'addDeleteDNSRecords' %}" title="{% trans 'Add Delete Records' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Add Delete/Records" %}
@@ -68,49 +68,49 @@
<div class="row">
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createNameserver' %}" title="{% trans 'Create Nameserver' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create Nameserver" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-server"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createDNSZone' %}" title="{% trans 'Create DNS Zone' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create DNS Zone" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-globe"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deleteDNSZone' %}" title="{% trans 'Delete Zone' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Zone" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-trash"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'addDeleteDNSRecords' %}" title="{% trans 'Add Delete Records' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Add Delete/Records" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-folder-open"></i>
</div>
</a>
</div>

View File

@@ -169,9 +169,13 @@ app.controller('runContainer', function ($scope, $http) {
};
try {
$.each($scope.portType, function (port, protocol) {
data[port + "/" + protocol] = $scope.eport[port];
});
}
catch (err) {
}
var config = {
headers: {

View File

@@ -12,14 +12,13 @@
<h2>{% trans "Install Docker" %}</h2>
</div>
<div ng-controller="installDocker" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Install Docker" %} <img ng-hide="installDockerStatus"
src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<div class="example-box-wrapper text-center">
{% if conErr == 1 %}
@@ -30,12 +29,12 @@
{% endif %}
{% else %}
<p>{% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}</p>
<p class="h4">{% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}</p>
<!------ LSWS Switch box ----------------->
<div style="margin-top: 2%" ng-hide="installBoxGen" class="col-md-12">
<form action="/" id="" class="form-horizontal bordered-row">
<form action="/" id="" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<div style="margin-top: 2%;" class="col-sm-12">
<textarea ng-model="requestData" rows="15"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -18,7 +18,7 @@
<div ng-controller="emailMarketing" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Email Marketing" %} <img ng-hide="cyberPanelLoading" src="{% static 'images/loading.gif' %}">
</h3>
@@ -37,7 +37,7 @@
{% else %}
<div class="example-box-wrapper">
<table cellpadding="0" cellspacing="0" border="0" class="table table-striped table-bordered" id="datatable-example">
<table cellpadding="0" cellspacing="0" border="0" class="table table-striped" id="datatable-example">
<thead>
<tr>
<th>{% trans 'ID' %}</th>

View File

@@ -3,20 +3,25 @@
{% block title %}{% trans "SpamAssassin - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<h2>{% trans "SpamAssassin Configurations!" %} - <a target="_blank" href="http://go.cyberpanel.net/SpamAssassin" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "SpamAssassin Docs" %}</span></a> </h2>
<div class="container">
<div id="page-title">
<h2>{% trans "SpamAssassin Configurations!" %} - <a target="_blank"
href="http://go.cyberpanel.net/SpamAssassin"
style="height: 23px;line-height: 21px;"
class="btn btn-border btn-alt border-red btn-link font-red"
title=""><span>{% trans "SpamAssassin Docs" %}</span></a>
</h2>
<p>{% trans "On this page you can configure SpamAssassin settings." %}</p>
</div>
</div>
<div ng-controller="SpamAssassin" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div ng-controller="SpamAssassin" class="example-box-wrapper">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "SpamAssassin" %} <img ng-hide="SpamAssassinLoading" src="/static/images/loading.gif">
</h3>
@@ -26,11 +31,12 @@
{% if checkIfSpamAssassinInstalled == 0 %}
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "SpamAssassin is not installed " %}
<h4 class="mb-10">{% trans "SpamAssassin is not installed " %}
</h4>
<button ng-click="installSpamAssassin()" class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Install Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></h3>
</button>
</div>
<!------ SpamAssassin Install Log box ----------------->
@@ -40,7 +46,8 @@
<div class="col-sm-6">
<div ng-hide="failedToStartInallation" class="alert alert-danger">
<p>{% trans "Failed to start installation, Error message: " %} {$ errorMessage $}</p>
<p>{% trans "Failed to start installation, Error message: " %} {$ errorMessage
$}</p>
</div>
<div ng-hide="couldNotConnect" class="alert alert-danger">
@@ -63,10 +70,14 @@
<form action="/" id="" class="form-horizontal bordered-row">
<div class="form-group">
<div class="col-sm-12 text-center">
<h3><img src="{% static 'firewall/icons/firewall.png' %}"> {% trans "Winter is coming, but so is SpamAssassin." %} <img ng-hide="SpamAssassinLoading" src="/static/images/loading.gif"></h3>
<h3><img
src="{% static 'firewall/icons/firewall.png' %}"> {% trans "Winter is coming, but so is SpamAssassin." %}
<img ng-hide="SpamAssassinLoading" src="/static/images/loading.gif">
</h3>
</div>
<div style="margin-top: 2%;" class="col-sm-12">
<textarea ng-model="requestData" rows="15" class="form-control">{{ requestData }}</textarea>
<textarea ng-model="requestData" rows="15"
class="form-control">{{ requestData }}</textarea>
</div>
</div>
</form>
@@ -111,19 +122,20 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveSpamAssassinConfigurations()" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
<button type="button" ng-click="saveSpamAssassinConfigurations()"
class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="failedToSave" class="alert alert-danger">
<p>{% trans "Failed to save SpamAssassin configurations. Error message: " %} {$ errorMessage $}</p>
<p>{% trans "Failed to save SpamAssassin configurations. Error message: " %}
{$ errorMessage $}</p>
</div>
<div ng-hide="successfullySaved" class="alert alert-success">
@@ -144,14 +156,13 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -18,7 +18,7 @@
<div ng-controller="listDomains" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Domains" %} <img ng-hide="emailLimitsLoading" src="{% static 'images/loading.gif' %}">
</h3>
@@ -26,12 +26,14 @@
<div class="row">
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "Email Policy Server is not enabled " %}
<h4 class="mb-10">{% trans "Email Policy Server is not enabled " %}
</h4>
<a href="{% url 'emailPolicyServer' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a>
</div>
</div>
{% else %}

View File

@@ -15,8 +15,8 @@
</div>
<div ng-controller="policyServer" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "Email Policy Server" %} <img ng-hide="policyServerLoading" src="/static/images/loading.gif">
</h3>
@@ -24,10 +24,10 @@
<div class="row">
<div style="padding: 2%" class="col-md-12">
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<form action="/" id="createPackages" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-4 control-label">{% trans "Server Status" %}</label>
<label class="col-sm-3 control-label">{% trans "Server Status" %}</label>
<div class="col-sm-6">
<input type="checkbox" id="policServerStatus" data-toggle="toggle">
</div>
@@ -37,7 +37,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="savePolicServerStatus()" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
<button type="button" ng-click="savePolicServerStatus()" class="btn btn-primary btn-lg">{% trans "Save changes" %}</button>
</div>
</div>

View File

@@ -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%;
}
@@ -42,3 +51,126 @@
margin-bottom: 2%;
margin-top: 2%;
}
.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;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@@ -1570,5 +1570,3 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
});

View File

@@ -40,11 +40,58 @@
<!--- navigation bar ---->
<nav id="navBar" class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#"><img id="logo" src="{% static 'filemanager/images/fileManager.png' %}">{% trans " File Manager" %} <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
<div class="header-logo">
<a href="#"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
</div>
<!--- second bar ---->
<div class="">
<div class="flex-wrap">
<!--div class="text-white h4 mt-5 mx-10">
{% trans " File Manager" %}
</div-->
<ul class="nav mr-10">
<li class="nav-item">
<a onclick="return false;" ng-click="showUploadBox()" class="nav-link point-events" href="#"><i class="fa fa-upload" aria-hidden="true"></i> {% trans "Upload" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="showCreateFileModal()" class="nav-link point-events" href="#"><i class="fa fa-plus-square" aria-hidden="true"></i> {% trans "New File" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="showCreateFolderModal()" class="nav-link point-events" href="#"><i class="fa fa-folder" aria-hidden="true"></i> {% trans "New Folder" %}</a>
</li>
<li id="deleteFile" class="nav-item">
<a onclick="return false;" ng-click="showDeleteModal()" class="nav-link point-events" href="#"><i class="fa fa-trash-o" aria-hidden="true"></i> {% trans "Delete" %}</a>
</li>
<li id="copyFile" class="nav-item">
<a onclick="return false;" ng-click="showCopyModal()" class="nav-link point-events" href="#"><i class="fa fa-files-o" aria-hidden="true"></i> {% trans "Copy" %}</a>
</li>
<li id="moveFile" class="nav-item">
<a onclick="return false;" ng-click="showMoveModal()" class="nav-link point-events" href="#"><i class="fa fa-arrows-alt" aria-hidden="true"></i> {% trans "Move" %}</a>
</li>
<li id="renameFile" class="nav-item">
<a onclick="return false;" ng-click="showRenameModal()" class="nav-link point-events" href="#"><i class="fa fa-file-text-o" aria-hidden="true"></i> {% trans "Rename" %}</a>
</li>
<li id="editFile" class="nav-item" >
<a onclick="return false;" ng-click="showHTMLEditorModal()" class="nav-link point-events" href="#"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {% trans "Edit" %}</a>
</li>
<li id="compressFile" class="nav-item">
<a onclick="return false;" ng-click="showCompressionModal()" class="nav-link point-events" href="#"><i class="fa fa-compress" aria-hidden="true"></i> {% trans "Compress" %}</a>
</li>
<li id="extractFile" class="nav-item">
<a onclick="return false;" ng-click="showExtractionModal()" class="nav-link point-events" href="#"><i class="fa fa-expand" aria-hidden="true"></i> {% trans "Extract" %}</a>
</li>
<li id="fixPermissions" class="nav-item">
<a onclick="return false;" ng-click="fixPermissions()" class="nav-link point-events" href="#"><i class="fa fa-wrench" aria-hidden="true"></i> {% trans "Fix Permissions" %}</a>
</li>
</ul>
</div>
</div>
<!--- second bar ends ---->
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
@@ -54,69 +101,23 @@
<!--- navigation bar ends ---->
<!--- second bar ---->
<div class="card">
<div class="card-body">
<ul class="nav">
<li class="nav-item">
<a onclick="return false;" ng-click="showUploadBox()" class="nav-link" href="#"><i class="fa fa-upload" aria-hidden="true"></i> {% trans "Upload" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="showCreateFileModal()" class="nav-link" href="#"><i class="fa fa-file" aria-hidden="true"></i> {% trans "New File" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="showCreateFolderModal()" class="nav-link" href="#"><i class="fa fa-folder" aria-hidden="true"></i> {% trans "New Folder" %}</a>
</li>
<li id="deleteFile" class="nav-item">
<a onclick="return false;" ng-click="showDeleteModal()" class="nav-link" href="#"><i class="fa fa-trash-o" aria-hidden="true"></i> {% trans "Delete" %}</a>
</li>
<li id="copyFile" class="nav-item">
<a onclick="return false;" ng-click="showCopyModal()" class="nav-link" href="#"><i class="fa fa-files-o" aria-hidden="true"></i> {% trans "Copy" %}</a>
</li>
<li id="moveFile" class="nav-item">
<a onclick="return false;" ng-click="showMoveModal()" class="nav-link" href="#"><i class="fa fa-arrows-alt" aria-hidden="true"></i> {% trans "Move" %}</a>
</li>
<li id="renameFile" class="nav-item">
<a onclick="return false;" ng-click="showRenameModal()" class="nav-link" href="#"><i class="fa fa-file-text-o" aria-hidden="true"></i> {% trans "Rename" %}</a>
</li>
<li id="editFile" class="nav-item">
<a onclick="return false;" ng-click="showHTMLEditorModal()" class="nav-link" href="#"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {% trans "Edit" %}</a>
</li>
<li id="compressFile" class="nav-item">
<a onclick="return false;" ng-click="showCompressionModal()" class="nav-link" href="#"><i class="fa fa-compress" aria-hidden="true"></i> {% trans "Compress" %}</a>
</li>
<li id="extractFile" class="nav-item">
<a onclick="return false;" ng-click="showExtractionModal()" class="nav-link" href="#"><i class="fa fa-expand" aria-hidden="true"></i> {% trans "Extract" %}</a>
</li>
<li id="fixPermissions" class="nav-item">
<a onclick="return false;" ng-click="fixPermissions()" class="nav-link" href="#"><i class="fa fa-bars" aria-hidden="true"></i> {% trans "Fix Permissions" %}</a>
</li>
</ul>
</div>
</div>
<!--- second bar ends ---->
<!--- File Manager body ---->
<div id="mainRow" class="row">
<div id="treeView" class="col-sm-3">
<div class="card border-primary mb-3" style="min-height: 30rem;">
<div class="row">
<div id="treeView" class="col-sm-3" style="padding-right: 0px;">
<div class="content-box mb-3 bg-lightgray" style="height: 100%;">
<div class="card-header">
<div>
<div class="mt-20">
<label>{% trans "Current Path" %} <img ng-hide="treeLoading" src="{% static 'filemanager/images/loadingSmall.gif' %}"> </label>
<input type="text" class="form-control" id="currentPath" ng-model="currentPath" readonly>
</div>
</div>
<ul class="list-group list-group-flush">
<li class="list-group-item">
<a href="#" onclick="return false;" ng-click="fetchChilds($event,completeStartingPath,'primary')">
<i class="fa fa-plus" aria-hidden="true"></i>
<i class="fa fa-plus" aria-hidden="true" ></i>
</a>
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'fromTree',completeStartingPath)" href="#">
<i class="fa fa-folder" aria-hidden="true"></i> {$ startingPath $}
@@ -126,32 +127,29 @@
</div>
</div>
<div class="col-sm-9">
<div class="card border-primary mb-3" style="min-height: 30rem;">
<div class="card-header">
<ul class="nav">
<div class="mb-3 mt-30 mx-10" style="min-height: 30rem;">
<div class="">
<ul class="nav mb-10">
<li class="nav-item">
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'homeFetch')" class="nav-link" href="#"><i class="fa fa-home" aria-hidden="true"></i> {% trans "Home" %}</a>
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'homeFetch')" class="mx-10" href="#"><i class="fa fa-home fa-lg" aria-hidden="true"></i> {% trans "Home" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'goBackOnPath')" class="nav-link" href="#"><i class="fa fa-arrow-left" aria-hidden="true"></i> {% trans "Back" %}</a>
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'goBackOnPath')" class="mx-10" href="#"><i class="fa fa-arrow-left fa-lg" aria-hidden="true"></i> {% trans "Back" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'refresh')" class="nav-link" href="#"><i class="fa fa-refresh" aria-hidden="true"></i> {% trans "Refresh" %}</a>
<a onclick="return false;" ng-click="fetchForTableSecondary($event,'refresh')" class="mx-10" href="#"><i class="fa fa-refresh fa-lg" aria-hidden="true"></i> {% trans "Refresh" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="selectAll()" class="nav-link" href="#"><i class="fa fa-check-square-o" aria-hidden="true"></i> {% trans "Select All" %}</a>
<a onclick="return false;" ng-click="selectAll()" class="mx-10" href="#"><i class="fa fa-check-square-o fa-lg" aria-hidden="true"></i> {% trans "Select All" %}</a>
</li>
<li class="nav-item">
<a onclick="return false;" ng-click="unSelectAll()" class="nav-link" href="#"><i class="fa fa-square-o" aria-hidden="true"></i> {% trans "UnSelect All" %}</a>
<a onclick="return false;" ng-click="unSelectAll()" class="mx-10" href="#"><i class="fa fa-square-o fa-lg" aria-hidden="true"></i> {% trans "UnSelect All" %}</a>
</li>
</ul>
</div>
<table class="table">
<thead id="tableHead">
@@ -186,26 +184,19 @@
</button>
</div>
<div class="modal-body">
<h3>{% trans "Upload queue" %}</h3>
<p>{% trans "Queue length:" %} {$ uploader.queue.length $}</p>
<div>
<div class="card my-drop-zone" nv-file-over="" uploader="uploader">
<div class="card-body">
<h4 class="card-title">{% trans "Drop" %}</h4>
<p class="card-text">{% trans "Drop Files here to upload them." %}</p>
</div>
</div>
<div class="form-group">
<label for="uploadControlMultiple">{% trans "Upload" %}</label>
<input type="file" nv-file-select="" uploader="uploader" class="form-control-file" id="uploadControlMultiple" multiple>
</div>
<table class="table">
<thead>
<tr>

View File

@@ -16,8 +16,8 @@
{% if csfInstalled == 0 %}
<div class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "CSF" %} <img ng-hide="csfLoading" src="/static/images/loading.gif">
</h3>
@@ -25,11 +25,12 @@
<div class="row">
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "CSF is not installed " %}
<h4 class="mb-10">{% trans "CSF is not installed " %}
</h4>
<button ng-click="installCSF()" class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Install Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></h3>
</button>
</div>
<!------ ModeSec Install Log box ----------------->

View File

@@ -15,13 +15,13 @@
</div>
<div ng-controller="firewallController" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Add/Delete Rules" %} <img ng-hide="rulesLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div style="padding-bottom: 0px; padding-top: 15px;" class="form-group">
@@ -29,35 +29,27 @@
<div class="col-sm-6">
<div class="example-box-wrapper">
<div class="content-box remove-border dashboard-buttons clearfix">
<div class="content-box remove-border clearfix text-center">
<a style="height: 70px;" class="btn vertical-button btn-border btn-alt border-purple btn-link font-purple " href="#" title="">
<span>{% trans "Status" %}</span>
<h4 style="margin-top: 6%">{$ status $}</h4>
<a class="btn btn-primary" href="#" title="">
<span>{% trans "Status" %}
<b>{$ status $}</b></span>
</a>
<a ng-click="startFirewall()" href="#" class="btn vertical-button remove-border btn-success" title="">
<span class="glyph-icon icon-separator-vertical">
<i class="glyph-icon icon-tags"></i>
</span>
<span class="button-content">{% trans "Start" %}</span>
<a ng-click="startFirewall()" href="#" class="btn btn-success" title="">
<i class="fa fa-play btn-icon"></i>
</a>
<a ng-click="stopFirewall()" href="#" class="btn vertical-button remove-border btn-warning" title="">
<span class="glyph-icon icon-separator-vertical">
<i class="glyph-icon icon-fire"></i>
</span>
<span class="button-content">{% trans "Stop" %}</span>
<a ng-click="stopFirewall()" href="#" class="btn btn-warning" title="">
<i class="fa fa-pause btn-icon"></i>
</a>
<a ng-click="reloadFireWall()" href="#" class="btn vertical-button remove-border btn-yellow" title="">
<span class="glyph-icon icon-separator-vertical">
<i class="glyph-icon icon-laptop"></i>
</span>
<span class="button-content">{% trans "Reload" %}</span>
</a>
<a ng-click="reloadFireWall()" href="#" class="btn btn-info" title="">
<i class="fa fa-refresh btn-icon"></i>
</a>
<div style="margin-top: 2%;margin-bottom: 0px;" ng-hide="actionFailed" class="alert alert-danger">
<p>{% trans "Action failed. Error message:" %} {$ errorMessage $}</p>
@@ -74,13 +66,9 @@
</div>
</div>
<div ng-hide="rulesDetails" class="form-group">
<div class="col-sm-2">
<div class="col-sm-3">
<input placeholder="Rule Name" type="text" class="form-control" ng-model="ruleName" required>
</div>
@@ -90,9 +78,6 @@
<option>udp</option>
</select>
</div>
<!------------- ip box ------------->
<div class="col-sm-3">
@@ -101,9 +86,6 @@
<!------------- ip box ------------->
<!------------- port box ------------->
<div class="col-sm-2">
@@ -113,7 +95,7 @@
<!------------- port box ------------->
<div class="col-sm-3">
<div class="col-sm-1">
<button style="width: 100%;" type="button" ng-click="addRule()" class="btn btn-primary">{% trans "Add" %}</button>
</div>
@@ -129,7 +111,7 @@
<div class="col-sm-12">
<table class="table">
<table class="table" style="margin-left: 0px;">
<thead>
<tr>
<th>{% trans "ID" %}</th>
@@ -147,7 +129,7 @@
<td ng-bind="rule.proto"></td>
<td ng-bind="rule.ipAddress"></td>
<td ng-bind="rule.port"></td>
<td ng-click="deleteRule(rule.id,rule.proto,rule.port,rule.ipAddress)"><img src="{% static 'images/delete.png' %}"></td>
<td ng-click="deleteRule(rule.id,rule.proto,rule.port,rule.ipAddress)"><div class=" h4 text-danger text-bold">X</div></td>
</tr>
</tbody>
</table>

View File

@@ -13,32 +13,32 @@
<p>{% trans "Manage the security of the server on this page." %}</p>
</div>
<div class="panel">
<div class="panel col-lg-8 col-md-4" style="width: auto;">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<div class="col-lg-5 col-md-6 btn-min-width">
<a href="{% url 'firewallHome' %}" title="{% trans 'Firewall' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Firewall" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-shield"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-lg-5 col-md-6 btn-min-width">
<a href="{% url 'secureSSH' %}" title="{% trans 'Secure SSH' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Secure SSH" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-lock"></i>
</div>
</a>
</div>

View File

@@ -21,23 +21,20 @@
</div>
<div ng-controller="modSec" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "ModSecurity" %} <img ng-hide="modsecLoading" src="/static/images/loading.gif">
</h3>
<div class="content-box-wrapper">
<div class="row">
{% if modSecInstalled == 0 %}
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "ModSecurity is not installed " %}
<h4 class="mb-10">{% trans "ModSecurity is not installed " %}
</h4>
<button ng-click="installModSec()" class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Install Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button>
</h3>
</div>
<!------ ModeSec Install Log box ----------------->

View File

@@ -15,8 +15,8 @@
</div>
<div ng-controller="modSecRules" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "ModSecurity Rules" %} <img ng-hide="modsecLoading" src="/static/images/loading.gif">
</h3>
@@ -39,7 +39,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveModSecRules()" class="btn btn-primary btn-lg btn-block">{% trans "Save Rules!" %}</button>
<button type="button" ng-click="saveModSecRules()" class="btn btn-primary btn-lg">{% trans "Save Rules!" %}</button>
</div>
</div>
@@ -67,11 +67,12 @@
{% else %}
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "ModSecurity is not installed " %}
<h4 class="mb-10">{% trans "ModSecurity is not installed " %}
</h4>
<a href="{% url 'modSecurity' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Install Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button></a>
</div>
{% endif %}

View File

@@ -15,8 +15,8 @@
</div>
<div ng-controller="modSecRulesPack" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "ModSecurity Rules Packages!" %} <img ng-hide="modsecLoading" src="/static/images/loading.gif">
</h3>
@@ -25,12 +25,12 @@
<div class="row">
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "ModSecurity is not installed " %}
<h4 class="mb-10">{% trans "ModSecurity is not installed " %}
</h4>
<a href="{% url 'modSecurity' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Install Now." %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a>
</h3>
</div>
</div>
</div>

View File

@@ -16,22 +16,22 @@
<div ng-controller="secureSSHCTRL" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Secure SSH" %} <img ng-hide="secureSSHLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<ul class="list-group list-group-separator row list-group-icons">
<ul class="nav nav-tabs">
<li class="col-md-3 active">
<a href="#tab-example-1" data-toggle="tab" class="list-group-item">
<i class="glyph-icon icon-dashboard"></i>
{% trans "Basic" %}
<li class="col-md-2 nav-item active">
<a href="#tab-example-1" data-toggle="tab" class="nav-link tab-mod h4">
<i class="fa fa-cog btn-icon mr-10"></i>&nbsp;
<span>{% trans "Basic" %}</span>
</a>
</li>
<li class="col-md-3">
<a href="#tab-example-3" data-toggle="tab" class="list-group-item">
<i class="glyph-icon font-blue-alt icon-globe"></i>
{% trans "SSH Keys" %}
<li class="col-md-2 nav-item">
<a href="#tab-example-3" data-toggle="tab" class="nav-link tab-mod h4">
<i class="fa fa-cogs btn-icon mr-10"></i>&nbsp;
<span>{% trans "SSH Keys" %}</span>
</a>
</li>
</ul>
@@ -54,7 +54,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Permit Root Login" %}</label>
<div class="col-sm-6">
<div class="col-md-8 text-white">
<input type="checkbox" id="rootLogin" data-toggle="toggle" data-on="Enabled">
<div style="margin-top: 2%;margin-bottom: -2%" class="alert alert-warning">
<p>{% trans "Before disabling root login, make sure you have another account with sudo priviliges on server." %}</p>
@@ -65,7 +65,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveChanges()" class="btn btn-primary btn-lg btn-block">{% trans "Save Changes" %}</button>
<button type="button" ng-click="saveChanges()" class="btn btn-primary btn-lg">{% trans "Save Changes" %}</button>
</div>
</div>
@@ -126,7 +126,7 @@
<tr ng-repeat="record in records track by $index">
<td ng-bind="record.userName">root</td>
<td ng-bind="record.key"></td>
<td ng-click="deleteKey(record.key)"><img src="{% static 'images/delete.png' %}"></td>
<td ng-click="deleteKey(record.key)"><div class="h4 text-danger text-bold">X</div></td>
</tr>
</tbody>
</table>
@@ -147,7 +147,7 @@
<div ng-hide="showKeyBox" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="addKey()" class="btn btn-primary btn-lg btn-block">{% trans "Add Key" %}</button>
<button type="button" ng-click="addKey()" class="btn btn-primary btn-lg">{% trans "Add Key" %}</button>
</div>
</div>
@@ -155,7 +155,7 @@
<div ng-hide="saveKeyBtn" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveKey()" class="btn btn-primary btn-lg btn-block">{% trans "Save" %}</button>
<button type="button" ng-click="saveKey()" class="btn btn-primary btn-lg">{% trans "Save" %}</button>
</div>
</div>

View File

@@ -37,7 +37,7 @@
<div ng-hide="modSecNotifyBox" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-6">
<div class="col-md-6">
<div ng-hide="failedToStartInallation" class="alert alert-danger">
<p>{% trans "Failed to start installation, Error message: " %} {$ errorMessage $}</p>

View File

@@ -3,17 +3,17 @@
{% block title %}{% trans "Create FTP Account - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Create FTP Account" %}</h2>
<p>{% trans "Select the website from list, and its home directory will be set as the path to ftp account." %}</p>
</div>
</div>
<div ng-controller="createFTPAccount" class="panel">
<div ng-controller="createFTPAccount" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Create FTP Account" %} <img ng-hide="ftpLoading" src="{% static 'images/loading.gif' %}">
@@ -24,10 +24,12 @@
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "PureFTPD is disabled." %}
<a href="{% url 'managePureFtpd' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<a href="{% url 'managePureFtpd' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now" %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a></h3>
</div>
@@ -54,7 +56,8 @@
<div ng-hide="ftpDetails" class="form-group">
<label class="col-sm-3 control-label">{% trans "User Name" %}</label>
<div class="col-sm-6">
<input ng-change="hideFewDetails()" type="text" class="form-control" ng-model="ftpUserName" required>
<input ng-change="hideFewDetails()" type="text" class="form-control"
ng-model="ftpUserName" required>
</div>
<div class="current-pack">{{ admin }}_{$ ftpUserName $}</div>
@@ -70,7 +73,8 @@
<div ng-hide="ftpDetails" class="form-group">
<label class="col-sm-3 control-label">{% trans "Path (Relative)" %}</label>
<div class="col-sm-6">
<input placeholder="{% trans 'Leave empty to select default home directory.' %}" type="text" class="form-control" ng-model="ftpPath" required>
<input placeholder="{% trans 'Leave empty to select default home directory.' %}"
type="text" class="form-control" ng-model="ftpPath" required>
</div>
</div>
@@ -81,28 +85,31 @@
<div ng-hide="ftpDetails" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createFTPAccount()" class="btn btn-primary btn-lg btn-block">{% trans "Create FTP" %}</button>
<button type="button" ng-click="createFTPAccount()"
class="btn btn-primary btn-lg btn-block">{% trans "Create FTP" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotCreate" class="alert alert-danger">
<p>{% trans "Cannot create FTP account. Error message:" %} {$ errorMessage $}</p>
<p>{% trans "Cannot create FTP account. Error message:" %} {$ errorMessage
$}</p>
</div>
<div ng-hide="successfullyCreated" class="alert alert-success">
<p>{% trans "FTP Account with username:" %} {$ ftpUserName $} {% trans "is successfully created." %}</p>
<p>{% trans "FTP Account with username:" %} {$ ftpUserName
$} {% trans "is successfully created." %}</p>
</div>
<div ng-hide="couldNotConnect" class="alert alert-success">
<p>{% trans "FTP Account with username:" %} {$ ftpUserName $} {% trans "is successfully created." %}</p>
<p>{% trans "FTP Account with username:" %} {$ ftpUserName
$} {% trans "is successfully created." %}</p>
</div>
</div>
</div>
@@ -111,14 +118,12 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -78,7 +78,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="deleteFailure" class="alert alert-danger">
<p>{% trans "Cannot delete account. Error message:" %} {$ errorMessage $}</p>
</div>

View File

@@ -13,45 +13,42 @@
<p>{% trans "Delete and create FTP accounts on this page." %}</p>
</div>
<div class="panel">
<div class="panel col-md-12">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createFTPAccount' %}" title="{% trans 'Create FTP Account' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create FTP Account" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-plus-square"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deleteFTPAccount' %}" title="{% trans 'Delete FTP Account' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete FTP Account" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-trash"></i>
</div>
</a>
</div>
<div class="col-md-4">
<div class="col-md-3 btn-min-width">
<a href="{% url 'listFTPAccounts' %}" title="{% trans 'List FTP Accounts' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "List FTP Accounts" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-list-ul"></i>
</div>
</a>
</div>

View File

@@ -3,17 +3,17 @@
{% block title %}{% trans "List FTP Accounts - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "List FTP Accounts" %}</h2>
<p>{% trans "List FTP Accounts or change their passwords." %}</p>
</div>
<div ng-controller="listFTPAccounts" class="panel">
</div>
<div ng-controller="listFTPAccounts" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "List FTP Accounts" %} <img ng-hide="ftpLoading" src="{% static 'images/loading.gif' %}">
@@ -24,10 +24,12 @@
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "PureFTPD is disabled." %}
<a href="{% url 'managePureFtpd' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<a href="{% url 'managePureFtpd' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now" %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a></h3>
</div>
@@ -39,7 +41,8 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Domain" %}</label>
<div class="col-sm-6">
<select ng-change="fetchFTPAccounts()" ng-model="selectedDomain" class="form-control">
<select ng-change="fetchFTPAccounts()" ng-model="selectedDomain"
class="form-control">
{% for items in websiteList %}
<option>{{ items }}</option>
{% endfor %}
@@ -52,10 +55,11 @@
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="recordsFetched" class="alert alert-success">
<p>{% trans "Records successfully fetched for" %} <strong>{$ domainFeteched $}</strong></p>
<p>{% trans "Records successfully fetched for" %} <strong>{$ domainFeteched
$}</strong></p>
</div>
<div ng-hide="passwordChanged" class="alert alert-success">
@@ -63,7 +67,8 @@
</div>
<div ng-hide="canNotChangePassword" class="alert alert-danger">
<p>{% trans "Cannot change password for <strong>{$ ftpUsername $}</strong>. Error message:" %} {$ errorMessage $}</p>
<p>{% trans "Cannot change password for <strong>{$ ftpUsername $}</strong>. Error message:" %}
{$ errorMessage $}</p>
</div>
@@ -78,11 +83,13 @@
<div ng-hide="changePasswordBox" class="form-group">
<label class="col-sm-3 control-label">{$ ftpUsername $}</label>
<div class="col-sm-6">
<input name="dom" type="password" class="form-control" ng-model="ftpPassword" required>
<input name="dom" type="password" class="form-control" ng-model="ftpPassword"
required>
</div>
<div style="margin-top: 1%" class="col-sm-6 col-md-offset-3">
<button type="button" ng-click="changePasswordBtn()" class="btn btn-primary btn-lg btn-block">{% trans "Change Password" %}</button>
<button type="button" ng-click="changePasswordBtn()"
class="btn btn-primary btn-lg btn-block">{% trans "Change Password" %}</button>
</div>
</div>
@@ -107,9 +114,14 @@
<tr ng-repeat="record in records track by $index">
<td ng-bind="record.id"></td>
<td ng-bind="record.user"></td>
<td><i class="glyph-icon tooltip-button icon-home" title=".icon-home"></i> {$ record.dir $} </td>
<td><i class="glyph-icon tooltip-button icon-home" title=".icon-home"></i>
{$ record.dir $}
</td>
<td ng-bind="record.quotasize"></td>
<td><button type="button" ng-click="changePassword(record.user)" class="btn ra-100 btn-purple">{% trans "Change" %}</button></td>
<td>
<button type="button" ng-click="changePassword(record.user)"
class="btn ra-100 btn-purple">{% trans "Change" %}</button>
</td>
</tr>
</tbody>
</table>
@@ -119,20 +131,17 @@
<!------ List of records --------------->
</form>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -126,6 +126,7 @@
<select ng-model="languageSelection" class="form-control">
<option selected>English</option>
<option>Chinese</option>
<option>Italian</option>
<option>French</option>
<option>Bulgarian</option>
<option>Portuguese</option>

View File

@@ -99,6 +99,11 @@ def verifyLogin(request):
request.session[LANGUAGE_SESSION_KEY] = user_Language
request.COOKIES['django_language'] = user_Language
settings.LANGUAGE_CODE = user_Language
elif data['languageSelection'] == "Italian":
user_Language = "it"
request.session[LANGUAGE_SESSION_KEY] = user_Language
request.COOKIES['django_language'] = user_Language
settings.LANGUAGE_CODE = user_Language
except:
request.session[LANGUAGE_SESSION_KEY] = "en"
request.COOKIES['django_language'] = "en"

View File

@@ -3,20 +3,21 @@
{% block title %}{% trans "Change Email Password - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Change Email Password" %}</h2>
<p>{% trans "Select a website from the list, to change its password." %}</p>
</div>
</div>
<div ng-controller="changeEmailPassword" class="panel">
<div ng-controller="changeEmailPassword" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Change Email Password" %} <img ng-hide="emailLoading" src="{% static 'images/loading.gif' %}">
<h3 class="content-box-header">
{% trans "Change Email Password" %} <img ng-hide="emailLoading"
src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -24,17 +25,19 @@
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "Postfix is disabled." %}
<a href="{% url 'managePostfix' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<a href="{% url 'managePostfix' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now" %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -74,16 +77,18 @@
<div ng-hide="emailDetails" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="changePassword()" class="btn btn-primary btn-lg btn-block">{% trans "Change Password" %}</button>
<button type="button" ng-click="changePassword()"
class="btn btn-primary btn-lg">{% trans "Change Password" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotChangePassword" class="alert alert-danger">
<p>{% trans "Cannot delete email account. Error message:" %} {$ errorMessage $}</p>
<p>{% trans "Cannot delete email account. Error message:" %} {$ errorMessage
$}</p>
</div>
<div ng-hide="passwordChanged" class="alert alert-success">
@@ -100,7 +105,6 @@
</div>
</div>
@@ -109,14 +113,12 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -3,20 +3,21 @@
{% block title %}{% trans "Create Email Account - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Create Email Account" %}</h2>
<p>{% trans "Select a website from the list, to create an email account." %}</p>
</div>
</div>
<div ng-controller="createEmailAccount" class="panel">
<div ng-controller="createEmailAccount" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Create Email Account" %} <img ng-hide="emailLoading" src="{% static 'images/loading.gif' %}">
<h3 class="content-box-header">
{% trans "Create Email Account" %} <img ng-hide="emailLoading"
src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -24,17 +25,19 @@
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "Postfix is disabled." %}
<a href="{% url 'managePostfix' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<a href="{% url 'managePostfix' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now" %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -55,7 +58,8 @@
<div ng-hide="emailDetails" class="form-group">
<label class="col-sm-3 control-label">{% trans "User Name" %}</label>
<div class="col-sm-6">
<input ng-change="hideFewDetails" type="text" class="form-control" ng-model="emailUsername" required>
<input ng-change="hideFewDetails" type="text" class="form-control"
ng-model="emailUsername" required>
</div>
<div class="current-pack">@{$ selectedDomain $}</div>
</div>
@@ -74,19 +78,22 @@
<div ng-hide="emailDetails" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createEmailAccount()" class="btn btn-primary btn-lg btn-block">{% trans "Create Email" %}</button>
<button type="button" ng-click="createEmailAccount()"
class="btn btn-primary btn-lg">{% trans "Create Email" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotCreate" class="alert alert-danger">
<p>{% trans "Cannot create email account. Error message:" %} {$ errorMessage $}</p>
<p>{% trans "Cannot create email account. Error message:" %} {$ errorMessage
$}</p>
</div>
<div ng-hide="successfullyCreated" class="alert alert-success">
<p>{% trans "Email with id :" %} {$ createdID $}{% trans " is successfully created." %}</p>
<p>{% trans "Email with id :" %} {$ createdID
$}{% trans " is successfully created." %}</p>
</div>
<div ng-hide="couldNotConnect" class="alert alert-danger">
<p>{% trans "Could not connect to server. Please refresh this page." %}</p>
@@ -95,7 +102,6 @@
</div>
</div>
@@ -104,14 +110,12 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -3,20 +3,21 @@
{% block title %}{% trans "Delete Email Account - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Delete Email Account" %}</h2>
<p>{% trans "Select a website from the list, to delete an email account." %}</p>
</div>
</div>
<div ng-controller="deleteEmailAccount" class="panel">
<div ng-controller="deleteEmailAccount" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Delete Email Account" %} <img ng-hide="emailLoading" src="{% static 'images/loading.gif' %}">
<h3 class="content-box-header">
{% trans "Delete Email Account" %} <img ng-hide="emailLoading"
src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -24,17 +25,19 @@
<div class="col-md-12 text-center" style="margin-bottom: 2%;">
<h3>{% trans "Postfix is disabled." %}
<a href="{% url 'managePostfix' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
<a href="{% url 'managePostfix' %}">
<button class="btn btn-alt btn-hover btn-blue-alt">
<span>{% trans "Enable Now" %}</span>
<i class="glyph-icon icon-arrow-right"></i>
</button></a></h3>
</button>
</a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -66,7 +69,8 @@
<div ng-hide="emailDetails" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deleteEmailAccount()" class="btn btn-primary btn-lg btn-block">{% trans "Delete Email" %}</button>
<button type="button" ng-click="deleteEmailAccount()"
class="btn btn-primary btn-lg">{% trans "Delete Email" %}</button>
</div>
</div>
@@ -74,15 +78,17 @@
<div ng-hide="emailDetailsFinal" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deleteEmailAccountFinal()" class="btn btn-primary btn-lg btn-block">{% trans "Are you sure?" %}</button>
<button type="button" ng-click="deleteEmailAccountFinal()"
class="btn btn-primary btn-lg">{% trans "Are you sure?" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotDelete" class="alert alert-danger">
<p>{% trans "Cannot delete email account. Error message:" %} {$ errorMessage $}</p>
<p>{% trans "Cannot delete email account. Error message:" %} {$ errorMessage
$}</p>
</div>
<div ng-hide="successfullyDeleted" class="alert alert-success">
@@ -99,7 +105,6 @@
</div>
</div>
@@ -108,14 +113,12 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -18,11 +18,11 @@
{% if openDKIMInstalled == 0 %}
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "DKIM Manager" %} <img ng-hide="manageDKIMLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group text-center">
<h3>{% trans "OpenDKIM is not installed. " %}
<a href="" ng-click="installOpenDKIM()"><strong>{% trans "Install Now" %}</strong></a>
@@ -53,7 +53,7 @@
<div ng-hide="openDKIMInstallBox" class="col-md-12">
<form action="/" id="" class="form-horizontal bordered-row">
<form action="/" id="" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<div style="margin-top: 2%;" class="col-sm-12">
<textarea ng-model="requestData" rows="15" class="form-control">{{ requestData }}</textarea>
@@ -71,12 +71,12 @@
</div>
{% else %}
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "DKIM Manager" %} <img ng-hide="manageDKIMLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">

View File

@@ -15,7 +15,7 @@
<div ng-controller="emailForwarding" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Setup Email Forwarding" %} <img ng-hide="forwardLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
@@ -30,12 +30,9 @@
</button></a></h3>
</div>
{% else %}
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Website" %} </label>

View File

@@ -3,55 +3,58 @@
{% block title %}{% trans "Mail Functions - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Mail Functions" %}</h2>
<p>{% trans "Manage email accounts on this page." %}</p>
</div>
</div>
<div class="panel">
<div class="panel col-md-12">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<a href="{% url 'createEmailAccount' %}" title="{% trans 'Create Email' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createEmailAccount' %}" title="{% trans 'Create Email' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create Email" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-plus-square"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'deleteEmailAccount' %}" title="{% trans 'Delete Email' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deleteEmailAccount' %}" title="{% trans 'Delete Email' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Email" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-trash"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'changeEmailAccountPassword' %}" title="{% trans 'Change Password' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'changeEmailAccountPassword' %}" title="{% trans 'Change Password' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Change Password" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-key"></i>
</div>
</a>
</div>
@@ -64,7 +67,7 @@
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -17,22 +17,23 @@
<div ng-controller="editPHPConfig" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Edit PHP Configurations" %}
</h3>
<div class="example-box-wrapper">
<ul class="list-group list-group-separator row list-group-icons">
<ul class="nav nav-tabs">
<li class="col-md-3 active">
<a href="#tab-example-1" data-toggle="tab" class="list-group-item">
<i class="glyph-icon icon-dashboard"></i>
{% trans "Basic" %}
<li class="col-md-2 nav-item tab-mod active">
<a href="#tab-example-1" data-toggle="tab" class="h4 nav-link">
<i class="fa fa-cog btn-icon"></i>
<span>{% trans "Basic" %}</span>
</a>
</li>
<li class="col-md-3">
<a href="#tab-example-3" data-toggle="tab" class="list-group-item">
<i class="glyph-icon font-blue-alt icon-globe"></i>
{% trans "Advanced" %}
<li class="col-md-2 tab-mod nav-item">
<a href="#tab-example-3" data-toggle="tab" class="h4 nav-link">
<i class="fa fa-cogs btn-icon"></i>
<span>{% trans "Advanced" %}</span>
</a>
</li>
</ul>

View File

@@ -12,33 +12,32 @@
<h2>{% trans "Manage PHP Installations" %}</h2>
<p>{% trans "Edit your PHP Configurations to suit your needs." %}</p>
</div>
<div class="panel">
<div class="panel col-lg-10 col-md-10" style="width: auto;">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-6">
<div class="col-lg-3 col-md-5 btn-min-width">
<a href="{% url 'installExtensions' %}" title="{% trans 'Install Extensions' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Install Extensions" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-download"></i>
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-lg-3 col-md-5 btn-min-width">
<a href="{% url 'editPHPConfigs' %}" title="{% trans 'Edit PHP Configs' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Edit PHP Configs" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-edit"></i>
</div>
</a>
</div>

View File

@@ -15,14 +15,14 @@
</div>
<div class="panel">
<div ng-controller="installExtensions" class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Select PHP Version" %} <img ng-hide="loadingExtensions"
src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" id="modifyPackageForm" class="form-horizontal bordered-row">
<form action="/" id="modifyPackageForm" class="form-horizontal bordered-row panel-body">
<div class="form-group">

View File

@@ -17,8 +17,6 @@ app.controller('sslIssueCtrl', function($scope,$http) {
$scope.issueSSLBtn = false;
};
$scope.issueSSL = function(){
$scope.manageSSLLoading = false;

View File

@@ -14,9 +14,9 @@
<p>{% trans "Issue Lets Encrypt SSLs for websites and hostname." %}</p>
</div>
<div class="panel">
<div class="panel col-lg-10">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
@@ -25,13 +25,13 @@
{% if manageSSL or admin %}
<div class="col-md-4">
<div class="col-md-4 btn-min-width">
<a href="{% url 'manageSSL' %}" title="{% trans 'Manage SSL' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Manage SSL" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-folder-open"></i>
</div>
</a>
</div>
@@ -41,13 +41,13 @@
{% if hostnameSSL or admin %}
<div class="col-md-4">
<div class="col-md-4 btn-min-width">
<a href="{% url 'sslForHostName' %}" title="{% trans 'Hostname SSL' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Hostname SSL" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-laptop"></i>
</div>
</a>
</div>
@@ -56,13 +56,13 @@
{% if mailServerSSL or admin %}
<div class="col-md-4">
<div class="col-md-4 btn-min-width">
<a href="{% url 'sslForMailServer' %}" title="{% trans 'MailServer SSL' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "MailServer SSL" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-envelope-square"></i>
</div>
</a>
</div>

View File

@@ -16,13 +16,13 @@
<div ng-controller="sslIssueCtrl" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Manage SSL" %} <img ng-hide="manageSSLLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -39,7 +39,7 @@
<div ng-hide="issueSSLBtn" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="issueSSL()" class="btn btn-primary btn-lg btn-block">{% trans "Issue SSL" %}</button>
<button type="button" ng-click="issueSSL()" class="btn btn-primary btn-lg">{% trans "Issue SSL" %}</button>
</div>
</div>
@@ -47,7 +47,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotIssue" class="alert alert-danger">
<p>{% trans "Cannot issue SSL. Error message:" %} {$ errorMessage $}</p>
</div>

View File

@@ -16,13 +16,13 @@
<div ng-controller="sslIssueForHostNameCtrl" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Issue SSL For Hostname" %} <img ng-hide="manageSSLLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -39,7 +39,7 @@
<div ng-hide="issueSSLBtn" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="issueSSL()" class="btn btn-primary btn-lg btn-block">{% trans "Issue SSL" %}</button>
<button type="button" ng-click="issueSSL()" class="btn btn-primary btn-lg">{% trans "Issue SSL" %}</button>
</div>
</div>
@@ -47,7 +47,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotIssue" class="alert alert-danger">
<p>{% trans "Cannot issue SSL. Error message:" %} {$ errorMessage $}</p>
</div>

View File

@@ -16,14 +16,12 @@
<div ng-controller="sslIssueForMailServer" class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Issue SSL For MailServer" %} <img ng-hide="manageSSLLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form action="/" class="form-horizontal bordered-row">
<form action="/" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Website" %}</label>
@@ -47,7 +45,7 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div ng-hide="canNotIssue" class="alert alert-danger">
<p>{% trans "Cannot issue SSL. Error message:" %} {$ errorMessage $}</p>
</div>

View File

@@ -17,8 +17,8 @@
{% if status %}
<div ng-controller="postfix" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "Manage Postfix" %} <img ng-hide="serviceLoading" src="/static/images/loading.gif">
</h3>
@@ -29,23 +29,20 @@
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div class="form-group">
<label class="col-sm-4 control-label">Postfix Status</label>
<label class="col-sm-3 control-label">Postfix Status</label>
<div class="col-sm-6">
<input type="checkbox" id="serviceStatus" data-toggle="toggle">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveStatus('postfix')" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
<button type="button" ng-click="saveStatus('postfix')" class="btn btn-primary btn-lg">{% trans "Save changes" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">

View File

@@ -17,8 +17,8 @@
{% if status %}
<div ng-controller="powerDNS" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "Manage PowerDNS" %} <img ng-hide="pdnsLoading" src="/static/images/loading.gif">
</h3>
@@ -29,23 +29,20 @@
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div class="form-group">
<label class="col-sm-4 control-label">PowerDNS Status</label>
<label class="col-sm-3 control-label">PowerDNS Status</label>
<div class="col-sm-6">
<input type="checkbox" id="pdnsStatus" data-toggle="toggle">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveStatus('powerdns')" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
<button type="button" ng-click="saveStatus('powerdns')" class="btn btn-primary btn-lg">{% trans "Save changes" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">

View File

@@ -17,8 +17,8 @@
{% if status %}
<div ng-controller="pureFTPD" class="example-box-wrapper">
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
<div class="panel panel-body">
<h3 class="content-box-header">
{% trans "Manage PureFTPD" %} <img ng-hide="serviceLoading" src="/static/images/loading.gif">
</h3>
@@ -29,23 +29,20 @@
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div class="form-group">
<label class="col-sm-4 control-label">FTP Status</label>
<label class="col-sm-3 control-label">FTP Status</label>
<div class="col-sm-6">
<input type="checkbox" id="serviceStatus" data-toggle="toggle">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="saveStatus('pureftpd')" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
<button type="button" ng-click="saveStatus('pureftpd')" class="btn btn-primary btn-lg">{% trans "Save changes" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">

View File

@@ -15,13 +15,13 @@
</div>
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Package Details" %}
</h3>
<div ng-controller="createPackage" class="example-box-wrapper">
<form name="createPackageFrm" action="/" id="createPackages" class="form-horizontal bordered-row">
<form name="createPackageFrm" action="/" id="createPackages" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Package Name" %}</label>
<div class="col-sm-6">
@@ -81,13 +81,10 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="insertPackInDB()" class="btn btn-primary btn-lg btn-block">{% trans "Create Package" %}</button>
<button type="button" ng-click="insertPackInDB()" class="btn btn-primary btn-lg">{% trans "Create Package" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
@@ -100,8 +97,6 @@
</div>
</div>
</div>
@@ -117,4 +112,3 @@
</div>
{% endblock %}

View File

@@ -14,14 +14,13 @@
</div>
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Delete Package" %}
</h3>
<div ng-controller="deletePackage" class="example-box-wrapper">
<form action="/" id="deletePackage" class="form-horizontal bordered-row">
<form action="/" id="deletePackage" class="form-horizontal bordered-row panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Package" %}</label>
@@ -37,30 +36,28 @@
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deletePackage()" class="btn btn-primary btn-lg btn-block">{% trans "Delete Package" %}</button>
<button type="button" ng-click="deletePackage()" class="btn btn-primary btn-lg">{% trans "Delete Package" %}</button>
</div>
</div>
<div id="deletePackageButton" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="deletePackageFinal()" class="btn btn-primary btn-lg btn-block">{% trans "Are you sure?" %}</button>
<button type="button" ng-click="deletePackageFinal()" class="btn btn-primary btn-lg">{% trans "Are you sure?" %}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div class="col-sm-6">
<div id="deleteFailure" class="alert alert-danger">
<p>{% trans "Cannot delete package. Error message:" %} {$ errorMessage $}</p>
</div>
<div id="deleteSuccess" class="alert alert-success">
<p>{% trans "Package" %} <strong>{$ deletedPackage $}</strong>{% trans " Successfully Deleted" %}"</p>
<p>{% trans "Package" %} <strong>{$ deletedPackage $}</strong>{% trans " Successfully Deleted." %}</p>
</div>
</div>

View File

@@ -3,55 +3,58 @@
{% block title %}{% trans "Packages - CyberPanel" %}{% endblock %}
{% block content %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<div class="container">
<div id="page-title">
<div class="container">
<div id="page-title">
<h2>{% trans "Packages" %}</h2>
<p>{% trans "Packages define resources for your websites, you need to add package before creating a website." %}</p>
</div>
<div class="panel">
</div>
<div class="panel col-md-12">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
<div class="col-md-4">
<a href="{% url 'createPackage' %}" title="{% trans 'Create Package' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'createPackage' %}" title="{% trans 'Create Package' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Create Package" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-plus-square"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'deletePackage' %}" title="{% trans 'Delete Package' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'deletePackage' %}" title="{% trans 'Delete Package' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Package" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-trash"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'modifyPackage' %}" title="{% trans 'Modify Package' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="col-md-3 btn-min-width">
<a href="{% url 'modifyPackage' %}" title="{% trans 'Modify Package' %}"
class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Modify Package" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
<i class="fa fa-edit"></i>
</div>
</a>
</div>
@@ -61,10 +64,10 @@
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -11,13 +11,13 @@
</div>
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
<h3 class="content-box-header">
{% trans "Modify Package" %} <img id="packageLoading" src="{% static 'images/loading.gif' %}">
</h3>
<div class="example-box-wrapper">
<form ng-controller="modifyPackages" action="/" id="modifyPackageForm" class="form-horizontal bordered-row">
<form ng-controller="modifyPackages" action="/" id="modifyPackageForm" class="form-horizontal bordered-row panel-body">
<div class="form-group">
@@ -92,7 +92,7 @@
<div id="modifyButton" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="modifyPackageFunc()" class="btn btn-primary btn-lg btn-block">{% trans "Modify Package" %}</button>
<button type="button" ng-click="modifyPackageFunc()" class="btn btn-primary btn-lg ">{% trans "Modify Package" %}</button>
</div>
</div>

View File

@@ -321,6 +321,7 @@ milter_default_action = accept
command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
subprocess.call(shlex.split(command), stdout=FNULL)
except:
FNULL = open(os.devnull, 'w')
command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
subprocess.call(shlex.split(command), stdout=FNULL)

View File

@@ -71,6 +71,9 @@ class Upgrade:
command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel"
Upgrade.executioner(command, 'VirtualEnv Pre-reqs', 0)
command = "yum install -y libattr-devel xz-devel gpgme-devel curl-devel"
Upgrade.executioner(command, 'VirtualEnv Pre-reqs', 0)
##
@@ -226,7 +229,10 @@ WantedBy=multi-user.target"""
host = settings.DATABASES['default']['HOST']
port = settings.DATABASES['default']['PORT']
conn = mysql.connect(host=host, port=port, db=db, user=dbUser, passwd=password)
if port == '':
conn = mysql.connect(host=host, port=3306, db=db, user=dbUser, passwd=password)
else:
conn = mysql.connect(host=host, port=int(port), db=db, user=dbUser, passwd=password)
cursor = conn.cursor()
return conn, cursor

View File

@@ -92,6 +92,20 @@ class S3Backups(multi.Thread):
json_data = json_data + ']'
return json_data
def setupCron(self):
tempPath = '/home/cyberpanel/' + str(randint(10000, 99999))
writeToFile = open(tempPath, 'w')
writeToFile.write('* * * * * /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/s3Backups/s3Backups.py > /home/cyberpanel/error-logs.txt 2>&1\n')
writeToFile.close()
command = 'sudo crontab -u cyberpanel ' + tempPath
ProcessUtilities.executioner(command)
try:
os.remove(tempPath)
except:
pass
def connectAccount(self):
try:
@@ -118,28 +132,7 @@ class S3Backups(multi.Thread):
##
cronPath = '/etc/crontab'
command = 'sudo cat ' + cronPath
output = subprocess.check_output(shlex.split(command)).split('\n')
insertCron = 1
for items in output:
if items.find('s3backups.py') > -1:
insertCron = 0
break
if insertCron:
pathToFile = "/home/cyberpanel/" + str(randint(1000, 9999))
writeToFile = open(pathToFile, 'w')
for items in output:
writeToFile.writelines(items + '\n')
writeToFile.writelines(
'0 0 * * * cyberpanel /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/s3Backups/s3Backups.py\n')
writeToFile.close()
command = 'sudo mv ' + pathToFile + ' /etc/crontab'
ProcessUtilities.executioner(command)
self.setupCron()
return proc.ajax(1, None)
@@ -527,28 +520,7 @@ class S3Backups(multi.Thread):
##
cronPath = '/etc/crontab'
command = 'sudo cat ' + cronPath
output = subprocess.check_output(shlex.split(command)).split('\n')
insertCron = 1
for items in output:
if items.find('s3backups.py') > -1:
insertCron = 0
break
if insertCron:
pathToFile = "/home/cyberpanel/" + str(randint(1000, 9999))
writeToFile = open(pathToFile, 'w')
for items in output:
writeToFile.writelines(items + '\n')
writeToFile.writelines(
'0 0 * * * cyberpanel /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/s3Backups/s3Backups.py\n')
writeToFile.close()
command = 'sudo mv ' + pathToFile + ' /etc/crontab'
ProcessUtilities.executioner(command)
self.setupCron()
return proc.ajax(1, None)
@@ -900,60 +872,6 @@ class S3Backups(multi.Thread):
plan = BackupPlanDO.objects.get(name=self.data['planName'])
BackupLogsDO(owner=plan, timeStamp=time.strftime("%b %d %Y, %H:%M:%S"), level='ERROR', msg=str(msg)).save()
def runAWSBackups(self):
try:
admin = Administrator.objects.get(pk=1)
self.request.session['userID'] = admin.pk
for plan in BackupPlan.objects.all():
lastRunDay = plan.lastRun.split(':')[0]
lastRunMonth = plan.lastRun.split(':')[1]
if plan.freq == 'Daily' and lastRunDay != time.strftime("%d"):
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
else:
if lastRunMonth == time.strftime("%m"):
days = int(time.strftime("%d")) - int(lastRunDay)
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
else:
days = 30 - int(lastRunDay)
days = days + int(time.strftime("%d"))
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
for plan in BackupPlanDO.objects.all():
lastRunDay = plan.lastRun.split(':')[0]
lastRunMonth = plan.lastRun.split(':')[1]
if plan.freq == 'Daily' and lastRunDay != time.strftime("%d"):
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
else:
if lastRunMonth == time.strftime("%m"):
days = int(time.strftime("%d")) - int(lastRunDay)
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
else:
days = 30 - int(lastRunDay)
days = days + int(time.strftime("%d"))
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
except BaseException, msg:
logging.writeToFile(str(msg) + ' [S3Backups.runAWSBackups]')
def addMINIONode(self):
try:
@@ -971,6 +889,8 @@ class S3Backups(multi.Thread):
secretKey=self.data['secretKey'])
newNode.save()
self.setupCron()
return proc.ajax(1, None)
except BaseException, msg:
@@ -1306,6 +1226,83 @@ class S3Backups(multi.Thread):
proc = httpProc(self.request, None, None)
return proc.ajax(0, str(msg))
def runAWSBackups(self):
try:
admin = Administrator.objects.get(pk=1)
self.request.session['userID'] = admin.pk
for plan in BackupPlan.objects.all():
lastRunDay = plan.lastRun.split(':')[0]
lastRunMonth = plan.lastRun.split(':')[1]
if plan.freq == 'Daily' and lastRunDay != time.strftime("%d"):
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
else:
if lastRunMonth == time.strftime("%m"):
days = int(time.strftime("%d")) - int(lastRunDay)
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
else:
days = 30 - int(lastRunDay)
days = days + int(time.strftime("%d"))
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackup()
for plan in BackupPlanDO.objects.all():
lastRunDay = plan.lastRun.split(':')[0]
lastRunMonth = plan.lastRun.split(':')[1]
if plan.freq == 'Daily' and lastRunDay != time.strftime("%d"):
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
else:
if lastRunMonth == time.strftime("%m"):
days = int(time.strftime("%d")) - int(lastRunDay)
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
else:
days = 30 - int(lastRunDay)
days = days + int(time.strftime("%d"))
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupDO()
for plan in BackupPlanMINIO.objects.all():
lastRunDay = plan.lastRun.split(':')[0]
lastRunMonth = plan.lastRun.split(':')[1]
if plan.freq == 'Daily' and lastRunDay != time.strftime("%d"):
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupMINIO()
else:
if lastRunMonth == time.strftime("%m"):
days = int(time.strftime("%d")) - int(lastRunDay)
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupMINIO()
else:
days = 30 - int(lastRunDay)
days = days + int(time.strftime("%d"))
if days >= 6:
self.data = {}
self.data['planName'] = plan.name
self.forceRunAWSBackupMINIO()
except BaseException, msg:
logging.writeToFile(str(msg) + ' [S3Backups.runAWSBackups]')
def main():
pathToFile = "/home/cyberpanel/" + str(randint(1000, 9999))

Some files were not shown because too many files have changed in this diff Show More