Skip to content

Commit

Permalink
bug fix: minor issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@usmannasir
usmannasir committed Dec 22, 2023
1 parent af7c57d commit e7abfd6
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 26 deletions.
31 changes: 15 additions & 16 deletions baseTemplate/templates/baseTemplate/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,29 +372,28 @@


<!-------------Docker Sites--------------------------->
<li id="sidebar-menu-item-dockersite">
<li id="sidebar-menu-item-dockersite">
<a href="#" title="{% trans 'Dockersite' %}">
<div class="glyph-icon icon-globe" title="{% trans 'Dockersite' %}"></div>
<span>{% trans "Dockersite" %}</span>
<div class="glyph-icon icon-globe" title="{% trans 'Docker Apps' %}"></div>
<span>{% trans "Docker Apps" %}</span>
</a>
<div class="sidebar-submenu">

<ul>
{# {% if admin or createWebsite %}#}
<li><a href="{% url 'CreateDockerPackage' %}"
><span>{% trans "Create Docker Package" %}</span></a>
</li>
{# {% endif %}#}
<li><a href="{% url 'AssignPackage' %}"
><span>{% trans "Assign Package" %}</span></a>
</li>
<li><a href="{% url 'CreateDockersite' %}"
><span>{% trans "Create Docker Site" %}</span></a>
><span>{% trans "Create Docker Apps" %}</span></a>
</li>
<li><a href="{% url 'ListDockerSites' %}"
><span>{% trans "List Docker Site" %}</span></a>
><span>{% trans "List Docker Apps" %}</span></a>
</li>
{# {% if admin or createWebsite %}#}
<li><a href="{% url 'CreateDockerPackage' %}"
><span>{% trans "Docker Packages" %}</span></a>
</li>
{# {% endif %}#}
<li><a href="{% url 'AssignPackage' %}"
><span>{% trans "Assign Package" %}</span></a>
</li>

</ul>

</div><!-- .sidebar-submenu -->
Expand Down Expand Up @@ -796,14 +795,14 @@

<li class="header"><span>{% trans "Server" %}</span></li>

<li >
<li>
<a href="{% url 'MysqlManager' %}"
title="{% trans 'Root File Manager' %}">
<i class="glyph-icon icon-database"
title="{% trans 'MySQL Manager' %}"
data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
<span>{% trans "MySQL Manager" %}</span>
<span class="bs-label badge-warning">{% trans "NEW" %}</span>
<span class="bs-label badge-warning">{% trans "NEW" %}</span>
</a>
</li>

Expand Down
3 changes: 3 additions & 0 deletions dockerManager/build.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docker login
docker build -t cyberpanel/openlitespeed:latest .
docker push cyberpanel/openlitespeed:latest
4 changes: 4 additions & 0 deletions plogical/DockerSites.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,10 @@ def DeployWPContainer(self):
logging.statusWriter(self.JobID, f'Error {str(message)} . [404]')
return 0

logging.statusWriter(self.JobID, 'Bringing containers online..,50')

time.sleep(15)

### Set up Proxy

execPath = "/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/DockerSites.py"
Expand Down
20 changes: 10 additions & 10 deletions websiteFunctions/templates/websiteFunctions/CreateDockerSite.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "baseTemplate/index.html" %}
{% load i18n %}
{% block title %}{% trans "Create Docker Site - CyberPanel" %}{% endblock %}
{% block title %}{% trans "Create Docker App - CyberPanel" %}{% endblock %}
{% block content %}

{% load static %}
Expand Down Expand Up @@ -92,15 +92,15 @@

<div class="container">
<div id="page-title">
<h2>{% trans "Create Docker Site" %}</h2>
<p>{% trans "On this page you can create docker site on your server." %}</p>
<h2>{% trans "Create Docker App" %}</h2>
<p>{% trans "On this page you can create docker apps on your server." %}</p>
</div>


<div ng-controller="createDockerSite" class="panel">
<div class="panel-body">
<h3 class="content-box-header">
{% trans "Docker Site Details" %} <img ng-hide="cyberpanelLoading"
{% trans "Docker App Details" %} <img ng-hide="cyberpanelLoading"
src="{% static 'images/loading.gif' %}">
</h3>

Expand Down Expand Up @@ -140,27 +140,27 @@ <h3 class="content-box-header">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "MySQL CPU" %}</label>
<div class="col-sm-6">
<input type="number" name="email" class="form-control" ng-model="CPUMysql" required>
<input type="number" name="email" class="form-control" ng-model="CPUMysql" value="1" required>
</div>

</div>
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "MySQL Ram" %}</label>
<div class="col-sm-6">
<input type="number" name="email" class="form-control" ng-model="rammysql" required>
<input type="number" name="email" class="form-control" ng-model="rammysql" value="512" required>
</div>
</div>
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "CPU Site" %}</label>
<div class="col-sm-6">
<input type="number" name="email" class="form-control" ng-model="CPUSite" required>
<input type="number" name="email" class="form-control" ng-model="CPUSite" value="1" required>
</div>

</div>
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Ram Site" %}</label>
<div class="col-sm-6">
<input type="number" name="email" class="form-control" ng-model="RamSite" required>
<input type="number" name="email" class="form-control" ng-model="RamSite" value="512" required>
</div>
</div>

Expand All @@ -177,14 +177,14 @@ <h3 class="content-box-header">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Admin Username" %}</label>
<div class="col-sm-6">
<input type="text" name="email" class="form-control" ng-model="WPUsername" required>
<input type="text" name="email" class="form-control" ng-model="WPUsername" value="cyberpanel" required>
</div>
</div>

<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Admin Email" %}</label>
<div class="col-sm-6">
<input type="email" name="email" class="form-control" ng-model="wpEmail" required>
<input type="email" name="email" class="form-control" ng-model="wpEmail" value="[email protected]" required>
</div>
<div ng-show="websiteCreationForm.email.$error.email"
class="current-pack">{% trans "Invalid Email" %}</div>
Expand Down

0 comments on commit e7abfd6

Please sign in to comment.