Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-15 09:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.3.2-dev' of https://github.com/usmannasir/cyberpanel into v2.3.2-dev

Browse Source
This commit is contained in:
Hassan Hashmi
2022-06-18 16:39:38 +05:00
parent ce1113fd2e 3c61540146
commit 19fab57d1f
6 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websiteFunctions/static/websiteFunctions/websiteFunctions.js
View File

@@ -1156,13 +1156,11 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
function ListInitialDatas(response) {
$('#wordpresshomeloading').hide();
//$('#wordpresshomeloading').hide();
if (response.data.abort === 1) {
if (response.data.installStatus === 1) {
$scope.wordpresshomeloading = true;
$scope.stagingDetailsForm = true;
$scope.installationProgress = false;

13
websiteFunctions/templates/websiteFunctions/WPsiteHome.html
View File

@@ -65,7 +65,7 @@
Open
</a>
<a target="_blank"
href="/filemanager/{{ wpsite.owner.domain }}"
href="/filemanager/{{ wpsite.owner.domain }}?path={{wpsite.path}}"
style="margin-left: 4%">
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -136,9 +136,9 @@
<h6 style="font-weight: bold">Password Protection</h6>
<div class="custom-control custom-switch">
<input type="radio" data-toggle="modal"
data-target="#Passwordprotection"
class="custom-control-input ng-pristine ng-untouched ng-valid ng-not-empty"
id="passwdprotection">
data-target="#Passwordprotection"
class="custom-control-input ng-pristine ng-untouched ng-valid ng-not-empty"
id="passwdprotection">
<label class="custom-control-label"
for="passwdprotection"></label>
</div>
@@ -441,7 +441,10 @@
<div class="col-sm-4">
<button type="button" id="createbackupbutton"
ng-click="CreateBackup()"
class="btn btn-primary btn-lg">{% trans "Create Backup" %}</button>
class="btn btn-primary btn-lg">{% trans "Create Backup" %}
<img style="display: none"
ng-hide="wordpresshomeloading"
src="{% static 'images/loading.gif' %}"></button>
</div>
</div>

1
websiteFunctions/website.py
View File

@@ -1391,7 +1391,6 @@ class WebsiteManager:
extraArgs['pluginbucket'] = data['pluginbucket']
except:
extraArgs['pluginbucket'] = '-1'
extraArgs['adminUser'] = data['adminUser']
extraArgs['PasswordByPass'] = data['PasswordByPass']
extraArgs['adminPassword'] = data['PasswordByPass']